From 1c0b4d13dcbce27f7c5cdc3b07fce84840af458c Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Sun, 3 Mar 2024 14:22:10 +0100 Subject: [PATCH 1/4] put fonts into their own module --- modules/desktop/creative.nix | 16 ---------------- modules/desktop/default.nix | 1 + modules/desktop/fonts.nix | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 modules/desktop/fonts.nix diff --git a/modules/desktop/creative.nix b/modules/desktop/creative.nix index 3c5c79e..98236bc 100644 --- a/modules/desktop/creative.nix +++ b/modules/desktop/creative.nix @@ -1,20 +1,4 @@ {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 9f12200..cfc104f 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -32,6 +32,7 @@ in ./specific-hardware ./evremap.nix ./xmonad.nix + ./fonts.nix ./firefox.nix ]; diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix new file mode 100644 index 0000000..e743bfe --- /dev/null +++ b/modules/desktop/fonts.nix @@ -0,0 +1,18 @@ +{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; +} From e2d8337e9940a6d0c7af30d576e34a07c7d4d9ca Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Sun, 3 Mar 2024 14:23:02 +0100 Subject: [PATCH 2/4] disable "easy" insert mode keybinds --- modules/shell/helix.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/shell/helix.nix b/modules/shell/helix.nix index b182b86..910ce19 100644 --- a/modules/shell/helix.nix +++ b/modules/shell/helix.nix @@ -53,9 +53,21 @@ }; }; }; - keys.normal = { + 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"; + }; }; languages = { language-server = { From b5020cdbc7fb69182300099d92d0d0a1d5d2c33d Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Sun, 3 Mar 2024 14:27:38 +0100 Subject: [PATCH 3/4] disable "easy" insert mode keybinds --- modules/shell/helix.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/shell/helix.nix b/modules/shell/helix.nix index 910ce19..2f409f0 100644 --- a/modules/shell/helix.nix +++ b/modules/shell/helix.nix @@ -54,19 +54,19 @@ }; }; 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"; + 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"; + }; }; }; languages = { From 01d070eb400498971bbb5d70adb8f24b59c26e0a Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Sun, 3 Mar 2024 14:33:18 +0100 Subject: [PATCH 4/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/2f3367769a93b226c467551315e9e270c3f78b15' (2024-02-29) → 'github:nix-community/home-manager/4de84265d7ec7634a69ba75028696d74de9a44a7' (2024-03-03) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/9099616b93301d5cf84274b184a3a5ec69e94e08' (2024-02-28) → 'github:NixOS/nixpkgs/1536926ef5621b09bba54035ae2bb6d806d72ac8' (2024-02-29) • Updated input 'nixpkgs-stable': 'github:NixOS/nixpkgs/c8e74c2f83fe12b4e5a8bd1abbc090575b0f7611' (2024-02-28) → 'github:NixOS/nixpkgs/79baff8812a0d68e24a836df0a364c678089e2c7' (2024-03-01) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index b1f4803..99d7a1c 100644 --- a/flake.lock +++ b/flake.lock @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1709204054, - "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", + "lastModified": 1709445365, + "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f3367769a93b226c467551315e9e270c3f78b15", + "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", "type": "github" }, "original": { @@ -345,11 +345,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1709128929, - "narHash": "sha256-GWrv9a+AgGhG4/eI/CyVVIIygia7cEy68Huv3P8oyaw=", + "lastModified": 1709309926, + "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8e74c2f83fe12b4e5a8bd1abbc090575b0f7611", + "rev": "79baff8812a0d68e24a836df0a364c678089e2c7", "type": "github" }, "original": { @@ -466,11 +466,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1709150264, - "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": {