update

configuration.nix

@@ -1,7 +1,7 @@
 {
   config,
   pkgs,
-  inputs,
+  sls-steam,
   ...
 }:
 
@@ -22,6 +22,7 @@
       "user"
       "exec"
       "umask=000"
+      "nofail"
     ];
   };
 
@@ -35,6 +36,21 @@
       "user"
       "exec"
       "umask=000"
+      "nofail"
+    ];
+  };
+
+  fileSystems."/media/gamedisk2" = {
+    device = "/dev/disk/by-uuid/945A7421DAD8A3CE";
+    fsType = "ntfs3";
+    options = [
+      "uid=1000"
+      "gid=100"
+      "rw"
+      "user"
+      "exec"
+      "umask=000"
+      "nofail"
     ];
   };
 
@@ -58,7 +74,6 @@
       "application/x-gnome-saved-search" = [ "nemo.desktop" ];
     };
   };
-  services.gvfs.enable = true;
 
   hardware.graphics.enable = true;
 
@@ -68,7 +83,7 @@
   boot.loader.grub.efiSupport = true;
 
   networking.hostName = "nixos"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  networking.firewall.enable = false;
 
   networking.networkmanager.enable = true;
 
@@ -102,7 +117,6 @@
       "wheel"
     ];
     shell = pkgs.fish;
-    packages = with pkgs; [ ];
   };
 
   nixpkgs.config.allowUnfree = true;
@@ -131,6 +145,7 @@
   programs.neovim.enable = true;
   programs.tmux.enable = true;
   programs.bat.enable = true;
+  programs.nh.enable = true;
   programs.git = {
     enable = true;
     config = {
@@ -148,12 +163,12 @@
   };
   programs.steam = {
     enable = true;
-    package = pkgs.steam.override {
+    package = pkgs.millennium-steam.override {
       extraEnv = {
         LD_AUDIT = "${
-          inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam
+          sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam
         }/library-inject.so:${
-          inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam
+          sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam
         }/SLSsteam.so";
       };
     };
@@ -170,10 +185,6 @@
   security.rtkit.enable = true;
   systemd.services."rtkit-daemon".enable = true;
 
-  nixpkgs.config.permittedInsecurePackages = [
-    "electron-39.8.10"
-  ];
-
   system.stateVersion = "24.11";
   system.autoUpgrade.enable = false;
   system.autoUpgrade.allowReboot = true;

discord-music-presence/.envrc

@@ -1,6 +0,0 @@
-if has nix_direnv_version; then
-  watch_file modules/flake/shell.nix
-
-  # now we want to load the flake environment
-  use flake
-fi

discord-music-presence/.gitignore

@@ -1,15 +0,0 @@
-### Nix template
-
-# Ignore build outputs from performing a nix-build or `nix build` command
-result
-result-*
-
-# Ignore the configuration folder for Jetbrains IDEs
-.idea/
-
-# Development environment
-.direnv/
-
-# Disable vm outputs that are called when starting a vm in this directory
-*.qcow
-*.qcow2

discord-music-presence/flake.lock

@@ -1,27 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1778869304,
-        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

discord-music-presence/flake.nix

@@ -1,30 +0,0 @@
-{
-  description = "Xaiya's packaged packages";
-
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-
-  outputs =
-    { self, nixpkgs }:
-    let
-      systems = nixpkgs.lib.systems.flakeExposed;
-
-      forAllSystems =
-        function:
-          nixpkgs.lib.genAttrs systems (
-            system: function (
-              import nixpkgs {
-                inherit system;
-                config.allowUnfree = true;
-              }
-            )
-          );
-    in {
-      packages = forAllSystems (pkgs: {
-        discord-music-presence = pkgs.callPackage ./pkgs/discord-music-presence.nix { };
-      });
-
-      devShells = forAllSystems (pkgs: {
-          default = pkgs.callPackage ./shell.nix { };
-      });
-    };
-}

discord-music-presence/pkgs/discord-music-presence.nix

@@ -1,79 +0,0 @@
-{
-  lib,
-  fetchurl,
-  stdenv,
-
-  xkeyboard_config,
-
-  wayland,
-  libGL,
-
-  openssl,
-  cacert,
-
-  fontconfig,
-  freetype,
-  libgpg-error,
-  e2fsprogs,
-
-  autoPatchelfHook,
-  makeWrapper,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "musicpresence";
-  version = "2.3.5";
-
-  src = fetchurl {
-    url = "https://github.com/ungive/discord-music-presence/releases/download/v${version}/${pname}-${version}-linux-x86_64.tar.gz";
-    hash = "sha256-BDgM1SfyEXC0oW+J33mYKwqRrvZX3cy/X9k7Yuk4kS8=";
-  };
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    makeWrapper
-  ];
-
-  buildInputs = [
-    stdenv.cc.cc
-    xkeyboard_config # ARGG
-
-    wayland
-    libGL
-
-    openssl
-    cacert
-
-    fontconfig
-    freetype
-    libgpg-error
-    e2fsprogs
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin $out/share
-    cp -r usr/* $out
-
-    substituteInPlace $out/share/applications/${pname}.desktop \
-    --replace-fail Exec=${pname} Exec=$out/bin/${pname}
-
-    runHook postInstall
-  '';
-
-  postFixup = ''
-    wrapProgram $out/bin/${pname} \
-      --set XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb \
-      --set SSL_CERT_FILE ${cacert}/etc/ssl/certs/ca-bundle.crt \
-      --set OPENSSL_CONF ${openssl.out}/etc/ssl/openssl.cnf \
-  '';
-
-  meta = {
-    description = "The Discord music status that works with any media player";
-    homepage = "https://github.com/ungive/discord-music-presence";
-    license = lib.licenses.unfreeRedistributable;
-    maintainers = with lib.maintainers; [ ];
-    mainProgram = "musicpresence";
-  };
-}

discord-music-presence/shell.nix

@@ -1,12 +0,0 @@
-{
-  mkShell,
-  callPackage,
-}:
-let
-  defaultPackage = callPackage ./pkgs/discord-music-presence.nix { };
-in
-mkShell {
-  inputsFrom = [ defaultPackage ];
-
-  packages = [ ];
-}

flake.lock

@@ -20,14 +20,18 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "path": "./discord-music-presence",
+        "lastModified": 1779460892,
-        "type": "path"
+        "narHash": "sha256-/BjfCD3ws1xroJ/vUJ6GYtvoVythAjbUHpUHP9mcmPY=",
+        "ref": "refs/heads/master",
+        "rev": "537d0dd2844f85598994f493825f1f9d967af4e2",
+        "revCount": 10,
+        "type": "git",
+        "url": "https://tangled.org/xaiya.dev/nix-pkgs"
       },
       "original": {
-        "path": "./discord-music-presence",
+        "type": "git",
-        "type": "path"
+        "url": "https://tangled.org/xaiya.dev/nix-pkgs"
-      },
+      }
-      "parent": []
     },
     "dms": {
       "inputs": {
@@ -84,6 +88,24 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -125,6 +147,44 @@
         "type": "github"
       }
     },
+    "millennium": {
+      "inputs": {
+        "millennium-src": "millennium-src",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "dir": "packages/nix",
+        "lastModified": 1783532163,
+        "narHash": "sha256-n+YQKnVt0H1B2z6N1PmaadeVorRHi956q48/g2y8Hnc=",
+        "owner": "SteamClientHomebrew",
+        "repo": "Millennium",
+        "rev": "3623ed0ed9f6065ce666cb0276ff0b903fee2355",
+        "type": "github"
+      },
+      "original": {
+        "dir": "packages/nix",
+        "owner": "SteamClientHomebrew",
+        "repo": "Millennium",
+        "type": "github"
+      }
+    },
+    "millennium-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1783268941,
+        "narHash": "sha256-MJLJ0I48HXgfOpISTAbDMYMUdWj9A6M+jGQz4uAvwyw=",
+        "owner": "SteamClientHomebrew",
+        "repo": "Millennium",
+        "rev": "f37f05bdbd4727d873a1ad83ce72d062ef9a0c48",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SteamClientHomebrew",
+        "repo": "Millennium",
+        "rev": "f37f05bdbd4727d873a1ad83ce72d062ef9a0c48",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1778869304,
@@ -157,6 +217,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1781577229,
+        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1783386518,
         "narHash": "sha256-a8mRODbGSR7QY0tW9DuaavGRrCcfyIjH1H1m2WOsZlk=",
@@ -171,7 +247,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1767026758,
         "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=",
@@ -187,7 +263,23 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1783279667,
+        "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1782723713,
         "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=",
@@ -208,12 +300,35 @@
         "discord-music-presence": "discord-music-presence",
         "dms": "dms",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
+        "millennium": "millennium",
+        "nixpkgs": "nixpkgs_3",
         "sls-steam": "sls-steam",
         "xremap-flake": "xremap-flake",
+        "yazi": "yazi",
         "zen-browser": "zen-browser"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "yazi",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1783320166,
+        "narHash": "sha256-l7C/OsjcnWDOk2K3ssj+SBduwL67LashjBqis9+t468=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "20ee15370c9256669d66968b89ee20a4b0a4e673",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "sls-steam": {
       "inputs": {
         "nixpkgs": [
@@ -234,6 +349,21 @@
         "type": "github"
       }
     },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "xremap": {
       "flake": false,
       "locked": {
@@ -255,7 +385,7 @@
       "inputs": {
         "crane": "crane",
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "xremap": "xremap"
       },
       "locked": {
@@ -272,17 +402,37 @@
         "type": "github"
       }
     },
+    "yazi": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_5",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1783501452,
+        "narHash": "sha256-gSdIueInGLAAZwD3aZk/hFhhzZCBrtys/Im3FelePhw=",
+        "owner": "sxyazi",
+        "repo": "yazi",
+        "rev": "dbb0cc0d556d73935ebdc1e3d61a2a8aa27059d2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sxyazi",
+        "repo": "yazi",
+        "type": "github"
+      }
+    },
     "zen-browser": {
       "inputs": {
         "home-manager": "home-manager_2",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1783371882,
+        "lastModified": 1783489920,
-        "narHash": "sha256-Z0ESbxSeHR5p3CD1LLVKttX2vaPPnjNfZbqCJlQgcF8=",
+        "narHash": "sha256-sZediA0pfMCXm6nA6fvO1vEsWvybEvP5GCnaAPDcTq0=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "9357f05e60643b057038ff3f89c87d4a1d08cae1",
+        "rev": "3671c6eceee35fd06fd1f60b71eed968cc9d7449",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,62 +1,68 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs";
-    zen-browser.url = "github:0xc000022070/zen-browser-flake";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    discord-music-presence = {
-      url = "path:./discord-music-presence";
-    };
     dms = {
       url = "github:AvengeMedia/DankMaterialShell";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    xremap-flake.url = "github:xremap/nix-flake";
     sls-steam = {
       url = "github:AceSLS/SLSsteam";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    zen-browser.url = "github:0xc000022070/zen-browser-flake";
+    xremap-flake.url = "github:xremap/nix-flake";
+    discord-music-presence.url = "git+https://tangled.org/xaiya.dev/nix-pkgs";
+    yazi.url = "github:sxyazi/yazi";
+    millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix";
   };
 
   outputs =
     {
       self,
+      nixpkgs,
+      home-manager,
       zen-browser,
       discord-music-presence,
       xremap-flake,
       sls-steam,
+      yazi,
+      millennium,
+      dms,
       ...
-    }@inputs:
+    }:
     let
       system = "x86_64-linux";
-      inherit (inputs) nixpkgs;
-      eachSystem = nixpkgs.lib.genAttrs (import inputs.systems);
-      pkgsFor = eachSystem (system: import nixpkgs { localSystem = system; });
     in
     {
       nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
         inherit system;
         specialArgs = {
-          inherit inputs;
+          inherit sls-steam;
         };
         modules = [
           ./configuration.nix
           ./hardware-configuration.nix
-          inputs.home-manager.nixosModules.home-manager
+          home-manager.nixosModules.home-manager
-          inputs.xremap-flake.nixosModules.default
+          xremap-flake.nixosModules.default
           {
+            nixpkgs.overlays = [
+              yazi.overlays.default
+              millennium.overlays.default
+            ];
+
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
 
-            home-manager.extraSpecialArgs = {
-              inherit self;
-              inherit inputs;
-            };
-
             home-manager.users.user = import ./home-manager/home.nix;
 
+            home-manager.extraSpecialArgs = {
+              dms = dms;
+            };
+
             home-manager.backupFileExtension = "backup";
 
             # xremap
@@ -90,20 +96,12 @@
               }
             ];
           }
-          (
+          ({
-            let
-              inputs = {
-                zen = zen-browser;
-                music-presence = discord-music-presence;
-              };
-            in
-            { config, pkgs, ... }: {
             environment.systemPackages = [
-                inputs.music-presence.packages.${pkgs.stdenv.hostPlatform.system}.discord-music-presence
+              discord-music-presence.packages.${system}.discord-music-presence
-                inputs.zen.packages.${pkgs.stdenv.hostPlatform.system}.default
+              zen-browser.packages.${system}.default
             ];
-            }
+          })
-          )
         ];
       };
     };

home-manager/home.nix

@@ -1,10 +1,13 @@
-{ pkgs, inputs, config, ... }:
+{
-let
+  pkgs,
-in
+  dms,
+  config,
+  ...
+}:
 {
   imports = [
     ./mpd.nix
-    inputs.dms.homeModules.dank-material-shell
+    dms.homeModules.dank-material-shell
   ];
 
   home.username = "user";
@@ -44,25 +47,25 @@ in
     ];
   };
 
-  services.cliphist.enable = true;
+  programs.pywal = {
-
+    enable = true;
-  programs.pywal.enable = true;
+    package = pkgs.pywal16;
-  programs.pywal.package = pkgs.pywal16;
+  };
 
   programs.lazygit.enable = true;
   programs.lazygit.enableFishIntegration = true;
 
-  programs.rbw.enable = true;
   programs.rbw.settings = {
+    enable = true;
     pinentry = pkgs.pinentry-curses;
     email = "KeksNino@proton.me";
     base_url = "https://vw.pizzasucht.net";
   };
 
-
   programs.distrobox.enable = true;
   services.podman.enable = true;
 
+  services.cliphist.enable = true;
   programs.btop.enable = true;
   services.udiskie.enable = true;
   programs.cava.enable = true;
@@ -80,12 +83,18 @@ in
   programs.obsidian.enable = true;
   programs.gcc.enable = true;
 
+  home.sessionPath = [
+    "${config.home.homeDirectory}/.local/bin"
+  ];
+
+  home.sessionVariables = {
+    EDITOR = "nvim";
+  };
+
   programs.fish = {
     enable = true;
     interactiveShellInit = ''
       nitch
-    set -gx EDITOR nvim
-    set -gx PATH $PATH /home/user/.local/bin
       set -g fish_key_bindings fish_hybrid_key_bindings
       set fish_greeting
     '';
@@ -104,9 +113,9 @@ in
     r = "rsync -avh --info=progress2";
     rm = "trash";
     ssh = "kitty +kitten ssh";
+    nd = "nix develop";
   };
 
-
   programs.zoxide.enable = true;
   programs.zoxide.enableFishIntegration = true;
 

packages.nix

@@ -21,7 +21,6 @@
     python3
     basedpyright
     waypaper
-    nix-search
     rofi-calc
     renoise
     pwvucontrol
@@ -39,6 +38,14 @@
     wine
     ripgrep
     nemo
+    unrar
+    papirus-icon-theme
+    rust-analyzer
+    scdl
+    motrix-next
+    onefetch
+    aria2
+    smartmontools
   ];
 
   fonts.packages = with pkgs; [