few changes

flake.lock

@@ -47,11 +47,11 @@
         "vdf-src": "vdf-src"
       },
       "locked": {
-        "lastModified": 1786889528,
+        "lastModified": 1789206464,
-        "narHash": "sha256-MfZ0j7ZjeeRvaPm9SdRiij94uBzQfLaIR2DM4Td9clo=",
+        "narHash": "sha256-Ek7Ey654derYvbvFKF5KM1Rk+Ky+6X0kDY46pUMpvbo=",
         "owner": "KeksNino",
         "repo": "ASSella-nix",
-        "rev": "7aaf76cb6fe00860a5a96d3414d3b573c1d5fc24",
+        "rev": "ee77a0b8e2d59389366c619ce3dd6ade4ccfcaf1",
         "type": "github"
       },
       "original": {
@@ -63,16 +63,16 @@
     "assella-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1786832902,
+        "lastModified": 1788946812,
-        "narHash": "sha256-LKYwBILHqHHy9txqLek6UjpsmVRoscbiStU6qY72+Iw=",
+        "narHash": "sha256-HkIm/qpMBdMHzfyJmHQxrUHMUkSaBNl7sYXPwjercBs=",
         "owner": "niwia",
         "repo": "ASSella",
-        "rev": "8a9968aaaab60075a342d073b5d8525bad4a4235",
+        "rev": "728a95627c669e96250fca59e9c1964f0de9f634",
         "type": "github"
       },
       "original": {
         "owner": "niwia",
-        "ref": "v2.6.0",
+        "ref": "v2.6.4",
         "repo": "ASSella",
         "type": "github"
       }
@@ -877,17 +877,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1785830347,
+        "lastModified": 1788435466,
-        "narHash": "sha256-LA56VXRcymN7w9lcDIkgnVTYf1nmb8scPGfTQ6tlHpU=",
+        "narHash": "sha256-A6izbjMpkQpQxQDFHx5SXw5/1gwTTzO0Vz+1sjPTGdw=",
         "owner": "AceSLS",
         "repo": "SLSsteam",
-        "rev": "a1b30e8183651a6d3a016365b18d8893964af7cc",
+        "rev": "71021ad32e47ad4382717f63c53d2d06d44be3bd",
         "type": "github"
       },
       "original": {
         "owner": "AceSLS",
         "repo": "SLSsteam",
-        "rev": "a1b30e8183651a6d3a016365b18d8893964af7cc",
+        "rev": "71021ad32e47ad4382717f63c53d2d06d44be3bd",
         "type": "github"
       }
     },
@@ -1068,11 +1068,11 @@
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1789133576,
+        "lastModified": 1789387191,
-        "narHash": "sha256-wJJGLMs78PDdbdXd0f50vq7s+xpKOuAUMZPsyDgXyew=",
+        "narHash": "sha256-UWMvwIlLV3zF2Mkwus17NfLyBzwBsR/5pHFxrWWGyaA=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "975870eb40a0cb6dc1baf6d63a704f9cfd5d4f27",
+        "rev": "6a281d7c09c0ed6450c5c948ee9a387390285317",
         "type": "github"
       },
       "original": {

flake.nix

@@ -6,7 +6,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     sls-steam = {
-      url = "github:AceSLS/SLSsteam/a1b30e8183651a6d3a016365b18d8893964af7cc";
+      url = "github:AceSLS/SLSsteam/71021ad32e47ad4382717f63c53d2d06d44be3bd";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     zen-browser.url = "github:0xc000022070/zen-browser-flake";
@@ -72,7 +72,6 @@
           ./modules/desktop/xremap.nix
           ./modules/desktop/flatpak.nix
           home-manager.nixosModules.home-manager
-          # gsr-ui.nixosModules.default
           xremap-flake.nixosModules.default
           nixvim.nixosModules.nixvim
           nix-flatpak.nixosModules.nix-flatpak
@@ -91,7 +90,7 @@
             ];
 
             home-manager.extraSpecialArgs = {
-              inherit hyprsplit;
+              inherit hyprsplit sls-steam;
             };
 
           }

hosts/desktop/configuration.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   sls-steam,
-  options,
   ...
 }:
 {
@@ -12,7 +11,9 @@
     ./hardware-configuration.nix
     ../../modules/git.nix
     ../../modules/sops.nix
+    ../../modules/audio.nix
     ../../modules/office.nix
+    ../../modules/system.nix
     ../../modules/scripts.nix
     ../../modules/desktop/vr.nix
     ../../modules/virtualization.nix
@@ -37,21 +38,6 @@
     };
   };
 
-  hardware.graphics.enable = true;
-  hardware.graphics.enable32Bit = true;
-  services.hardware.openrgb.enable = true;
-
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = false;
-  };
-
-  networking = {
-    hostName = "nixos-desktop";
-    networkmanager.enable = true;
-    firewall.enable = false;
-  };
-
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
 
@@ -86,8 +72,6 @@
     shell = pkgs.fish;
   };
 
-  nixpkgs.config.allowUnfree = true;
-
   programs.niri.enable = true;
   programs.hyprland = {
     enable = true;
@@ -101,16 +85,6 @@
   #   style = "breeze";
   # };
 
-  programs.appimage = {
-    enable = true;
-    binfmt = true;
-    package = pkgs.appimage-run.override {
-      extraPkgs = pkgs: [
-        pkgs.zstd
-      ];
-    };
-  };
-
   virtualisation.docker.enable = true;
   services.gvfs.enable = true;
   services.goxlr-utility.enable = true;
@@ -119,12 +93,12 @@
   programs.kdeconnect.enable = true;
   services.rsync.enable = true;
   programs.neovim.enable = true;
-
   services.ratbagd.enable = true;
 
-  programs.nh = {
+  # OPSEC
+  services.mullvad-vpn = {
     enable = true;
-    flake = "/home/user/nix-config";
+    gui.enable = true;
   };
 
   programs.gamemode.enable = true;
@@ -146,60 +120,6 @@
     ui.enable = true;
   };
 
-  programs.nix-ld = {
-    enable = true;
-    libraries =
-      options.programs.nix-ld.libraries.default
-      ++ (with pkgs; [
-        dbus # libdbus-1.so.3
-        fontconfig # libfontconfig.so.1
-        freetype # libfreetype.so.6
-        glib # libglib-2.0.so.0
-        libGL # libGL.so.1
-        libxkbcommon # libxkbcommon.so.0
-        libx11 # libX11.so.6
-        wayland
-        krb5
-        qt6.qtdeclarative
-        qt6.qtbase
-        qt6.qtwayland
-        brotli
-      ]);
-  };
-
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    jack.enable = true;
-    extraConfig.pipewire = {
-      "98-crackling-fix" = {
-        "context.properties" = {
-          "default.clock.quantum" = 1024;
-          "default.clock.min-quantum" = 1024;
-          "default.clock.max-quantum" = 8192;
-        };
-      };
-    };
-  };
-
-  security.pam.loginLimits = [
-    {
-      domain = "@users";
-      item = "rtprio";
-      type = "-";
-      value = "95";
-    }
-    {
-      domain = "@users";
-      item = "memlock";
-      type = "-";
-      value = "unlimited";
-    }
-  ];
-
   system.stateVersion = "24.11";
   system.autoUpgrade.enable = false;
   system.autoUpgrade.allowReboot = true;

hosts/desktop/drives.nix

@@ -72,15 +72,9 @@
   };
 
   fileSystems."/media/gamedisk4" = {
-    device = "/dev/disk/by-uuid/D290EB87C8A1E82A";
+    device = "/dev/disk/by-uuid/fd91dc58-279a-4b26-8a56-2e0fab7bff92";
-    fsType = "ntfs-3g";
+    fsType = "ext4";
     options = [
-      "uid=1000"
-      "gid=100"
-      "rw"
-      "user"
-      "exec"
-      "umask=000"
       "nofail"
     ];
   };

hosts/desktop/home-manager/home.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   config,
+  sls-steam,
   ...
 }:
 {
@@ -16,6 +17,14 @@
   home.username = "user";
   home.homeDirectory = "/home/user";
 
+  home.file.".local/share/SLSsteam/SLSsteam.so".source = "${
+    sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam
+  }/SLSsteam.so";
+
+  home.file.".local/share/SLSsteam/library-inject.so".source = "${
+    sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam
+  }/library-inject.so";
+
   xdg.userDirs = {
     enable = true;
     createDirectories = false;

hosts/desktop/home-manager/programs.nix

@@ -14,6 +14,7 @@
     imv.enable = true;
     librewolf.enable = true;
     java.enable = true;
+    java.package = pkgs.jdk25;
     libreoffice.enable = true;
 
     rofi = {

hosts/desktop/packages.nix

@@ -1,5 +1,6 @@
 { pkgs, ... }: {
 
+  nixpkgs.config.allowUnfree = true;
   environment.systemPackages = with pkgs; [
     wget
     kitty
@@ -68,7 +69,6 @@
     android-tools
     scrcpy
     gocryptfs
-    proton-vpn
     unrar
     croc
     hyprlandPlugins.csgo-vulkan-fix

modules/audio.nix

@@ -0,0 +1,35 @@
+{
+  security.rtkit.enable = true;
+
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+    extraConfig.pipewire = {
+      "98-crackling-fix" = {
+        "context.properties" = {
+          "default.clock.quantum" = 1024;
+          "default.clock.min-quantum" = 1024;
+          "default.clock.max-quantum" = 8192;
+        };
+      };
+    };
+  };
+
+  security.pam.loginLimits = [
+    {
+      domain = "@users";
+      item = "rtprio";
+      type = "-";
+      value = "95";
+    }
+    {
+      domain = "@users";
+      item = "memlock";
+      type = "-";
+      value = "unlimited";
+    }
+  ];
+}

modules/sops.nix

@@ -4,12 +4,27 @@
     sops-nix.nixosModules.sops
   ];
 
-  sops.defaultSopsFile = ../secrets/secrets.yaml;
+  sops = {
-  sops.defaultSopsFormat = "yaml";
+    defaultSopsFile = ../secrets/secrets.yaml;
-  sops.age.keyFile = "/home/user/.config/sops/age/keys.txt";
+    defaultSopsFormat = "yaml";
-  sops.secrets."lastfm_password" = {
-    owner = "user";
-  };
-  sops.secrets."slskd_secrets" = { };
 
+    age.keyFile = "/home/user/.config/sops/age/keys.txt";
+
+    secrets."lastfm_password" = {
+      owner = "user";
+    };
+
+    secrets."slskd_secrets" = { };
+
+    useSystemdActivation = true;
+  };
+
+  systemd.user.services.mpdscribble = {
+    requires = [
+      "sops-install-secrets.service"
+    ];
+    after = [
+      "sops-install-secrets.service"
+    ];
+  };
 }

modules/system.nix

@@ -0,0 +1,57 @@
+{ options, pkgs, ... }:
+{
+  programs.appimage = {
+    enable = true;
+    binfmt = true;
+    package = pkgs.appimage-run.override {
+      extraPkgs = pkgs: [
+        pkgs.zstd
+      ];
+    };
+  };
+
+  hardware.graphics.enable = true;
+  hardware.graphics.enable32Bit = true;
+  services.hardware.openrgb.enable = true;
+
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = false;
+  };
+
+  networking = {
+    hostName = "nixos-desktop";
+    networkmanager.enable = true;
+    firewall.enable = false;
+  };
+
+  programs.nh = {
+    enable = true;
+    flake = "/home/user/nix-config";
+  };
+
+  programs.nix-ld = {
+    enable = true;
+    libraries =
+      options.programs.nix-ld.libraries.default
+      ++ (with pkgs; [
+        dbus # libdbus-1.so.3
+        fontconfig # libfontconfig.so.1
+        freetype # libfreetype.so.6
+        glib # libglib-2.0.so.0
+        libGL # libGL.so.1
+        libxkbcommon # libxkbcommon.so.0
+        libx11 # libX11.so.6
+        wayland
+        krb5
+        qt6.qtdeclarative
+        qt6.qtbase
+        qt6.qtwayland
+        brotli
+        webkitgtk_6_0
+        gtk4
+        libsoup_3
+      ]);
+  };
+
+}