pinwheel: Clean up fzf module

As it seems to work better with work vpn

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

flake.lock

@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1760836749,
+        "lastModified": 1762618334,
         "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a",
+        "rev": "fcdea223397448d35d9b31f798479227e80183f6",
         "type": "github"
       },
       "original": {
@@ -52,11 +52,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760701190,
+        "lastModified": 1766150702,
-        "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=",
+        "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5",
+        "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1760951609,
+        "lastModified": 1766826803,
-        "narHash": "sha256-rWkUWKWcLin0+dKvinWC1IZVxJnIvXV3q/wlmmKkzo4=",
+        "narHash": "sha256-eX9nR+5eKip1ivAumMPnjG9DTVIREDaLqW3jhnvr8c0=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "41bee8f6a80b36b0348a8e750e5db88fea528171",
+        "rev": "246eecc2b1dd66d4fcc2857d1a579d9452bd85ed",
         "type": "github"
       },
       "original": {
@@ -132,11 +132,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760969583,
+        "lastModified": 1766682973,
-        "narHash": "sha256-vsf5mvR0xxK4GsfLx5bMJAQ4ysdrKymMIifNw+4TP7g=",
+        "narHash": "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c9d758b500e53db5b74aa02d17dc45b65229e8e9",
+        "rev": "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2",
         "type": "github"
       },
       "original": {
@@ -152,11 +152,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759613406,
+        "lastModified": 1766066098,
-        "narHash": "sha256-PzgQJydp+RlKvwDi807pXPlURdIAVqLppZDga3DwPqg=",
+        "narHash": "sha256-d3HmUbmfTDIt9mXEHszqyo2byqQMoyJtUJCZ9U1IqHQ=",
         "owner": "hyprwm",
         "repo": "contrib",
-        "rev": "32e1a75b65553daefb419f0906ce19e04815aa3a",
+        "rev": "41dbcac8183bb1b3a4ade0d8276b2f2df6ae4690",
         "type": "github"
       },
       "original": {
@@ -193,11 +193,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760961269,
+        "lastModified": 1766234633,
-        "narHash": "sha256-Udg6DnM6scJj+imbttJR7GQpG2WWeDZ1JOtySTY99M0=",
+        "narHash": "sha256-0BES8Gas4ci6Q/TTPToOANZNbgznjnWpqpNxgJspLlM=",
         "owner": "viperML",
         "repo": "nh",
-        "rev": "e27508e06f74c7f03616150c1ac1431eaef7f443",
+        "rev": "84785ab6f981ef6d0615a94e7f48ba572e8a884a",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1760958188,
+        "lastModified": 1766568855,
-        "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
+        "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
+        "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80",
         "type": "github"
       },
       "original": {
@@ -239,11 +239,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1760878510,
+        "lastModified": 1766651565,
-        "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
+        "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
+        "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
         "type": "github"
       },
       "original": {
@@ -255,11 +255,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1760862643,
+        "lastModified": 1766687554,
-        "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
+        "narHash": "sha256-DegN7KD/EtFSKXf2jvqL6lvev6GlfAAatYBcRC8goEo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
+        "rev": "fd0ca39c92fdb4012ed8d60e1683c26fddadd136",
         "type": "github"
       },
       "original": {

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
     ];
   };
 }

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";
+          };
         };
       };
 

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
     ];
   };
 }

hosts/manatee/modules/git/default.nix

@@ -23,7 +23,7 @@ in
           { path = ./gitconfig; }
         ];
 
-        extraConfig = {
+        settings = {
           rerere.enable = true;
         };
       };

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";
+          };
         };
       };
     };

hosts/pinwheel/configuration.nix

@@ -17,7 +17,10 @@
   users.users.alex = {
     isNormalUser = true;
     description = "alex";
-    extraGroups = [ "wheel" ];
+    extraGroups = [
+      "wheel"
+      "networkmanager"
+    ];
   };
 
   environment.systemPackages = with pkgs; [

hosts/pinwheel/home.nix

@@ -14,16 +14,17 @@
         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
           pkgs.zip
+          pkgs.unzip
           pkgs.unar
           pkgs.jq
           pkgs.dbeaver-bin
           pkgs.htop
-          pkgs.onlyoffice-bin
+          pkgs.onlyoffice-desktopeditors
           pkgs.wdisplays
           pkgs.vlc
         ];

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
     ];
   };
 }

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
   ];

hosts/pinwheel/modules/fzf/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   home-manager.users.alex = {
     programs.fzf = {

hosts/pinwheel/modules/git/default.nix

@@ -23,7 +23,7 @@ in
           { path = ./gitconfig; }
         ];
 
-        extraConfig = {
+        settings = {
           rerere.enable = true;
         };
       };

hosts/pinwheel/modules/hyprland/default.nix

@@ -180,5 +180,7 @@ in
 
     # openGL is needed for wayland/hyprland
     hardware.graphics.enable = true;
+
+    boot.kernelParams = [ "i915.enable_psr=0" ];
   };
 }

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
     ];
   };
 

hosts/pinwheel/modules/network/default.nix

@@ -1,21 +1,22 @@
+{ pkgs, ... }:
 {
-  services.connman = {
+  home-manager = {
-    enable = true;
+    users.alex = {
+      home.packages = [ pkgs.networkmanager ];
+    };
+  };
 
-    wifi = {
+  networking = {
-      backend = "iwd";
+    wireless.enable = false; # Wireless is managed by networkmanager
+
+    networkmanager = {
+      enable = true;
+
+      wifi = {
+        backend = "iwd";
+      };
     };
 
-    networkInterfaceBlacklist = [
-      "vmnet"
-      "vboxnet"
-      "virbr"
-      "ifb"
-      "ve"
-      "docker"
-      "br-"
-      "wg-"
-    ];
   };
 
   networking = {

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

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";
+        };
       };
     };
 

hosts/pinwheel/modules/vim/default.nix

@@ -18,7 +18,7 @@ in
     };
 
     programs.git = lib.mkIf gitEnabled {
-      extraConfig = {
+      settings = {
         core = {
           editor = "vim";
         };

hosts/pinwheel/modules/waybar/default.nix

@@ -85,11 +85,25 @@ let
   '';
 
   work-vpn-status = pkgs.writeShellScript "work-vpn-status" ''
-    STAGING=$(systemctl is-active openvpn-work-staging.service)
+    ACTIVE_ENVS=""
-    [ "$STAGING" == "active" ] && echo "WORK-VPN STAGING ON" && exit 0
 
-    PRODUCTION=$(systemctl is-active openvpn-work-production.service)
+    STAGING_STATUS=$(systemctl is-active openvpn-work-staging.service)
-    [ "$PRODUCTION" == "active" ] && echo "WORK-VPN PRODUCTION ON" && exit 0
+    if [ "$STAGING_STATUS" == "active" ]; then
+        ACTIVE_ENVS="S"
+    fi
+
+    PRODUCTION_STATUS=$(systemctl is-active openvpn-work-production.service)
+    if [ "$PRODUCTION_STATUS" == "active" ]; then
+        if [ -n "$ACTIVE_ENVS" ]; then
+            ACTIVE_ENVS="$ACTIVE_ENVS&P"
+        else
+            ACTIVE_ENVS="P"
+        fi
+    fi
+
+    if [ -n "$ACTIVE_ENVS" ]; then
+        echo "WORK-VPN $ACTIVE_ENVS ON"
+    fi
   '';
 
   toggle-bt-power = pkgs.writeShellScript "toggle-bt-power" ''

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
@@ -34,6 +34,17 @@ in
       # for `radio`
       pkgs.go-mockery
       pkgs.golangci-lint
+
+      (pkgs.writeShellScriptBin "work-vpn" ''
+        case $1 in
+          up)
+            sudo sh -c "systemctl start openvpn-work-staging.service; systemctl start openvpn-work-production.service"
+            ;;
+          down)
+            sudo sh -c "systemctl stop openvpn-work-staging.service; systemctl stop openvpn-work-production.service"
+            ;;
+        esac
+      '')
     ];
 
     programs.go = lib.mkIf goEnabled {

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
     ];
   };
 }

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";
+          };
         };
       };
     };