From 1bbb00268b6a9deef075f565d35272a1ed9adfaf Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Mon, 12 Jun 2023 10:06:26 +0100 Subject: [PATCH] Add rot8 package, enable fontconfig in home-manager --- home/Northstar/xenia.nix | 15 +++++++++++++-- home/default.nix | 5 ++++- home/desktop/pkgs/rot8/default.nix | 18 ++++++++++++++++++ home/desktop/sway.nix | 4 ---- 4 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 home/desktop/pkgs/rot8/default.nix diff --git a/home/Northstar/xenia.nix b/home/Northstar/xenia.nix index b0374f43..dea47959 100644 --- a/home/Northstar/xenia.nix +++ b/home/Northstar/xenia.nix @@ -1,4 +1,6 @@ -{pkgs, ...}: { +{pkgs, ...}: let + rot8 = pkgs.callPackage ../desktop/pkgs/rot8 {}; +in { imports = [ ../env ../tui @@ -11,7 +13,7 @@ home.username = "xenia"; home.homeDirectory = "/home/xenia"; home.stateVersion = "22.11"; - home.packages = with pkgs; [home-manager]; + home.packages = with pkgs; [home-manager rot8]; programs.bash.bashrcExtra = '' source $HOME/.nix-profile/etc/profile.d/nix.sh ''; @@ -20,6 +22,7 @@ enable = true; tray = {enable = false;}; }; + fonts.fontconfig.enable = true; wayland.windowManager.sway = { config = { @@ -37,9 +40,17 @@ bg = "~/nixos/wallpaper.jpg fill"; }; }; + gaps = { + inner = 5; + top = 5; + bottom = 5; + left = 20; + right = 20; + }; startup = [ {command = "dunst";} {command = "waybar";} + {command = "rot8";} ]; }; }; diff --git a/home/default.nix b/home/default.nix index e1be0058..ec4c97d8 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1 +1,4 @@ -{...}: {imports = [./env ./gui ./tui];} +{...}: { + imports = [./env ./gui ./tui]; + fonts.fontconfig.enable = true; +} diff --git a/home/desktop/pkgs/rot8/default.nix b/home/desktop/pkgs/rot8/default.nix new file mode 100644 index 00000000..0556e840 --- /dev/null +++ b/home/desktop/pkgs/rot8/default.nix @@ -0,0 +1,18 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: +rustPlatform.buildRustPackage rec { + pname = "rot8"; + version = "7ed926f6d94a999cd2cb702af9f3de0f566095b1"; + + src = fetchFromGitHub { + owner = "efernau"; + repo = pname; + rev = version; + hash = "sha256-i+VLVA/XKZiFPEeFHR3CpZKi8CWA/tiaZJerciqQHJ0="; + }; + + cargoHash = "sha256-BoBuc3YkVdAR+gZZf5WxxRj/LCsBNSW7FSSU2OnNPgM="; +} diff --git a/home/desktop/sway.nix b/home/desktop/sway.nix index d6bc30d8..b8d1cc7b 100644 --- a/home/desktop/sway.nix +++ b/home/desktop/sway.nix @@ -31,10 +31,6 @@ in { names = ["FiraCode Nerd Font" "FiraCode Nerd Font Mono"]; size = 12.0; }; - gaps = { - inner = 5; - outer = 20; - }; bars = []; keybindings = lib.mkOptionDefault { "${modifier}+Return" = "exec ${term}";