From 1c0b4d13dcbce27f7c5cdc3b07fce84840af458c Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Sun, 3 Mar 2024 14:22:10 +0100 Subject: [PATCH 1/2] 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/2] 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 = {