configurations/camelot/default.nix

@@ -55,7 +55,6 @@
 
   my.server.mollysocket.enable = true;
   my.server.blog.enable = true;
-  my.server.papermc.enable = true;
 
   my.users = {
     dala = {

configurations/london/default.nix

@@ -72,6 +72,8 @@
         {
           programs.helix.enable = true;
 
+          home.packages = with pkgs; [ (cutter.withPlugins (plugins: with plugins; [ rz-ghidra ])) ];
+
           my.desktop.sway.monitors = [
             {
               name = "Iiyama North America PL2470H 0x0000047B";
@@ -92,7 +94,6 @@
           my.development.tools.networking.enable = true;
           my.games.wine.enable = true;
           my.games.steam.enable = true;
-          my.games.minecraft.enable = true;
         };
     };
   };

flake.lock

@@ -184,11 +184,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729894599,
+        "lastModified": 1728337164,
-        "narHash": "sha256-nL9nzNE5/re/P+zOv7NX6bRm5e+DeS1HIufQUJ01w20=",
+        "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "93435d27d250fa986bfec6b2ff263161ff8288cb",
+        "rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
         "type": "github"
       },
       "original": {
@@ -289,11 +289,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1729691686,
+        "lastModified": 1728500571,
-        "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=",
+        "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37",
+        "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0",
         "type": "github"
       },
       "original": {
@@ -305,11 +305,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1729357638,
+        "lastModified": 1728156290,
-        "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
+        "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22",
+        "rev": "17ae88b569bb15590549ff478bab6494dde4a907",
         "type": "github"
       },
       "original": {
@@ -321,11 +321,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1729665710,
+        "lastModified": 1728492678,
-        "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
+        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
+        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
         "type": "github"
       },
       "original": {
@@ -424,11 +424,11 @@
         "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
-        "lastModified": 1729931925,
+        "lastModified": 1728345710,
-        "narHash": "sha256-3tjYImjVzsSM4sU+wTySF94Yop1spI/XomMBEpljKvQ=",
+        "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "b2211d1a537136cc1d0d5c0af391e8712016b34e",
+        "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b",
         "type": "github"
       },
       "original": {

modules/server/default.nix

@@ -5,6 +5,5 @@
     ./nginx.nix
     ./mollysocket.nix
     ./blog.nix
-    ./minecraft.nix
   ];
 }

modules/server/minecraft.nix

@@ -1,22 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib;
-{
-  options.my.server.papermc.enable = mkOption {
-    type = types.bool;
-    default = false;
-  };
-
-  config = mkIf config.my.server.papermc.enable {
-    services.minecraft-server = {
-      enable = true;
-      package = pkgs.papermc;
-      dataDir = "/srv/minecraft";
-      openFirewall = true;
-    };
-  };
-}

modules/workstation/home-manager/games.nix

@@ -16,31 +16,9 @@ with lib;
       type = types.bool;
       default = false;
     };
-
-    minecraft.enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
   };
 
-  config = {
+  config = mkIf config.my.games.wine.enable {
-    home.packages =
+    home.packages = with pkgs; [ wineWowPackages.waylandFull ];
-      [ ]
-      ++ (
-        if config.my.games.wine.enable then
-          [
-            pkgs.wineWowPackages.waylandFull
-          ]
-        else
-          [ ]
-      )
-      ++ (
-        if config.my.games.minecraft.enable then
-          [
-            pkgs.prismlauncher
-          ]
-        else
-          [ ]
-      );
   };
 }