diff options
| author | Soispha <soispha@vhack.eu> | 2024-03-23 20:43:06 +0100 |
|---|---|---|
| committer | Soispha <soispha@vhack.eu> | 2024-03-23 20:43:06 +0100 |
| commit | 40bdcae54a2dec676993672d8a06a1bc75ec368c (patch) | |
| tree | b88ddf83559f4db4e95af7d6bf8493f4d6b52d3a | |
| parent | build(treewide): Update (diff) | |
| download | nixos-config-40bdcae54a2dec676993672d8a06a1bc75ec368c.tar.gz nixos-config-40bdcae54a2dec676993672d8a06a1bc75ec368c.zip | |
refactor(treewide): Update to new modules names (and simplify some code)
| -rw-r--r-- | hm/soispha/conf/gpg/default.nix | 21 | ||||
| -rw-r--r-- | hm/soispha/conf/zsh/default.nix | 2 | ||||
| -rw-r--r-- | hosts/marduk/hardware/default.nix | 3 |
3 files changed, 10 insertions, 16 deletions
diff --git a/hm/soispha/conf/gpg/default.nix b/hm/soispha/conf/gpg/default.nix index d0cc33a2..60c2ef2a 100644 --- a/hm/soispha/conf/gpg/default.nix +++ b/hm/soispha/conf/gpg/default.nix @@ -13,6 +13,7 @@ onlykey-agent ]; }; + settings = if nixosConfig.networking.hostName == "isimud" then {} @@ -23,20 +24,12 @@ default-key = "Soispha <soispha@vhack.eu>"; # TODO: add more }; - gpg-agent = - if nixosConfig.networking.hostName == "isimud" - then { - enable = true; - enableZshIntegration = true; - enableScDaemon = true; # smartcards and such things - pinentryFlavor = "tty"; - } - else { - enable = false; - enableZshIntegration = true; - enableScDaemon = true; # smartcards and such things - pinentryFlavor = "tty"; - }; + gpg-agent = { + enable = nixosConfig.networking.hostName == "isimud"; + enableZshIntegration = true; + enableScDaemon = true; # smartcards and such things + pinentryPackage = pkgs.pinentry-tty; + }; in { programs.gpg = { enable = true; diff --git a/hm/soispha/conf/zsh/default.nix b/hm/soispha/conf/zsh/default.nix index fc0387aa..45d4fe46 100644 --- a/hm/soispha/conf/zsh/default.nix +++ b/hm/soispha/conf/zsh/default.nix @@ -13,7 +13,7 @@ home.sessionPath = []; programs.zsh = { enable = true; - enableAutosuggestions = true; + autosuggestion.enable = true; enableCompletion = true; syntaxHighlighting.enable = true; diff --git a/hosts/marduk/hardware/default.nix b/hosts/marduk/hardware/default.nix index 726e27a1..4fed1d06 100644 --- a/hosts/marduk/hardware/default.nix +++ b/hosts/marduk/hardware/default.nix @@ -12,7 +12,8 @@ boot = { kernelModules = ["rtw89"]; + # FIXME: The kernel version should probably be updated, considering that it's 6.1 <2024-03-23> kernelPackages = pkgs.linuxPackages_6_1; # use this kernel, as it's supported by zfs - zfs.enableUnstable = true; # Default zfs is "broken" (to nixos) on the newest kernel + zfs.package = pkgs.zfs_unstable; # Default zfs is "broken" (to nixos) on the newest kernel }; } |