Modules/Niri: Update gtk theme

flake.lock

@@ -875,10 +875,28 @@
         "type": "github"
       }
     },
+    "hytale-launcher": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1773947929,
+        "narHash": "sha256-flpkAPM3zpMpWoqvVkMTo3ptuBF0QKNi6Raa8rnIq7o=",
+        "owner": "JPyke3",
+        "repo": "hytale-launcher-nix",
+        "rev": "a8d0a974b187f0997c03c23000dea552194edf39",
+        "type": "github"
+      },
+      "original": {
+        "owner": "JPyke3",
+        "repo": "hytale-launcher-nix",
+        "type": "github"
+      }
+    },
     "impermanence": {
       "inputs": {
         "home-manager": "home-manager_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1769548169,
@@ -944,7 +962,7 @@
     "naersk": {
       "inputs": {
         "fenix": "fenix",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1763384566,
@@ -1022,7 +1040,7 @@
       "inputs": {
         "flake-compat": "flake-compat_3",
         "nix-index-database": "nix-index-database",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1771150922,
@@ -1124,6 +1142,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1773821835,
+        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1768564909,
         "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
@@ -1139,7 +1173,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1771008912,
         "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
@@ -1155,7 +1189,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1773122722,
         "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=",
@@ -1171,7 +1205,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1752077645,
         "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
@@ -1187,7 +1221,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1750776420,
         "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=",
@@ -1416,13 +1450,14 @@
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
         "hyprspace": "hyprspace",
+        "hytale-launcher": "hytale-launcher",
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
         "masssprings": "masssprings",
         "niri": "niri",
         "nix-alien": "nix-alien",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-stable": "nixpkgs-stable_2",
         "nixvim": "nixvim",
         "noctalia": "noctalia",
@@ -1605,7 +1640,7 @@
     },
     "waifu-cursors": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
         "lastModified": 1771429565,

flake.nix

@@ -122,6 +122,9 @@
     # nixified-ai.url = "github:nixified-ai/flake";
     # comfyui-nix.url = "github:utensils/comfyui-nix";
 
+    # HyTale
+    hytale-launcher.url = "github:JPyke3/hytale-launcher-nix";
+
     masssprings.url = "git+https://gitea.local.chriphost.de/christoph/cpp-masssprings";
     masssprings.inputs.nixpkgs.follows = "nixpkgs";
   };

home/christoph/nixinator/default.nix

@@ -6,6 +6,7 @@
   lib,
   mylib,
   username,
+  inputs,
   ...
 }: {
   config = {
@@ -123,9 +124,6 @@
         vscode
         # ghidra # launch with _JAVA_AWT_WM_NONREPARENTING=1 (use programs.ghidra)
 
-        # AI stuff
-        # comfy-ui-cuda # Use module
-
         # Unity Stuff
         # unityhub
         # rider-unity
@@ -133,6 +131,7 @@
         # mono
         # steam-run-free # nix-alien doesn't seem to run unity apps, this does...
 
+        inputs.hytale-launcher.packages.${pkgs.stdenv.hostPlatform.system}.default
         (blender.override {cudaSupport = true;})
         godot_4
         (obs-studio.override {cudaSupport = true;})
@@ -156,22 +155,22 @@
       ];
 
       file = lib.mkMerge [
-        # {
+        {
-        #   ".local/share/applications/jetbrains-rider.desktop".source = let
+          # ".local/share/applications/jetbrains-rider.desktop".source = let
-        #     desktopFile = pkgs.makeDesktopItem {
+          #   desktopFile = pkgs.makeDesktopItem {
-        #       name = "jetbrains-rider";
+          #     name = "jetbrains-rider";
-        #       desktopName = "Rider";
+          #     desktopName = "Rider";
-        #       exec = "\"${rider-unity}/bin/rider\"";
+          #     exec = "\"${rider-unity}/bin/rider\"";
-        #       icon = "rider";
+          #     icon = "rider";
-        #       type = "Application";
+          #     type = "Application";
-        #       # Don't show desktop icon in search or run launcher
+          #     # Don't show desktop icon in search or run launcher
-        #       extraConfig.NoDisplay = "true";
+          #     extraConfig.NoDisplay = "true";
-        #     };
+          #   };
-        #   in "${desktopFile}/share/applications/jetbrains-rider.desktop";
+          # in "${desktopFile}/share/applications/jetbrains-rider.desktop";
-        #
+
-        #   ".var/app/com.valvesoftware.Steam/config/MangoHud/MangoHud.conf".source =
+          ".var/app/com.valvesoftware.Steam/config/MangoHud/MangoHud.conf".source =
-        #     ../../../config/mangohud/MangoHud.conf;
+            ../../../config/mangohud/MangoHud.conf;
-        # }
+        }
         (lib.optionalAttrs (mylib.modules.contains config.home.packages pkgs.makemkv) {
           ".MakeMKV/settings.conf".source =
             config.lib.file.mkOutOfStoreSymlink
@@ -187,15 +186,17 @@
     services = {
       flatpak = {
         packages = [
-          # "com.valvesoftware.Steam"
+          "com.valvesoftware.Steam"
-          # "com.valvesoftware.Steam.Utility.steamtinkerlaunch"
+          "com.valvesoftware.Steam.Utility.steamtinkerlaunch"
+          "org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/24.08"
+          "org.freedesktop.Platform.VulkanLayer.MangoHud/x86_64/24.08"
+          "io.github.Foldex.AdwSteamGtk"
+          "com.vysp3r.ProtonPlus"
           # "net.davidotek.pupgui2"
-          # "org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/24.08"
-          # "org.freedesktop.Platform.VulkanLayer.MangoHud/x86_64/24.08"
 
           "org.prismlauncher.PrismLauncher"
           "com.usebottles.bottles"
-          # "io.github.lawstorant.boxflat"
+          "io.github.lawstorant.boxflat"
 
           # "com.unity.UnityHub"
         ];
@@ -225,6 +226,13 @@
             ];
           };
 
+          "com.vysp3r.ProtonPlus".Context = {
+            filesystems = [
+              "${config.home.homeDirectory}/.var/app/com.valvesoftware.Steam"
+              "${config.home.homeDirectory}/Games"
+            ];
+          };
+
           "com.usebottles.bottles".Context = {
             filesystems = [
               "${config.home.homeDirectory}/.var/app/com.valvesoftware.Steam"

home/homemodules/niri/default.nix

@@ -27,6 +27,28 @@ in {
       enable = true;
       iconTheme.package = color.iconPackage;
       iconTheme.name = color.iconTheme;
+
+      colorScheme = "dark";
+      gtk3.colorScheme = "dark";
+      gtk4.colorScheme = "dark";
+
+      theme = {
+        name = "adw-gtk3-dark";
+        package = pkgs.adw-gtk3;
+      };
+
+      gtk3.extraConfig = {
+        gtk-application-prefer-dark-theme = 1;
+      };
+    };
+
+    dconf = {
+      enable = true;
+      settings = {
+        "org/gnome/desktop/interface" = {
+          color-scheme = "prefer-dark";
+        };
+      };
     };
 
     # Disable niri polkit if we use DMS, as it has its own

home/homemodules/yazi/specialDirectories.nix

@@ -18,6 +18,7 @@ in [
   (mkIcon "Public" "󰒗")
   (mkIcon "Restic" "󰁯")
   (mkIcon "Shows" "󰿎")
+  (mkIcon "SSD" "󰉉")
   (mkIcon "Unity" "󰚯")
   (mkIcon "Videos" "")
 ]

system/nixinator/disks.nix

@@ -91,6 +91,102 @@
           };
         };
       };
+
+      games = {
+        type = "disk";
+        device = "/dev/disk/by-id/nvme-WD_BLACK_SN850X_2000GB_231623802252";
+        content = {
+          type = "gpt";
+          partitions = {
+            luks = {
+              label = "LUKS_GAMES";
+              size = "100%";
+              content = {
+                type = "luks";
+                name = "crypted_games";
+
+                extraOpenArgs = [
+                  "--perf-no_read_workqueue"
+                  "--perf-no_write_workqueue"
+                ];
+
+                settings = {
+                  allowDiscards = true;
+                  crypttabExtraOpts = ["fido2-device=auto" "token-timeout=10" "tries=5"];
+
+                  # Disable for interactive password entry
+                  # This is contained on the main disk, so by unlocking the main disk with the password,
+                  # the second disk can unlock automatically
+                  keyFile = "/persist/home/christoph/.secrets/luks.keyfile";
+                  fallbackToPassword = false;
+                };
+
+                content = {
+                  type = "btrfs";
+                  extraArgs = ["-L" "GAMES" "-f"];
+                  subvolumes = {
+                    "data" = {
+                      mountpoint = "/home/christoph/Games";
+                      mountOptions = [
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                    };
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+
+      ssd = {
+        type = "disk";
+        device = "/dev/disk/by-id/nvme-eui.00253857019ebd67";
+        content = {
+          type = "gpt";
+          partitions = {
+            luks = {
+              label = "LUKS_SSD";
+              size = "100%";
+              content = {
+                type = "luks";
+                name = "crypted_ssd";
+
+                extraOpenArgs = [
+                  "--perf-no_read_workqueue"
+                  "--perf-no_write_workqueue"
+                ];
+
+                settings = {
+                  allowDiscards = true;
+                  crypttabExtraOpts = ["fido2-device=auto" "token-timeout=10" "tries=5"];
+
+                  # Disable for interactive password entry
+                  # This is contained on the main disk, so by unlocking the main disk with the password,
+                  # the second disk can unlock automatically
+                  keyFile = "/persist/home/christoph/.secrets/luks.keyfile";
+                  fallbackToPassword = false;
+                };
+
+                content = {
+                  type = "btrfs";
+                  extraArgs = ["-L" "SSD" "-f"];
+                  subvolumes = {
+                    "data" = {
+                      mountpoint = "/home/christoph/SSD";
+                      mountOptions = [
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                    };
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
     };
   };
 

system/services/comfyui.nix

@@ -27,7 +27,7 @@ in {
       ];
 
       volumes = let
-        rootDir = "/home/christoph/Downloads/Comfy";
+        rootDir = "/home/christoph/Games/ComfyUI";
       in [
         "${rootDir}/storage:/root"
         "${rootDir}/storage-models/models:/root/ComfyUI/models"

system/systemmodules/impermanence/default.nix

@@ -178,6 +178,8 @@ in {
             (mkUDir ".local/share/fish" m755)
             (mkUDir ".local/share/flatpak" m755)
             (mkUDir ".local/share/hyprland" m755)
+            (mkUDir ".local/share/hytale-launcher" m755)
+            (mkUDir ".local/share/Hytale" m755)
             (mkUDir ".local/share/jellyfin-desktop" m755)
             (mkUDir ".local/share/jellyfin-tui" m755)
             (mkUDir ".local/share/JetBrains" m755) # Unity