Merge pull request #515 from genebean/upgrade

Upgrading to 25.05

modules/hosts/common/default.nix

@@ -261,7 +261,7 @@ in {
       autosuggestion.enable = true;
       history.save = 1000000;
       history.size = 1000000;
-      initExtra = ''
+      initContent = ''
         [ -f ~/.private-env ] && source ~/.private-env || echo '~/.private-env is missing'
         [ -f ~/.gitconfig-local ] || echo '~/.gitconfig-local is missing. Create it and set user.email'
 

modules/hosts/darwin/default.nix

@@ -1,4 +1,6 @@
 { pkgs, hostname, username, ... }: {
+  system.primaryUser = username;
+
   environment = {
     shells = with pkgs; [ bash zsh ];
     pathsToLink = [
@@ -125,8 +127,6 @@
     zsh.enable = true;
   };
 
-  services.nix-daemon.enable = true;
-
   users.users.${username} = {
     home = "/Users/${username}";
     shell = pkgs.zsh;

modules/hosts/darwin/home.nix

@@ -1,7 +1,7 @@
 { username, ... }: {
   # dawrwin-specific shell config
   programs.zsh = {
-    initExtra = ''
+    initContent = ''
       function otpon() {
         osascript -e 'tell application "yubiswitch" to KeyOn'
       }
@@ -17,8 +17,8 @@
     oh-my-zsh.plugins = [ "macos" ];
     shellAliases = {
       currentwifi = "networksetup -getairportnetwork en0 |cut -d ':' -f2- | cut -d ' ' -f2-";
-      nixdiff = "brew outdated && brew outdated --cask && mas outdated && cd ~/repos/dots && darwin-rebuild build --flake . && nvd diff /run/current-system result";
-      nixup = "darwin-rebuild switch --flake ~/repos/dots";
+      nixdiff = "brew outdated && brew outdated --cask && mas outdated && cd ~/repos/dots && sudo darwin-rebuild build --flake . && nvd diff /run/current-system result";
+      nixup = "sudo darwin-rebuild switch --flake ~/repos/dots";
       uwgconnect = "networksetup -setairportnetwork en0 SecureWest";
       uwgforget = "networksetup -removepreferredwirelessnetwork en0 SecureWest";
       ykey = "pkill -9 gpg-agent && source ~/.zshrc; ssh-add -L";

modules/hosts/darwin/mightymac/default.nix

@@ -77,4 +77,6 @@
       "Xcode" = 497799835;
     };
   };
+
+  security.pam.services.sudo_local.enable = false;
 }

modules/hosts/nixos/bigboy/default.nix

@@ -43,7 +43,6 @@
     zoom-us
   ];
 
-  hardware.pulseaudio.enable = false;
   
   networking.networkmanager.enable = true;
 
@@ -82,6 +81,7 @@
       pulse.enable = true;
     };
     printing.enable = true; # Enable CUPS
+    pulseaudio.enable = false;
     smartd.enable = true;
     xserver = {
       enable = true;

modules/hosts/nixos/default.nix

@@ -29,12 +29,9 @@
   fonts.fontDir.enable = true;
   fonts.packages = with pkgs; [
     font-awesome
-    (nerdfonts.override {
-      fonts = [
-        "Hack"
-        "SourceCodePro"
-      ];
-    })
+    nerd-fonts.hack
+    # Pulled from https://github.com/NixOS/nixpkgs/blob/nixos-25.05/pkgs/data/fonts/nerd-fonts/manifests/fonts.json
+    nerd-fonts.sauce-code-pro
   ];
 
   networking.hostName = "${hostname}";

modules/hosts/nixos/hetznix01/post-install/default.nix

@@ -112,16 +112,6 @@ in {
     };
     plausible = {
       enable = true;
-      adminUser = {
-        # activate is used to skip the email verification of the admin-user that's
-        # automatically created by plausible. This is only supported if
-        # postgresql is configured by the module. This is done by default, but
-        # can be turned off with services.plausible.database.postgres.setup.
-        activate = true;
-        email = "${username}@technicalissues.us";
-        name = username;
-        passwordFile = config.sops.secrets.plausible_admin_pass.path;
-      };
       database = {
         clickhouse.setup = true;
         postgres.setup = true;

modules/hosts/nixos/nixnuc/default.nix

@@ -128,7 +128,6 @@ in {
   ];
 
   # Enable sound with pipewire.
-  hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
@@ -136,6 +135,7 @@ in {
     alsa.support32Bit = true;
     pulse.enable = true;
   };
+  services.pulseaudio.enable = false;
 
   programs.mtr.enable = true;
 

modules/hosts/nixos/rainbow-planet/default.nix

@@ -47,7 +47,7 @@
     mumble
     networkmanager-openvpn
     pavucontrol
-    polkit-kde-agent
+    kdePackages.polkit-kde-agent-1
     #ulauncher
     podman-compose
     podman-tui # status of containers in the terminal
@@ -140,7 +140,6 @@
   };
 
   # Enable sound with pipewire.
-  hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
@@ -149,6 +148,7 @@
     pulse.enable = true;
     wireplumber.enable = true;
   };
+  services.pulseaudio.enable = false;
 
   sops = {
     age.keyFile = "${config.users.users.${username}.home}/.config/sops/age/keys.txt";