a

nixos/home-manager/nixos/packages.nix

@@ -11,27 +11,28 @@
   # The home.packages option allows you to install Nix packages into your
   # environment.
   home.packages =
+    with pkgs;
     with unstable;
     with inputs;
     [
       pkgs.nextcloud-client
       pkgs.xpipe
       pkgs.monero-gui
-      unstable.kiwix
+      kiwix
 
       # === CLI ===
       pkgs.rrsync
       pkgs.poop # Compare the performance of multiple commands with a colorful terminal user interface
       pkgs.age
-      pkgs.jujutsu
-      pkgs.lazyjj
+      # pkgs.jujutsu
+      # pkgs.lazyjj
       pkgs.biome
       # === CLI ===
 
       # === Image CLI ===
-      unstable.oxipng
-      unstable.image_optim
-      unstable.jpegoptim
+      oxipng
+      image_optim
+      jpegoptim
       pkgs.libjxl
       pkgs.libavif
       pkgs.libwebp

nixos/home-manager/packages/common-cli.nix

@@ -28,7 +28,7 @@ in
     with inputs;
     [
       stow
-      unstable.yt-dlp
+      yt-dlp
       aria2
       ripgrep
       wl-clipboard
@@ -36,7 +36,7 @@ in
       btop
 
       fzf
-      unstable.dwarfs
+      dwarfs
       unrar
     ];
 
@@ -62,6 +62,9 @@ in
 
         defaultBranch = "main";
       };
+      push = {
+        autoSetupRemote = true;
+      };
     };
   };
 

nixos/home-manager/packages/common-desktop.nix

@@ -18,30 +18,31 @@ let
 in
 {
 
-  imports = [
-    inputs.moonlight.homeModules.default
-  ];
+#  imports = [
+#    inputs.moonlight.homeModules.default
+#  ];
 
   home.packages =
+    with pkgs;
     with inputs;
     with unstable;
     [
       pkgs.yubioath-flutter
       pkgs.qbittorrent
-      unstable.peazip
-      unstable.parsec-bin
+      peazip
+      parsec-bin
 
       # === Communication ===
       pkgs.vesktop
-      pkgs.discord-canary
-      pkgs.discord
+      # (unstable.discord-canary.override { withMoonlight = true; })
+      # (unstable.discord.override { withMoonlight = true; })
       pkgs.signal-desktop
       pkgs.telegram-desktop
       # pkgs.thunderbird-latest-unwrapped
       # === Communication ===
 
       # === Editors/Office ===
-      unstable.libreoffice-fresh
+      libreoffice-fresh
       # pkgs.kdePackages.kate
       pkgs.jetbrains.webstorm
       pkgs.jetbrains.rider
@@ -51,18 +52,19 @@ in
 
       # === Media ===
       # unstable.gimp
-      unstable.krita
-      unstable.mpv
-      unstable.losslesscut-bin
-      unstable.jellyfin-media-player
-      unstable.makemkv
+      krita
+      mpv
+      losslesscut-bin
+      jellyfin-media-player
+      makemkv
+      kdePackages.k3b
       # === Media ===
 
-      unstable.orca-slicer
+      orca-slicer
     ];
 
-  programs.moonlight-mod = {
-    enable = true;
+#  programs.moonlight-mod = {
+#    enable = true;
     # stable = {
     #   extensions = {
     #     allActivites.enabled = true;
@@ -77,6 +79,6 @@ in
     #     };
     #   };
     # };
-  };
+#  };
 
 }

nixos/home-manager/packages/emulation.nix

@@ -19,13 +19,14 @@ in
 {
 
   home.packages =
+    with pkgs;
     with unstable;
     with inputs;
     [
-      unstable.pcsx2
-      unstable.rpcs3
-      unstable.ryubing
-      unstable.torzu
+      pcsx2
+      rpcs3
+      ryubing
+      torzu
       inputs.shadps4-git.packages."x86_64-linux".default
     ];
 }

nixos/home-manager/packages/game-extras.nix

@@ -19,13 +19,14 @@ in
 {
 
   home.packages =
+    with pkgs;
     with unstable;
     with inputs;
     [
       # === Factorio related ===
-      unstable.yafc-ce
-      unstable.pactorio
-      unstable.factoriolab
+      yafc-ce
+      pactorio
+      factoriolab
       # === Factorio related ===
     ];
 }

nixos/home-manager/packages/gamedev.nix

@@ -26,14 +26,15 @@ in
   home.file."Godot/export-templates/4.3".source = unstable.godot_4_3-export-templates;
 
   home.packages =
+    with pkgs;
     with unstable;
     with inputs;
     [
-      unstable.godot-mono
+      unstable.godot
       unstable.godot-export-templates
       unstable.blender-hip
       unstable.freecad-wayland
-      pkgs.unityhub
+      unstable.unityhub
       pkgs.material-maker
       unstable.blockbench
     ];

nixos/home-manager/packages/gaming.nix

@@ -25,6 +25,7 @@ in
   # === Java versions for MC ===
 
   home.packages =
+    with pkgs;
     with unstable;
     with inputs;
     [
@@ -33,19 +34,25 @@ in
       unstable.prismlauncher
       # === Minecraft related ===
 
-      unstable.steamtinkerlaunch
-      pkgs.heroic-unwrapped
-      unstable.ludusavi
+      steamtinkerlaunch
+      heroic
+      xivlauncher
+      ludusavi
 
       # === Game perf ===
-      unstable.mangojuice
-      unstable.goverlay
+      mangojuice
+      goverlay
+      # unstable.mangohud
       # === Game perf ===
+
+      # === Modding ===
+      unstable.nexusmods-app-unfree
+      # === Modding ===
     ];
 
-  programs.mangohud = {
-    enable = true;
-    enableSessionWide = true;
-    package = unstable.mangohud;
-  };
+  # programs.mangohud = {
+  #  enable = true;
+  #  enableSessionWide = true;
+  #   package = unstable.mangohud;
+  # };
 }

nixos/home-manager/packages/template.nix

@@ -19,6 +19,7 @@ in
 {
 
   home.packages =
+    with pkgs;
     with unstable;
     with inputs;
     [

nixos/home-manager/packages/video-capture.nix

@@ -20,6 +20,7 @@ in
 {
 
   home.packages =
+    with pkgs;
     with unstable;
     with inputs;
     [

nixos/home-manager/packages/video-prod.nix

@@ -19,14 +19,15 @@ in
 {
 
   home.packages =
+    with pkgs;
     with unstable;
     with inputs;
     [
-      unstable.svt-av1-psy
-      unstable.ffmpeg-full
-      unstable.ab-av1
-      unstable.whisper-cpp-vulkan
-      unstable.video-compare
+      svt-av1-psy
+      # unstable.ffmpeg-full
+      ab-av1
+      # whisper-cpp-vulkan
+      video-compare
     ];
 
 }

nixos/home-manager/packages/virtualisation.nix

@@ -19,6 +19,7 @@ in
 {
 
   home.packages =
+    with pkgs;
     with unstable;
     with inputs;
     [

nixos/home-manager/packages/wine.nix

@@ -20,6 +20,7 @@ in
   home.file."bin/wine".source = unstable.wineWowPackages.waylandFull;
 
   home.packages =
+    with pkgs;
     with unstable;
     with inputs;
     [