diff --git a/flake.lock b/flake.lock index 99d7a1c..b1f4803 100644 --- a/flake.lock +++ b/flake.lock @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1709445365, - "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", + "lastModified": 1709204054, + "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", "owner": "nix-community", "repo": "home-manager", - "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", + "rev": "2f3367769a93b226c467551315e9e270c3f78b15", "type": "github" }, "original": { @@ -345,11 +345,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1709309926, - "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", + "lastModified": 1709128929, + "narHash": "sha256-GWrv9a+AgGhG4/eI/CyVVIIygia7cEy68Huv3P8oyaw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "79baff8812a0d68e24a836df0a364c678089e2c7", + "rev": "c8e74c2f83fe12b4e5a8bd1abbc090575b0f7611", "type": "github" }, "original": { @@ -466,11 +466,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1709150264, + "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", "type": "github" }, "original": { diff --git a/modules/desktop/creative.nix b/modules/desktop/creative.nix index 98236bc..3c5c79e 100644 --- a/modules/desktop/creative.nix +++ b/modules/desktop/creative.nix @@ -1,4 +1,20 @@ {pkgs, ...}: { + fonts.packages = with pkgs; [ + (nerdfonts.override {fonts = ["FiraCode"];}) + montserrat + noto-fonts + atkinson-hyperlegible + arkpandora_ttf + liberation_ttf + caladea + carlito + garamond-libre + ocr-a + amiri + libertine + inter + ]; + fonts.fontDir.enable = true; home-manager.users.jade = {pkgs, ...}: { home.packages = with pkgs; [ audacity diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index cfc104f..9f12200 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -32,7 +32,6 @@ in ./specific-hardware ./evremap.nix ./xmonad.nix - ./fonts.nix ./firefox.nix ]; diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix deleted file mode 100644 index e743bfe..0000000 --- a/modules/desktop/fonts.nix +++ /dev/null @@ -1,18 +0,0 @@ -{pkgs, ...}: { - fonts.packages = with pkgs; [ - (nerdfonts.override {fonts = ["FiraCode"];}) - montserrat - noto-fonts - atkinson-hyperlegible - arkpandora_ttf - liberation_ttf - caladea - carlito - garamond-libre - ocr-a - amiri - libertine - inter - ]; - fonts.fontDir.enable = true; -} diff --git a/modules/shell/helix.nix b/modules/shell/helix.nix index 2f409f0..b182b86 100644 --- a/modules/shell/helix.nix +++ b/modules/shell/helix.nix @@ -53,20 +53,8 @@ }; }; }; - keys = { - normal = { - space."=" = ":fmt"; - }; - insert = { - up = "no_op"; - down = "no_op"; - left = "no_op"; - right = "no_op"; - pageup = "no_op"; - pagedown = "no_op"; - home = "no_op"; - end = "no_op"; - }; + keys.normal = { + space."=" = ":fmt"; }; }; languages = {