From c0a531a023123707ea7952db07039125abb415aa Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 20 Mar 2025 09:11:09 +0100 Subject: [PATCH 1/5] feat(gui/kbd): add configurable ellipsis keybinding - Introduce `gui.kbd.ellipsis.enable` option for keybinding. - Move related xkb configuration to a dedicated module for clarity. - Simplify `default.nix` by delegating ellipsis setup to the new module. --- homes/x86_64-linux/harald@x1/default.nix | 11 +---------- modules/home/gui/kbd/default.nix | 25 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 modules/home/gui/kbd/default.nix diff --git a/homes/x86_64-linux/harald@x1/default.nix b/homes/x86_64-linux/harald@x1/default.nix index ca75ab9..237c42d 100644 --- a/homes/x86_64-linux/harald@x1/default.nix +++ b/homes/x86_64-linux/harald@x1/default.nix @@ -18,6 +18,7 @@ tools = { git.enable = true; }; + gui.kbd.ellipsis.enable = true; }; fonts.fontconfig.enable = true; @@ -64,16 +65,6 @@ }; dconf.settings."org/gnome/desktop/input-sources".xkb-options = [ "mod:ellipsis" ]; - xdg.configFile."xkb/symbols/mod".text = '' - xkb_symbols "ellipsis" { - key { [ period, greater, ellipsis, division ] }; - }; - ''; - xdg.configFile."xkb/rules/evdev".text = '' - ! option = symbols - mod:ellipsis = +mod(ellipsis) - ! include %S/evdev - ''; xdg.enable = true; xdg.mime.enable = true; diff --git a/modules/home/gui/kbd/default.nix b/modules/home/gui/kbd/default.nix new file mode 100644 index 0000000..b404878 --- /dev/null +++ b/modules/home/gui/kbd/default.nix @@ -0,0 +1,25 @@ +{ config, lib, ... }: + +with lib; +let + cfg = config.metacfg.gui.kbd; +in +{ + options.metacfg.gui.kbd = { + ellipsis = mkEnableOption "ellipsis keybinding for period key"; + }; + + config = mkIf cfg.ellipsis { + xdg.configFile."xkb/symbols/mod".text = '' + xkb_symbols "ellipsis" { + key { [ period, greater, ellipsis, division ] }; + }; + ''; + + xdg.configFile."xkb/rules/evdev".text = '' + ! option = symbols + mod:ellipsis = +mod(ellipsis) + ! include %S/evdev + ''; + }; +} \ No newline at end of file From ec93b755988e32840f08eba572d9e7ee1030c0f0 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 20 Mar 2025 09:11:39 +0100 Subject: [PATCH 2/5] chore: remove commented-out git tool configuration - Deleted unused `#git.enable` lines from both aarch64 and x86_64 configurations. - These lines served no functional purpose and were outdated. --- systems/aarch64-linux/m4nix/default.nix | 1 - systems/x86_64-linux/x1/default.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/systems/aarch64-linux/m4nix/default.nix b/systems/aarch64-linux/m4nix/default.nix index 12d5f93..9f95ee7 100644 --- a/systems/aarch64-linux/m4nix/default.nix +++ b/systems/aarch64-linux/m4nix/default.nix @@ -18,7 +18,6 @@ with lib.metacfg; secureboot.enable = false; tools = { direnv.enable = true; - #git.enable = true; }; user.extraGroups = [ "docker" diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix index ce93000..4f0641f 100644 --- a/systems/x86_64-linux/x1/default.nix +++ b/systems/x86_64-linux/x1/default.nix @@ -23,7 +23,6 @@ with lib.metacfg; homeprinter.enable = true; tools = { direnv.enable = true; - #git.enable = true; }; user.extraGroups = [ "docker" From d8ac0b9d86f3f558609ea776ab524087c6c1e310 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 20 Mar 2025 09:11:57 +0100 Subject: [PATCH 3/5] refactor: remove unused host module - Deleted `modules/home/host/default.nix` as it was no longer in use. - The `host` option and related configuration were deemed unnecessary. --- modules/home/host/default.nix | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 modules/home/host/default.nix diff --git a/modules/home/host/default.nix b/modules/home/host/default.nix deleted file mode 100644 index 1fa62a6..0000000 --- a/modules/home/host/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - lib, - config, - pkgs, - host ? null, - format ? "unknown", - ... -}: - -let - inherit (lib) types; - inherit (lib.metacfg) mkOpt; -in -{ - options.metacfg.host = { - name = mkOpt (types.nullOr types.str) host "The host name."; - }; -} From 9fab2cdc57e06a629cdfdf977503ad61dde7d992 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 20 Mar 2025 09:12:06 +0100 Subject: [PATCH 4/5] feat(aarch64-darwin): add claude-code and nodejs packages - Added `claude-code` and `nodejs` to the default packages list. - Enhances functionality by including tools for coding and development. --- systems/aarch64-darwin/m4/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systems/aarch64-darwin/m4/default.nix b/systems/aarch64-darwin/m4/default.nix index 0c60d07..dbf1e87 100644 --- a/systems/aarch64-darwin/m4/default.nix +++ b/systems/aarch64-darwin/m4/default.nix @@ -42,6 +42,8 @@ with lib.metacfg; dnsmasq virt-manager qemu + claude-code + nodejs ]; users.users.harald.shell = pkgs.fish; From 6f89baaf944c711744f16ca298450069c6c873ae Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 20 Mar 2025 09:12:14 +0100 Subject: [PATCH 5/5] chore: update lock file dependencies - Updated `brew`, `nix-darwin`, `disko`, and other dependencies in `flake.lock` to newer revisions. - Improves compatibility and includes upstream updates for stability and features. --- flake.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 03d67b5..6e4b09b 100644 --- a/flake.lock +++ b/flake.lock @@ -19,16 +19,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1731323744, - "narHash": "sha256-SxUQm4cTHcaoPQHoXe26ZV8cZiMWBGow8MjE4L+MckM=", + "lastModified": 1740943974, + "narHash": "sha256-2lRLfb6qwoUAsX/XtYmt/ETxtGid6/VaBeFiRsoVMtU=", "owner": "Homebrew", "repo": "brew", - "rev": "254bf3fe9d8fa2e1b2fb55dbcf535b2d870180c4", + "rev": "64efed206deeb9c2304d9e5b5910dcbf0a509c15", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.4.5", + "ref": "4.4.23", "repo": "brew", "type": "github" } @@ -73,11 +73,11 @@ ] }, "locked": { - "lastModified": 1736820923, - "narHash": "sha256-SDuKLOWAh8VJRXlNWQn9QE99bjeEUAAbYXqrKGbsiyk=", + "lastModified": 1741126078, + "narHash": "sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "944c2b181792ae7ae6b20c0df3f44879c11706c9", + "rev": "c172f50b55b087f8e7801631de977461603bb976", "type": "github" }, "original": { @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1736711425, - "narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=", + "lastModified": 1741786315, + "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", "owner": "nix-community", "repo": "disko", - "rev": "f720e64ec37fa16ebba6354eadf310f81555cc07", + "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", "type": "github" }, "original": { @@ -366,11 +366,11 @@ "homebrew-bundle": { "flake": false, "locked": { - "lastModified": 1736995067, - "narHash": "sha256-gsgVUMf+Hfo4HquzrTpxFAHtMJV0WUvy43fVCmgYD+o=", + "lastModified": 1742346374, + "narHash": "sha256-DU6SixntQDZ4a29NZLTwvOaA4m2t+65fASwvQHF7jks=", "owner": "homebrew", "repo": "homebrew-bundle", - "rev": "a537c1c541f13830e197e4c55161dfe935a1f072", + "rev": "05ef3436f1e9c9355ed78f538d27cb0dfb7051fc", "type": "github" }, "original": { @@ -382,11 +382,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1737013725, - "narHash": "sha256-GI6FRisho2K8SZIZQxO9hIb+GoI77OvBp79J0glMdkY=", + "lastModified": 1742448858, + "narHash": "sha256-jArXTHaZl6eER0QuNjVNee3kftnPwLprpYcOk1RU9dY=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "45dbf1f69834e11c03b0396696604380c6b2fd05", + "rev": "3f2080f9531bba0a6f1d4c8de0ae6b2964a2aa42", "type": "github" }, "original": { @@ -398,11 +398,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1737009843, - "narHash": "sha256-Ft3OZGBbONgAi6abhuDgATm7DXeS7I1u8I6Z6cZvY10=", + "lastModified": 1742451229, + "narHash": "sha256-wtyM20aMVKXyooc4Wulivr35tUFmNXjxz3YWv3F3E6E=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "790e310427ca023a4d94f3cef3e6fea1012f394d", + "rev": "2ad483ba44590da050eb681eb052e63d042b7340", "type": "github" }, "original": { @@ -657,11 +657,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1736041957, - "narHash": "sha256-Kk/cVtkxwfHNoB6nINUarMLTtyAEvH+ohzxKBptMzzg=", + "lastModified": 1741032878, + "narHash": "sha256-s9YOBz8vAxPlI4wORma3D7km8wZOEe/7Hg/u3brmwUQ=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "a6d99cc7436fc18c097b3536d9c45c0548c694c8", + "rev": "a82c55b07f670a01da5a72b7a07fe41c256a4380", "type": "github" }, "original": { @@ -2658,11 +2658,11 @@ ] }, "locked": { - "lastModified": 1736808430, - "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=", + "lastModified": 1742406979, + "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8", + "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", "type": "github" }, "original": {