From 7e17fd989366e3e5ca8dda5816241ec82a9fa196 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 24 Mar 2025 18:45:42 +0100 Subject: [PATCH 1/3] temperance/configuration.nix: remove emacs and docker --- hosts/temperance/configuration.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix index 56a24a2..e4e920c 100644 --- a/hosts/temperance/configuration.nix +++ b/hosts/temperance/configuration.nix @@ -34,13 +34,7 @@ in { services = { fstrim.enable = lib.mkDefault true; - emacs = { - enable = true; - install = true; - package = pkgs.emacs-pgtk; - }; }; - virtualisation.docker.enable = true; meta = { mainUser.gitSigningKey = ""; From 0b4b1124be5557df1a93bc1129163eae0b377601 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 24 Mar 2025 18:46:10 +0100 Subject: [PATCH 2/3] hyprland/settings.nix: switch to us layout, add compose:102 --- modules/wms/wayland/hyprland/settings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/wms/wayland/hyprland/settings.nix b/modules/wms/wayland/hyprland/settings.nix index f8eda7a..2b832c8 100644 --- a/modules/wms/wayland/hyprland/settings.nix +++ b/modules/wms/wayland/hyprland/settings.nix @@ -32,9 +32,9 @@ in { # Input settings input = { - kb_layout = "gb,ru,de"; + kb_layout = "us,ru,de"; kb_variant = ",phonetic_winkeys,"; - kb_options = "grp:rctrl_rshift_toggle, caps:escape"; + kb_options = "grp:rctrl_rshift_toggle, caps:escape, compose:102"; follow_mouse = true; From 89ca030a5fe4019f0b5c95a9ad033270167088f2 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 24 Mar 2025 18:46:29 +0100 Subject: [PATCH 3/3] helix.nix: switch to gruvbox, add hidden files in file picker --- packages/helix.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/helix.nix b/packages/helix.nix index 003076e..be236e1 100644 --- a/packages/helix.nix +++ b/packages/helix.nix @@ -30,7 +30,7 @@ inherit (lib) getExe; toml = formats.toml {}; helix-config = { - theme = "catppuccin_mocha"; + theme = "gruvbox"; editor = { cursorline = false; color-modes = true; @@ -42,6 +42,9 @@ display-messages = true; snippets = true; }; + file-picker = { + hidden = false; + }; line-number = "relative"; true-color = true; auto-format = true;