push

modules/core/theme/stylix.nix

@@ -1,8 +1,27 @@
 { inputs, ... }: {
-  den.aspects.stylix = {
+  den.aspects.stylix = let
+    catppuccin = {
+      base00 = "1E1E2E";
+      base01 = "181825";
+      base02 = "313244";
+      base03 = "45475A";
+      base04 = "585B70";
+      base05 = "CDD6F4";
+      base06 = "F5E0DC";
+      base07 = "B4BEFE";
+      base08 = "F38BA8";
+      base09 = "FAB387";
+      base0A = "F9E2AF";
+      base0B = "A6E3A1";
+      base0C = "94E2D5";
+      base0D = "89B4FA";
+      base0E = "CBA6F7";
+      base0F = "F2CDCD";
+    };
+  in {
     homeManager = { pkgs, ... }: {
       imports = [
-        (inputs.stylix.homeModules.stylix or {})
+        inputs.stylix.homeModules.stylix
       ];
 
       stylix = {
@@ -10,25 +29,7 @@
         autoEnable = false;
         polarity = "dark";
 
-        # catppuccin mocha
-        base16Scheme = {
-          base00 = "1E1E2E";
-          base01 = "181825";
-          base02 = "313244";
-          base03 = "45475A";
-          base04 = "585B70";
-          base05 = "CDD6F4";
-          base06 = "F5E0DC";
-          base07 = "B4BEFE";
-          base08 = "F38BA8";
-          base09 = "FAB387";
-          base0A = "F9E2AF";
-          base0B = "A6E3A1";
-          base0C = "94E2D5";
-          base0D = "89B4FA";
-          base0E = "CBA6F7";
-          base0F = "F2CDCD";
-        };
+        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 = [
-        {
-          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=";
-          }}";
-        }
+      users.users.bug.packages = [
+        inputs.hytale-launcher.packages.${pkgs.system}.default
       ];
     };
   };

modules/software/gaming/minecraft.nix

@@ -1,10 +1,10 @@
 { inputs, ... }: {
   den.aspects.minecraft = {
     nixos = { pkgs, ... }: {
-      # imports = [
-      #   inputs.minecraft.nixosModules.default
-      #   inputs.minecraft-metadata.nixosModules.default
-      # ];
+      imports = [
+        #inputs.minecraft.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 ];
   };
 }