From e788efc4ff7dcdc1be6295cd5edae97b34594f6a Mon Sep 17 00:00:00 2001 From: Alexander Heldt Date: Sat, 3 Jan 2026 16:41:41 +0100 Subject: [PATCH] pinwheel/manatee/backwards: Adjust for updated nixpkgs --- config-manager/default.nix | 2 +- hosts/backwards/modules/age/default.nix | 2 +- hosts/backwards/modules/ssh/default.nix | 13 +++++++++++++ hosts/manatee/modules/age/default.nix | 2 +- hosts/manatee/modules/git/default.nix | 2 +- hosts/manatee/modules/ssh/default.nix | 13 +++++++++++++ hosts/pinwheel/home.nix | 4 ++-- hosts/pinwheel/modules/age/default.nix | 2 +- hosts/pinwheel/modules/fonts/default.nix | 2 +- hosts/pinwheel/modules/git/default.nix | 2 +- hosts/pinwheel/modules/music/default.nix | 2 +- hosts/pinwheel/modules/screenshot/default.nix | 2 +- hosts/pinwheel/modules/ssh/default.nix | 13 +++++++++++++ hosts/pinwheel/modules/vim/default.nix | 2 +- hosts/pinwheel/modules/work/default.nix | 4 ++-- hosts/tadpole/modules/age/default.nix | 2 +- hosts/tadpole/modules/ssh/default.nix | 13 +++++++++++++ 17 files changed, 67 insertions(+), 15 deletions(-) diff --git a/config-manager/default.nix b/config-manager/default.nix index 2ee319c..98906d0 100644 --- a/config-manager/default.nix +++ b/config-manager/default.nix @@ -9,7 +9,7 @@ let flakePath = config.config-manager.flakePath; nixosConfiguration = config.config-manager.nixosConfiguration; - nh = inputs.nh.packages."${pkgs.system}".default; + nh = inputs.nh.packages."${pkgs.stdenv.hostPlatform.system}".default; config-manager = if flakePath == "" then diff --git a/hosts/backwards/modules/age/default.nix b/hosts/backwards/modules/age/default.nix index 504bd61..abdb7ff 100644 --- a/hosts/backwards/modules/age/default.nix +++ b/hosts/backwards/modules/age/default.nix @@ -8,7 +8,7 @@ }; environment.systemPackages = [ - inputs.agenix.packages."${pkgs.system}".default + inputs.agenix.packages."${pkgs.stdenv.hostPlatform.system}".default ]; }; } diff --git a/hosts/backwards/modules/ssh/default.nix b/hosts/backwards/modules/ssh/default.nix index 5f61ea0..214f184 100644 --- a/hosts/backwards/modules/ssh/default.nix +++ b/hosts/backwards/modules/ssh/default.nix @@ -39,6 +39,19 @@ in hostname = "codeberg.org"; identityFile = "/home/alex/.ssh/alex.backwards-codeberg.org"; }; + + "*" = { + forwardAgent = false; + addKeysToAgent = "no"; + compression = false; + serverAliveInterval = 0; + serverAliveCountMax = 3; + hashKnownHosts = false; + userKnownHostsFile = "~/.ssh/known_hosts"; + controlMaster = "no"; + controlPath = "~/.ssh/master-%r@%n:%p"; + controlPersist = "no"; + }; }; }; diff --git a/hosts/manatee/modules/age/default.nix b/hosts/manatee/modules/age/default.nix index ff8c190..4c692a8 100644 --- a/hosts/manatee/modules/age/default.nix +++ b/hosts/manatee/modules/age/default.nix @@ -8,7 +8,7 @@ }; environment.systemPackages = [ - inputs.agenix.packages."${pkgs.system}".default + inputs.agenix.packages."${pkgs.stdenv.hostPlatform.system}".default ]; }; } diff --git a/hosts/manatee/modules/git/default.nix b/hosts/manatee/modules/git/default.nix index d100a05..983541f 100644 --- a/hosts/manatee/modules/git/default.nix +++ b/hosts/manatee/modules/git/default.nix @@ -23,7 +23,7 @@ in { path = ./gitconfig; } ]; - extraConfig = { + settings = { rerere.enable = true; }; }; diff --git a/hosts/manatee/modules/ssh/default.nix b/hosts/manatee/modules/ssh/default.nix index 517c232..1ef710f 100644 --- a/hosts/manatee/modules/ssh/default.nix +++ b/hosts/manatee/modules/ssh/default.nix @@ -27,6 +27,19 @@ in hostname = "git.ppp.pm"; identityFile = "/home/alex/.ssh/alex.manatee-git.ppp.pm"; }; + + "*" = { + forwardAgent = false; + addKeysToAgent = "no"; + compression = false; + serverAliveInterval = 0; + serverAliveCountMax = 3; + hashKnownHosts = false; + userKnownHostsFile = "~/.ssh/known_hosts"; + controlMaster = "no"; + controlPath = "~/.ssh/master-%r@%n:%p"; + controlPersist = "no"; + }; }; }; }; diff --git a/hosts/pinwheel/home.nix b/hosts/pinwheel/home.nix index 6f0c347..cea766b 100644 --- a/hosts/pinwheel/home.nix +++ b/hosts/pinwheel/home.nix @@ -14,7 +14,7 @@ home.homeDirectory = "/home/alex"; home.packages = [ - inputs.whib-backend.packages.${pkgs.system}.whib-import + inputs.whib-backend.packages.${pkgs.stdenv.hostPlatform.system}.whib-import # pkgs.beekeeper-studio pkgs.bitwarden-desktop pkgs.gimp @@ -24,7 +24,7 @@ pkgs.jq pkgs.dbeaver-bin pkgs.htop - pkgs.onlyoffice-bin + pkgs.onlyoffice-desktopeditors pkgs.wdisplays pkgs.vlc ]; diff --git a/hosts/pinwheel/modules/age/default.nix b/hosts/pinwheel/modules/age/default.nix index 6b9c99c..f1ac79b 100644 --- a/hosts/pinwheel/modules/age/default.nix +++ b/hosts/pinwheel/modules/age/default.nix @@ -11,7 +11,7 @@ }; environment.systemPackages = [ - inputs.agenix.packages."${pkgs.system}".default + inputs.agenix.packages."${pkgs.stdenv.hostPlatform.system}".default ]; }; } diff --git a/hosts/pinwheel/modules/fonts/default.nix b/hosts/pinwheel/modules/fonts/default.nix index d131ed3..bd12964 100644 --- a/hosts/pinwheel/modules/fonts/default.nix +++ b/hosts/pinwheel/modules/fonts/default.nix @@ -3,7 +3,7 @@ fonts.packages = [ pkgs.noto-fonts pkgs.noto-fonts-cjk-sans - pkgs.noto-fonts-emoji + pkgs.noto-fonts-color-emoji pkgs.nerd-fonts.jetbrains-mono pkgs.liberation_ttf ]; diff --git a/hosts/pinwheel/modules/git/default.nix b/hosts/pinwheel/modules/git/default.nix index d100a05..983541f 100644 --- a/hosts/pinwheel/modules/git/default.nix +++ b/hosts/pinwheel/modules/git/default.nix @@ -23,7 +23,7 @@ in { path = ./gitconfig; } ]; - extraConfig = { + settings = { rerere.enable = true; }; }; diff --git a/hosts/pinwheel/modules/music/default.nix b/hosts/pinwheel/modules/music/default.nix index 6107edb..73fd342 100644 --- a/hosts/pinwheel/modules/music/default.nix +++ b/hosts/pinwheel/modules/music/default.nix @@ -33,7 +33,7 @@ in home.packages = [ pkgs.playerctl pkgs.spotify - inputs.naviterm.packages.${pkgs.system}.default + inputs.naviterm.packages.${pkgs.stdenv.hostPlatform.system}.default ]; }; diff --git a/hosts/pinwheel/modules/screenshot/default.nix b/hosts/pinwheel/modules/screenshot/default.nix index a04ee4d..e0f28d1 100644 --- a/hosts/pinwheel/modules/screenshot/default.nix +++ b/hosts/pinwheel/modules/screenshot/default.nix @@ -8,7 +8,7 @@ let hyprlandEnabled = config.mod.hyprland.enable; - grimblast = inputs.hyprland-contrib.packages.${pkgs.system}.grimblast; + grimblast = inputs.hyprland-contrib.packages.${pkgs.stdenv.hostPlatform.system}.grimblast; area = "${pkgs.libnotify}/bin/notify-send 'ps: selected area' && ${grimblast}/bin/grimblast copy area"; screen = "${pkgs.libnotify}/bin/notify-send 'ps: selected screen' &&${grimblast}/bin/grimblast copy output"; in diff --git a/hosts/pinwheel/modules/ssh/default.nix b/hosts/pinwheel/modules/ssh/default.nix index 70c8da9..14f5488 100644 --- a/hosts/pinwheel/modules/ssh/default.nix +++ b/hosts/pinwheel/modules/ssh/default.nix @@ -40,6 +40,19 @@ hostname = "git.ppp.pm"; identityFile = "/home/alex/.ssh/alex.pinwheel-git.ppp.pm"; }; + + "*" = { + forwardAgent = false; + addKeysToAgent = "no"; + compression = false; + serverAliveInterval = 0; + serverAliveCountMax = 3; + hashKnownHosts = false; + userKnownHostsFile = "~/.ssh/known_hosts"; + controlMaster = "no"; + controlPath = "~/.ssh/master-%r@%n:%p"; + controlPersist = "no"; + }; }; }; diff --git a/hosts/pinwheel/modules/vim/default.nix b/hosts/pinwheel/modules/vim/default.nix index 0b49e45..7da83b0 100644 --- a/hosts/pinwheel/modules/vim/default.nix +++ b/hosts/pinwheel/modules/vim/default.nix @@ -18,7 +18,7 @@ in }; programs.git = lib.mkIf gitEnabled { - extraConfig = { + settings = { core = { editor = "vim"; }; diff --git a/hosts/pinwheel/modules/work/default.nix b/hosts/pinwheel/modules/work/default.nix index a02aa31..b63d36d 100644 --- a/hosts/pinwheel/modules/work/default.nix +++ b/hosts/pinwheel/modules/work/default.nix @@ -17,10 +17,10 @@ in }; home.packages = [ - # (pkgs.callPackage ./pants.nix { inherit (pkgs) system; }) + # (pkgs.callPackage ./pants.nix { inherit (pkgs) stdenv.hostPlatform.system; }) # (pkgs.callPackage ./syb-cli.nix { }) - (pkgs.jetbrains.plugins.addPlugins pkgs.jetbrains.idea-ultimate [ "ideavim" ]) + (pkgs.jetbrains.plugins.addPlugins pkgs.jetbrains.idea [ "ideavim" ]) (pkgs.google-cloud-sdk.withExtraComponents [ pkgs.google-cloud-sdk.components.gke-gcloud-auth-plugin diff --git a/hosts/tadpole/modules/age/default.nix b/hosts/tadpole/modules/age/default.nix index 8a5a172..1b9b62a 100644 --- a/hosts/tadpole/modules/age/default.nix +++ b/hosts/tadpole/modules/age/default.nix @@ -8,7 +8,7 @@ }; environment.systemPackages = [ - inputs.agenix.packages."${pkgs.system}".default + inputs.agenix.packages."${pkgs.stdenv.hostPlatform.system}".default ]; }; } diff --git a/hosts/tadpole/modules/ssh/default.nix b/hosts/tadpole/modules/ssh/default.nix index 67d6f80..0f217c0 100644 --- a/hosts/tadpole/modules/ssh/default.nix +++ b/hosts/tadpole/modules/ssh/default.nix @@ -32,6 +32,19 @@ in hostname = "codeberg.org"; identityFile = "/home/alex/.ssh/alex.tadpole-codeberg.org"; }; + + "*" = { + forwardAgent = false; + addKeysToAgent = "no"; + compression = false; + serverAliveInterval = 0; + serverAliveCountMax = 3; + hashKnownHosts = false; + userKnownHostsFile = "~/.ssh/known_hosts"; + controlMaster = "no"; + controlPath = "~/.ssh/master-%r@%n:%p"; + controlPersist = "no"; + }; }; }; };