diff options
| -rw-r--r-- | flake.lock | 36 | ||||
| -rw-r--r-- | home/default.nix | 6 | ||||
| -rw-r--r-- | nixos/alpha/configuration.nix | 34 |
3 files changed, 38 insertions, 38 deletions
diff --git a/flake.lock b/flake.lock index 403d3c7..8dbb5ac 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1672753581, - "narHash": "sha256-EIi2tqHoje5cE9WqH23ZghW28NOOWSUM7tcxKE1U9KI=", + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "3db1d870b04b13411f56ab1a50cd32b001f56433", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", "type": "github" }, "original": { @@ -111,11 +111,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1672780900, - "narHash": "sha256-DxuSn6BdkZapIbg76xzYx1KhVPEZeBexMkt1q/sMVPA=", + "lastModified": 1675637696, + "narHash": "sha256-tilJS8zCS3PaDfVOfsBZ4zspuam8tc7IMZxtGa/K/uo=", "owner": "nix-community", "repo": "home-manager", - "rev": "54245e1820caabd8a0b53ce4d47e4d0fefe04cd4", + "rev": "c43d4a3d6d9ef8ddbe2438362f5c775b4186000b", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1672832921, - "narHash": "sha256-gI2jE5P8KQGoN5n3Kke4u8Vh2iuAE3CQUVA/03vIufQ=", + "lastModified": 1675727673, + "narHash": "sha256-OPfaqAzymG17uT0GZtCzPWFh7fCFkvaOhXeKetb3/oo=", "owner": "neovim", "repo": "neovim", - "rev": "e35b9020b16985eee26e942f9a3f6b045bc3809b", + "rev": "1391385ba9f83d32f3b6fc54587f03a1d34960d9", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1672833816, - "narHash": "sha256-L6FFEZmzqungQ7MqDt5itWVykr3fsrimIcSbyEiIjDA=", + "lastModified": 1675650300, + "narHash": "sha256-GWnDfrKbQPb+skMMesm1WVu7a3y3GTDpYpfOv3yF4gc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fdaad2a9526217d5bdde4868653f068c7b8201ad", + "rev": "cccf15dce049eb0be24060ed461c251552b2fb4d", "type": "github" }, "original": { @@ -252,11 +252,11 @@ }, "unstable": { "locked": { - "lastModified": 1672617983, - "narHash": "sha256-68WDiCBs631mbDDk4UAKdGURKcsfW6hjb7wgudTAe5o=", + "lastModified": 1675545634, + "narHash": "sha256-TbQeQcM5TA/wIho6xtzG+inUfiGzUXi8ewwttiQWYJE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0fc9fca9c8d43edd79d33fea0dd8409d7c4580f4", + "rev": "0591d6b57bfeb55dfeec99a671843337bc2c3323", "type": "github" }, "original": { @@ -268,11 +268,11 @@ }, "unstable-small": { "locked": { - "lastModified": 1672806314, - "narHash": "sha256-CTXy+/Tldm0T5IDbtzQu22HuK1P51Nn3OaRaspg5b+w=", + "lastModified": 1675721850, + "narHash": "sha256-jhMqxoJVoWOuwpNxEH0ooZijDaCYAcg0rAgfZhAKUco=", "owner": "nixos", "repo": "nixpkgs", - "rev": "469aec905bab3be98838c7eb996ceffb2ea44404", + "rev": "a46d9dd25b30c21a9f177cce4b89c2a30d8150d5", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 30ab75f..d4f112b 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,10 +1,12 @@ { self, unstable, ... } @ inputs: { + # TODO See: https://github.com/neovim/neovim/pull/21711 + # TODO See: https://github.com/NixOS/nixpkgs/pull/214231 "zach@alpha" = self.lib.mkHome { username = "zach"; hostname = "alpha"; - pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ chaotic-nixpkgs.overlay rust.overlays.default neovim.overlay ]; }; + pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ chaotic-nixpkgs.overlay rust.overlays.default /*neovim.overlay*/ ]; }; extraModules = [ ./profiles/populate.nix @@ -22,7 +24,7 @@ "o32@kompakt" = self.lib.mkHome { username = "o32"; hostname = "kompakt"; - pkgs = import unstable { system = "aarch64-darwin"; overlays = with inputs; [ rust.overlays.default neovim.overlay ]; }; + pkgs = import unstable { system = "aarch64-darwin"; overlays = with inputs; [ rust.overlays.default /*neovim.overlay*/ ]; }; extraModules = [ ./profiles/populate.nix diff --git a/nixos/alpha/configuration.nix b/nixos/alpha/configuration.nix index d9dd00d..332c25a 100644 --- a/nixos/alpha/configuration.nix +++ b/nixos/alpha/configuration.nix @@ -22,7 +22,7 @@ }; }; - boot.kernelPackages = pkgs.linuxPackages_6_0; + boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; boot.kernelParams = [ "nohibernate" "nmi_watchdog=0" @@ -67,22 +67,20 @@ i18n.defaultLocale = "en_US.UTF-8"; i18n.inputMethod.enabled = "kime"; - i18n.inputMethod.kime.config = { - engine = { - global_hotkeys = { - C-Space = { - behavior = { - Toggle = [ "Hangul" "Latin" ]; - }; - result = "Consume"; - }; - AltR = { - behavior = "Ignore"; - result = "Bypass"; - }; - }; - }; - }; + i18n.inputMethod.kime.extraConfig = '' + engine: + global_hotkeys: + C-Space: + behavior: !Toggle + - Hangul + - Latin + result: Consume + AltR: + behavior: !Ignore + - Hangul + - Latin + result: Bypass + ''; console.font = "${pkgs.dina-font}/share/fonts/misc/DinaMedium10.pcf.gz"; console.colors = [ @@ -114,7 +112,7 @@ services.zfs.autoScrub.pools = [ "rpool" ]; services.openssh.enable = true; - services.openssh.passwordAuthentication = false; + services.openssh.settings.passwordAuthentication = false; services.openssh.hostKeys = [ { path = "/persist/ssh/ssh_host_ed25519_key"; |