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"
         ],

flake.nix

@@ -27,8 +27,8 @@
     systems.url = "github:nix-systems/default";
 
     stylix = {
-        url = "github:nix-community/stylix";
+      url = "github:nix-community/stylix";
-        inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";

modules/core/infra/syncthing.nix

@@ -37,6 +37,7 @@
             "hytale" = mkFolder "/home/bug/.local/share/Hytale/UserData/Saves";
             "ssh" = mkFolder "/home/bug/.ssh";
             "cloudflared" = mkFolder "/home/bug/.cloudflared";
+            "copyparty" = mkFolder "/home/bug/copyparty";
           };
         };
       };

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 = catppuccin;
-        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";
-        };
 
         fonts.emoji = {
           name = "Twitter Color Emoji";
@@ -40,6 +41,7 @@
           gnome.enable = true;
           gtk.enable = true;
           firefox.enable = true;
+          fish.enable = true;
         };
       };
     };

modules/hosts/box.nix

@@ -16,7 +16,7 @@
       # sish
       vscode-server
       gitea
-      omnisearch
+      # omnisearch
 
       catppuccin
 

modules/hosts/nix.nix

@@ -12,6 +12,8 @@
       ollama
 
       alc897
+
+      cad
     ];
 
     nixos = {

modules/services/copyparty.nix

@@ -22,7 +22,7 @@
 
         accounts = {
           bug = {
-            passwordFile = "/home/bug/mailserver/bug.passwd";
+            passwordFile = "/home/bug/copyparty/bug.passwd";
           };
         };
 
@@ -32,11 +32,11 @@
 
         volumes = {
           "/" = {
-            path = "/home/copyparty";
+            path = "/home/bug/copyparty/public/";
 
             access = {
               r = "*";
-              rw = [ "bug" ];
+              rwda = [ "bug" ];
             };
 
             flags = {
@@ -45,12 +45,33 @@
             };
           };
 
-          "/music" = {
+          "/nix" = {
+            path = "/home/bug/nix/";
+
+            access = {
+              r = "*";
+            };
+
+            flags = {
+              fk = 4;
+              scan = 60;
+            };
+          };
+
+          "/box" = {
+            path = "/";
+
+            access = {
+              rwda = [ "bug" ];
+            };
+          };
+
+          "/Music" = {
             path = "/home/bug/Music/";
 
             access = {
               r = "*";
-              rw = [ "bug" ];
+              rwda = [ "bug" ];
             };
 
             flags = {

modules/services/gitea/gitea.nix

@@ -1,4 +1,4 @@
-{ den, ... }: {
+{
   den.aspects.gitea = {
     # includes = [ den.aspects.gitea-mirrors ];
 

modules/services/invidious.nix

@@ -1,4 +1,4 @@
-{ den, lib, ... }: {
+{ lib, ... }: {
   den.aspects.invidious = {
     nixos = { pkgs, config, ... }: let
       companionPort = 8282;
@@ -12,48 +12,48 @@
       virtualisation.oci-containers.backend = lib.mkDefault "podman";
 
       virtualisation.oci-containers.containers.invidious-companion = {
-          image = "quay.io/invidious/invidious-companion:latest";
+        image = "quay.io/invidious/invidious-companion:latest";
-          extraOptions = [ "--network=host" "--pull=always" ];
+        extraOptions = [ "--network=host" "--pull=always" ];
 
-          environment = {
+        environment = {
-              SERVER_SECRET_KEY = companionKey;
+          SERVER_SECRET_KEY = companionKey;
-              HOST              = "127.0.0.1";
+          HOST              = "127.0.0.1";
-              PORT              = toString companionPort;
+          PORT              = toString companionPort;
-              SERVER_BASE_URL   = "http://127.0.0.1:${toString companionPort}";
+          SERVER_BASE_URL   = "http://127.0.0.1:${toString companionPort}";
 
-              # HTTP_PROXY  = "http://proxy.example:3128";
+          # HTTP_PROXY  = "http://proxy.example:3128";
-              # HTTPS_PROXY = "http://proxy.example:3128";
+          # HTTPS_PROXY = "http://proxy.example:3128";
-              # NO_PROXY    = "127.0.0.1,localhost";
+          # NO_PROXY    = "127.0.0.1,localhost";
-          };
+        };
       };
 
       services.invidious = {
-          enable = true;
+        enable = true;
-          package = pkgs.invidious;
+        package = pkgs.invidious;
 
-          address = "127.0.0.1";
+        address = "127.0.0.1";
-          port = port;
+        port = port;
 
-          nginx.enable = false;
+        nginx.enable = false;
-          sig-helper.enable = false;
+        sig-helper.enable = false;
 
-          settings = {
+        settings = {
-              domain = "tube.bug.tools";
+          domain = "tube.bug.tools";
-              https_only = false;
+          https_only = false;
-              external_port = port;
+          external_port = port;
 
-              invidious_companion = [
+          invidious_companion = [
-                  { private_url = "http://127.0.0.1:${toString companionPort}${companionPath}"; }
+            { private_url = "http://127.0.0.1:${toString companionPort}${companionPath}"; }
-              ];
+          ];
 
-              invidious_companion_key = companionKey;
+          invidious_companion_key = companionKey;
-          };
+        };
       };
 
       systemd.services.invidious = let dep = "podman-invidious-companion.service"; in {
-          wants    = [ dep ];
+        wants    = [ dep ];
-          after    = [ dep ];
+        after    = [ dep ];
-          requires = [ dep ];
+        requires = [ dep ];
       };
     };
   };

modules/services/mailserver.nix

@@ -4,7 +4,7 @@
       imports = [
         (fetchTarball {
           url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/master.tar.gz";
-          sha256 = "0bw68h902j6cz4nshzd9iy2c6slg91026l3gydkgj4d7amsjvmg4";
+          sha256 = "0mfc8xkpy6hrfwyhjjnfna8b54s2h01lzsw4mw3yym6ccacc75r8";
         })
       ];
 
@@ -44,14 +44,17 @@
               "fc2@bug.tools"
               "counter@bug.tools"
               "claude@bug.tools"
-              "bitcraft@bug.tools"
+              "rumble@bug.tools"
-
             ];
           };
 
           "pare@bug.tools" = {
             hashedPasswordFile = "/home/bug/mailserver/pare.passwd";
           };
+
+          "poop@bug.tools" = {
+            hashedPasswordFile = "/home/bug/mailserver/pare.passwd";
+          };
         };
       };
     };

modules/services/minecraft-server.nix

@@ -0,0 +1 @@
+{}

modules/software/compatibility/nix-alien.nix

@@ -3,8 +3,8 @@
     nixos = {
       environment.systemPackages = let
         nix-alien = import (
-          builtins.fetchTarball "https://github.com/thiagokokada/nix-alien/tarball/master"
+          fetchTarball "https://github.com/thiagokokada/nix-alien/tarball/master"
-        ) { };
+        ){};
       in [
         nix-alien.nix-alien
       ];

modules/software/gaming/gaming.nix

@@ -1,5 +1,5 @@
 { den, ... }: {
   den.aspects.gaming = {
-    includes = with den.aspects; [ steam roblox hytale polytoria game-tools emulators star-citizen minecraft ];
+    includes = with den.aspects; [ steam roblox polytoria game-tools emulators star-citizen minecraft ];
   };
 }

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,14 +1,119 @@
 { inputs, ... }: {
   den.aspects.minecraft = {
-    nixos = { pkgs, ... }: {
+    nixos = { pkgs, ... }: let
-      # imports = [
+      inherit (pkgs) fetchurl symlinkJoin makeWrapper;
-      #   inputs.minecraft.nixosModules.default
-      #   inputs.minecraft-metadata.nixosModules.default
-      # ];
 
-      users.users.bug.packages = with pkgs; [
+      base = (inputs.minecraft.legacyPackages.${pkgs.stdenv.hostPlatform.system}.v1_21_11.fabric.client.withConfig [{
-        prismlauncher
+        mods = [
-      ];
+          (fetchurl {
+            name = "fabric-api.jar";
+            url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/i5tSkVBH/fabric-api-0.141.3+1.21.11.jar";
+            sha256 = "sha256:1xgfpy6zj1nwwfrhr346firm8zw6lw63pl4parvjwrirc6l57i46";
+          })
+
+          (fetchurl {
+            name = "meteor-client.jar";
+            url = "https://meteorclient.com/api/download";
+            sha256 = "sha256:0d5l2c41b3d1nadzaavdx8pjciskj6i3h65k4pmhvhz3mg6njwvl";
+          })
+
+          (fetchurl {
+            name = "baritone.jar";
+            url = "https://www.meteorclient.com/api/downloadBaritone";
+            sha256 = "sha256:0g5xl90xphqy2c7xwlvjm71dn4l7c35yg8hwf7w4h0bwdfw7m31y";
+          })
+
+          (fetchurl {
+            name = "modmenu.jar";
+            url = "https://cdn.modrinth.com/data/mOgUt4GM/versions/Tyk71iSw/modmenu-17.0.0.jar";
+            sha256 = "sha256:0a2i5hl77bcw33m1h51y1dxrk7bbkj8fv0rp8w6y78d43ibwkwlm";
+          })
+
+          (fetchurl {
+            name = "distant-horizons.jar";
+            url = "https://cdn.modrinth.com/data/uCdwusMi/versions/GT3Bm3GN/DistantHorizons-2.4.5-b-1.21.11-fabric-neoforge.jar";
+            sha256 = "sha256:0gxwhvji4k0xnzidwrvlndh81r64n6i24v253grbxxamgshwg53n";
+          })
+
+          (fetchurl {
+            name = "iris.jar";
+            url = "https://cdn.modrinth.com/data/YL57xq9U/versions/fDpuVzVr/iris-fabric-1.10.7+mc1.21.11.jar";
+            sha256 = "sha256:06fb6r22gnsxnv2w0sgvfnsj6fk3a7jcxls7z14imjc9h6hmviaq";
+          })
+
+          (fetchurl {
+            name = "sodium.jar";
+            url = "https://cdn.modrinth.com/data/AANobbMI/versions/UddlN6L4/sodium-fabric-0.8.7+mc1.21.11.jar";
+            sha256 = "sha256:10rrqnyn8mb14b1k3ks84g6033zkkn94fwvyyflaiajhnf3ax3y0";
+          })
+
+          (fetchurl {
+            name = "lithium.jar";
+            url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/Ow7wA0kG/lithium-fabric-0.21.4+mc1.21.11.jar";
+            sha256 = "sha256:12y704i98rf0xb438f72hi0aqhsi35jxwjs2575vsg5lllfw8dai";
+          })
+
+          (fetchurl {
+            name = "immediatelyfast.jar";
+            url = "https://cdn.modrinth.com/data/5ZwdcRci/versions/QwkfUKSj/ImmediatelyFast-Fabric-1.14.2+1.21.11.jar";
+            sha256 = "sha256:1248yg69f5d232qn138xlcsdmbs2yj3gdjx9zl53v19c1j326pgb";
+          })
+
+          (fetchurl {
+            name = "entity-culling.jar";
+            url = "https://cdn.modrinth.com/data/NNAgCjsB/versions/SK12FGQf/entityculling-fabric-1.10.0-mc1.21.11.jar";
+            sha256 = "sha256:0iws5ql4k542lr4psrcw9hj5z4zz81218ywnpsl77zj8wnwm4l1d";
+          })
+
+          (fetchurl {
+            name = "ferrite-core.jar";
+            url = "https://cdn.modrinth.com/data/uXXizFIs/versions/Ii0gP3D8/ferritecore-8.2.0-fabric.jar";
+            sha256 = "sha256:05f7q9jac16syfnahd6r4kx3aqm4i580y623gk6810plrdhdfszp";
+          })
+
+          (fetchurl {
+            name = "dynamic-fps.jar";
+            url = "https://cdn.modrinth.com/data/LQ3K71Q1/versions/PUe5Asxs/dynamic-fps-3.11.4+minecraft-1.21.11-fabric.jar";
+            sha256 = "sha256:13dh0226f6j70ak752fj8s00hmrx175v9607plf4rhia9plqy3kx";
+          })
+
+          # (fetchurl {
+          #   name = "removing-loading-screens.jar";
+          #   url = "https://cdn.modrinth.com/data/ZP7xHXtw/versions/TCSbq6jC/rrlsFabric-5.1.15+mc.1.21.11.jar";
+          #   sha256 = "sha256:16dkj8baa6xn47n9alzy4104wz6z4zp719dxwv5wm96g2wkp1z57";
+          # })
+        ];
+      }]).withConfig {
+        resourcePacks = [
+          (fetchurl {
+            name = "unique-dark.zip";
+            url = "https://cdn.modrinth.com/data/BaY1UdGV/versions/UjQJb5zE/Unique%20Dark%20-%20Lite%20-%201.20.2-26.x.zip";
+            sha256 = "sha256:19cv5q8pnvxkf96lazg8angbfqwkxag8qsxk31cv487jq99kl621";
+          })
+        ];
+
+        shaderPacks = [
+          (fetchurl {
+            name = "complementary-shaders.zip";
+            url = "https://cdn.modrinth.com/data/HVnmMxH1/versions/836bPNGo/ComplementaryReimagined_r5.7.1.zip";
+            sha256 = "sha256:1w33kyknwc0qsi6l0saww906iwi9d3hkn0nm7hnl4bc3lws0d8i4";
+          })
+        ];
+
+        appArgs = [ "--gameDir" "/home/bug/.local/share/minecraft" ];
+      };
+
+      minecraft = symlinkJoin {
+        name = "minecraft-wrapped";
+        paths = [ base ];
+        nativeBuildInputs = [ makeWrapper ];
+        postBuild = ''
+          wrapProgram $out/bin/minecraft \
+            --set XDG_DATA_HOME "/home/bug/.local/share/minecraft"
+        '';
+      };
+    in {
+      users.users.bug.packages = [ minecraft ];
     };
   };
 }

modules/software/music/player.nix

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

modules/software/utilities/torrent.nix

@@ -0,0 +1,9 @@
+{
+  den.aspects.torrent = {
+    nixos = { pkgs, ... }: {
+      users.users.bug.packages = with pkgs; [
+        fragments
+      ];
+    };
+  };
+}

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 ];
   };
 }