version bump to 25.05

modules/audio.nix

@@ -15,7 +15,6 @@
     alsa-utils
     portaudio
     alsa-lib
-    ffmpeg
     pavucontrol
     clang
   ];

modules/default.nix

@@ -6,7 +6,6 @@
     ./docker.nix
     ./env.nix
     ./fonts.nix
-    ./home-manager.nix
     ./i3-xfce.nix
     ./net.nix
     ./nixos.nix
@@ -18,7 +17,6 @@
     ./npm.nix
     ./tailscale.nix
     ./udiskie.nix
-    ./ffmpeg.nix
     # ./ollama.nix
   ];
 
@@ -32,8 +30,4 @@
     enable = true;
     enableSSHSupport = true;
   };
-
-  environment.systemPackages = with pkgs; [
-    home-manager
-  ];
 }

modules/env.nix

@@ -20,7 +20,7 @@
     LUA_PATH = "${pkgs.luajit}/share/lua/5.1/?.lua;${pkgs.luajit}/share/lua/5.1/?/init.lua;;";
     LUA_CPATH = "${pkgs.luajit}/lib/lua/5.1/?.so;;";
     PKG_CONFIG_PATH = lib.makeSearchPath "lib/pkgconfig" [
-      pkgs.mesa.drivers
+      pkgs.mesa
       pkgs.openssl.dev
       pkgs.libxml2.dev
       pkgs.zlib.dev

modules/ffmpeg.nix

@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    ffmpeg_7-full
-  ];
-}

modules/fonts.nix

@@ -18,7 +18,12 @@ in {
       noto-fonts-cjk-sans
       noto-fonts-cjk-serif
       noto-fonts-emoji
-      (nerdfonts.override {fonts = ["0xProto" "FiraCode" "JetBrainsMono" "Hack" "Noto" "NerdFontsSymbolsOnly"];})
+      nerd-fonts._0xproto
+      nerd-fonts.fira-code
+      nerd-fonts.jetbrains-mono
+      nerd-fonts.hack
+      nerd-fonts.noto
+      nerd-fonts.symbols-only
       ipafont
       kochi-substitute
       clear-sans

modules/home-manager.nix

@@ -1,17 +1,12 @@
-{
-  inputs,
-  rpcs3_latest,
-  ...
-}: {
+{ inputs, pkgs, lib, rpcs3_latest, ... }: {
   imports = [
     inputs.home-manager.nixosModules.home-manager
   ];
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    extraSpecialArgs = {
-      inherit inputs rpcs3_latest;
+    users.cobray = import ../home-manager/cobray.nix {
+      inherit pkgs lib rpcs3_latest;
     };
-    users.cobray = import ../home-manager/cobray.nix;
   };
 }

modules/i3-xfce.nix

@@ -162,7 +162,7 @@ in {
     xsettingsd
     hicolor-icon-theme
     adwaita-icon-theme
-    breeze-icons
+    kdePackages.breeze-icons
     gnome-themes-extra
   ];
 

modules/python.nix

@@ -4,26 +4,15 @@
   lib,
   ...
 }: let
-  customPkgs = pkgs.callPackage ../pkgs {inherit pkgs lib;};
   py = pkgs.python311Packages;
-  pipConf = pkgs.writeText "pip.conf" ''
-    [global]
-    no-cache-dir = false
-    [install]
-    ignore-installed = false
-    [packages]
-    numpy = "<2.0.0"
-  '';
-
   gccLibPath = "${pkgs.gcc-unwrapped.lib}/lib";
   nvidiaLibPath = "${pkgs.linuxPackages.nvidia_x11}/lib";
   cudaLibPath = "${pkgs.cudatoolkit}/lib";
   glvndLibPath = "${pkgs.libglvnd}/lib";
   ldLibraryPath = "${gccLibPath}:${nvidiaLibPath}:${cudaLibPath}:${glvndLibPath}";
-
   pythonEnv = pkgs.python311.buildEnv.override {
     extraLibs = with py; [
-      customPkgs.python-rembg
+      numpy
       i3ipc
       requests
       ipython
@@ -45,7 +34,6 @@
         --prefix LD_LIBRARY_PATH : "${ldLibraryPath}"
     '';
   };
-
   custom-UV = pkgs.symlinkJoin {
     name = "uv";
     paths = [pkgs.uv];
@@ -69,8 +57,5 @@ in {
       stdenv.cc.cc.lib
       python311
     ];
-    environment.variables = {
-      PIP_CONFIG_FILE = "${pipConf}";
-    };
   };
 }

modules/steam.nix

@@ -28,7 +28,6 @@
     piper
     portaudio
     alsa-lib
-    ffmpeg
     stdenv.cc.cc.lib
     libglvnd
   ];