WIP: Update from 24 -> 26

1 files changed, 53 insertions, 69 deletions

diff --git a/configuration.nix b/configuration.nix
index 507184a..6b7f3fe 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -89,11 +89,9 @@
     pv
     alsa-utils
     ncmpcpp
-    fast-cli
     lm_sensors
     lshw
     iotop
-    dstat
     bottom
     btop
     duf
@@ -103,7 +101,6 @@
     flac
     lame
     imagemagick
-    neofetch
     ffmpeg
     htop
     parted
@@ -112,8 +109,7 @@
     config.services.samba.package
     git
     unzip
-    nodejs-18_x
-    libstdcxx5
+    nodejs_22
     cgit
     rclone
     p7zip
@@ -142,14 +138,12 @@
     6595 # deemix
     548 # AFP
     80 # nginx
-    631 # printing
     2049 # nfs
     6600 # mpd
     1704 # snapcast audio
     1705 # snapcast control
     1780 # snapcast web ui
     8081 # myMPD
-    8080 # yMPD
   ];
   networking.firewall.allowPing = true;
 
@@ -180,18 +174,6 @@
       };
     };
   };
-  services.printing = {
-    enable = true;
-    listenAddresses = [ "*:631" ];
-    allowFrom = [ "all" ];
-    browsing = true;
-    defaultShared = true;
-    drivers = [ pkgs.hplip ];
-  };
-
-  services.printing.extraConf = ''
-    DefaultEncryption Never
-  '';
 
   services.samba = {
     enable = true;
@@ -277,6 +259,9 @@
       location = "git";
       virtualHost = "vandoorn-server.local";
     };
+    gitHttpBackend = {
+      checkExportOkFiles = false; 
+    };
     settings = {
       root-title = "nvd-git";
       root-desc = "Nicholas Van Doorn's personal Git server";
@@ -391,26 +376,27 @@
     group = "git";
   };
 
-  systemd.services.deemix = {
-    description = "Deemix";
-    after = [ "network.target" ];
-    wantedBy = [ "multi-user.target" ];
+  #systemd.services.deemix = {
+  #  description = "Deemix";
+  #  after = [ "network.target" ];
+  #  wantedBy = [ "multi-user.target" ];
 
-    serviceConfig = {
-      Type = "simple";
-      User = "deemix";
-      Group = "media";
-      ExecStart = "${pkgs.nodejs-18_x}/bin/node ${
-        pkgs.callPackage ./deemix.nix { }
-      }/server/dist/app.js --host 0.0.0.0";
-      Environment = "DEEMIX_DATA_DIR=/var/lib/deemix/";
-      Restart = "on-failure";
-      UMask = "0002";
-    };
-  };
+  #  serviceConfig = {
+  #    Type = "simple";
+  #    User = "deemix";
+  #    Group = "media";
+  #    ExecStart = "${pkgs.nodejs_22}/bin/node ${
+  #      pkgs.callPackage ./deemix.nix { }
+  #    }/server/dist/app.js --host 0.0.0.0";
+  #    Environment = "DEEMIX_DATA_DIR=/var/lib/deemix/";
+  #    Restart = "on-failure";
+  #    UMask = "0002";
+  #  };
+  #};
 
   fileSystems."/export/home" = {
-    device = "/mnt/pool/home";
+    device = "pool/home";
+    fsType = "zfs";
     options = [ "bind" ];
   };
 
@@ -425,16 +411,16 @@
     musicDirectory = "/mnt/pool/media/libraries/music";
    
     network.listenAddress = "any";
-    extraConfig = ''
-      audio_output {
-        type   "alsa"
-        name   "snapcast"
-        device "hw:0,0,0"
-        format "48000:16:2"
-        enabled "yes"
-        mixer_type "software"
-      }
-    '';
+    #extraConfig = ''
+    #  audio_output {
+    #    type   "alsa"
+    #    name   "snapcast"
+    #    device "hw:0,0,0"
+    #    format "48000:16:2"
+    #    enabled "yes"
+    #    mixer_type "software"
+    #  }
+    #'';
   };
   
   services.mympd = {
@@ -443,33 +429,31 @@
       http_port = 8081;
     };
   };
-  services.ympd.enable = true;
 
   users.extraGroups.audio.members = [ "snapserver" ];
 
-  services.snapserver = {
-    enable = true;
-    codec = "flac";
+  #services.snapserver = {
+  #  enable = true;
 
-    streams = {
-      mpd = {
-        type = "alsa";
-        location = "";
-        sampleFormat = "48000:16:2";
-        query = {
-          device = "hw:0,1,0";
-        };
-      };
-      line_in = {
-        type = "alsa";
-        location = "";
-        sampleFormat = "48000:16:2";
-        query = {
-          device = "hw:1,0,0";
-        };
-      };
-    };
-  };
+  #  streams = {
+  #    mpd = {
+  #      type = "alsa";
+  #      location = "";
+  #      sampleFormat = "48000:16:2";
+  #      query = {
+  #        device = "hw:0,1,0";
+  #      };
+  #    };
+  #    line_in = {
+  #      type = "alsa";
+  #      location = "";
+  #      sampleFormat = "48000:16:2";
+  #      query = {
+  #        device = "hw:1,0,0";
+  #      };
+  #    };
+  #  };
+  #};
 
   nixpkgs.config.allowUnfree = true;