push

flake.lock

@@ -589,6 +589,24 @@
         "type": "github"
       }
     },
+    "hytale-launcher": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3"
+      },
+      "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"
+      }
+    },
     "import-tree": {
       "locked": {
         "lastModified": 1772344373,
@@ -610,7 +628,7 @@
         "metadata": [
           "minecraft-metadata"
         ],
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1774233481,
@@ -629,7 +647,7 @@
     "minecraft-metadata": {
       "inputs": {
         "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1774059698,
@@ -671,7 +689,7 @@
         "cachyos-kernel-patches": "cachyos-kernel-patches",
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1773166308,
@@ -695,7 +713,7 @@
           "nix-gaming"
         ],
         "nix-github-actions": "nix-github-actions",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_7",
         "systems": "systems_4",
         "treefmt-nix": "treefmt-nix"
       },
@@ -733,7 +751,7 @@
       "inputs": {
         "flake-parts": "flake-parts_4",
         "git-hooks": "git-hooks",
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
         "lastModified": 1772764431,
@@ -774,7 +792,7 @@
       "inputs": {
         "flake-compat": "flake-compat_3",
         "flake-parts": "flake-parts_5",
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_9"
       },
       "locked": {
         "lastModified": 1772641310,
@@ -851,6 +869,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_10": {
+      "locked": {
+        "lastModified": 1772615108,
+        "narHash": "sha256-lC0KbklwgeSqS+sTkaYpnSYr/HDeVMzYUZqV/dT31Lo=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "0c39f3b5a9a234421d4ad43ab9c7cf64840172d0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1748162331,
@@ -867,6 +901,22 @@
       }
     },
     "nixpkgs_3": {
+      "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_4": {
       "locked": {
         "lastModified": 1774232173,
         "narHash": "sha256-T3eZ0qmTBHf8/RDRcqjokzxRs7zNg4Jy6vqzL95RTmo=",
@@ -881,7 +931,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1774053289,
         "narHash": "sha256-U+wnCEgsGdRqXfUlt1yZffhLMGbUnkb4MYmisBI+KcU=",
@@ -896,7 +946,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1773148319,
         "narHash": "sha256-Yr9ej3uSDycQZHWB5HslVgryLkdSBN2fODAqURv/1wQ=",
@@ -912,7 +962,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1772624091,
         "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
@@ -928,7 +978,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1772173633,
         "narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=",
@@ -944,7 +994,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
       "locked": {
         "lastModified": 1772465433,
         "narHash": "sha256-ywy9troNEfpgh0Ee+zaV1UTgU8kYBVKtvPSxh6clYGU=",
@@ -960,22 +1010,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1772615108,
-        "narHash": "sha256-lC0KbklwgeSqS+sTkaYpnSYr/HDeVMzYUZqV/dT31Lo=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "0c39f3b5a9a234421d4ad43ab9c7cf64840172d0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nur": {
       "inputs": {
         "flake-parts": [
@@ -1032,6 +1066,7 @@
         "flake-file": "flake-file",
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
+        "hytale-launcher": "hytale-launcher",
         "import-tree": "import-tree",
         "minecraft": "minecraft",
         "minecraft-metadata": "minecraft-metadata",
@@ -1041,7 +1076,7 @@
         "nix-flatpak": "nix-flatpak",
         "nix-gaming": "nix-gaming",
         "nixcord": "nixcord",
-        "nixpkgs": "nixpkgs_9",
+        "nixpkgs": "nixpkgs_10",
         "nixpkgs-lib": [
           "nixpkgs"
         ],

modules/core/theme/stylix.nix

@@ -1,17 +1,6 @@
 { inputs, ... }: {
-  den.aspects.stylix = {
+  den.aspects.stylix = let
-    homeManager = { pkgs, ... }: {
+    catppuccin = {
-      imports = [
-        (inputs.stylix.homeModules.stylix or {})
-      ];
-
-      stylix = {
-        enable = true;
-        autoEnable = false;
-        polarity = "dark";
-
-        # catppuccin mocha
-        base16Scheme = {
       base00 = "1E1E2E";
       base01 = "181825";
       base02 = "313244";
@@ -29,6 +18,18 @@
       base0E = "CBA6F7";
       base0F = "F2CDCD";
     };
+  in {
+    homeManager = { pkgs, ... }: {
+      imports = [
+        inputs.stylix.homeModules.stylix
+      ];
+
+      stylix = {
+        enable = true;
+        autoEnable = false;
+        polarity = "dark";
+
+        base16Scheme = catppuccin;
 
         fonts.emoji = {
           name = "Twitter Color Emoji";
@@ -40,6 +41,7 @@
           gnome.enable = true;
           gtk.enable = true;
           firefox.enable = true;
+          fish.enable = true;
         };
       };
     };

modules/software/gaming/hytale.nix

@@ -1,15 +1,8 @@
-{ ... }: {
+{ inputs, ... }: {
   den.aspects.hytale = {
     nixos = { pkgs, ... }: {
-      services.flatpak.packages = [
+      users.users.bug.packages = [
-        {
+        inputs.hytale-launcher.packages.${pkgs.system}.default
-          appId = "com.hytale.Launcher";
-          sha256 = "sha256-SUxfyovC2umZmsOj5bOTZ8WfGCpnWcz7svOESwNekV0=";
-          bundle = "${pkgs.fetchurl {
-            url = "https://launcher.hytale.com/builds/release/linux/amd64/hytale-launcher-latest.flatpak";
-            sha256 = "sha256-SUxfyovC2umZmsOj5bOTZ8WfGCpnWcz7svOESwNekV0=";
-          }}";
-        }
       ];
     };
   };

modules/software/gaming/minecraft.nix

@@ -1,10 +1,10 @@
 { inputs, ... }: {
   den.aspects.minecraft = {
     nixos = { pkgs, ... }: {
-      # imports = [
+      imports = [
-      #   inputs.minecraft.nixosModules.default
+        #inputs.minecraft.nixosModules.default
-      #   inputs.minecraft-metadata.nixosModules.default
+        #inputs.minecraft-metadata.nixosModules.default
-      # ];
+      ];
 
       users.users.bug.packages = with pkgs; [
         prismlauncher

modules/software/music/player.nix

@@ -8,7 +8,6 @@
       ];
 
       services.flatpak.packages = [
-        "org.gnome.Decibels"
         "org.pipewire.Helvum"
       ];
     };

modules/software/utilities/utilities.nix

@@ -1,5 +1,5 @@
 { den, ... }: {
   den.aspects.utilities = {
-    includes = with den.aspects; [ system-utils desktop-utils fonts sshuttle ];
+    includes = with den.aspects; [ system-utils desktop-utils fonts sshuttle torrent ];
   };
 }