disable minecraft server

flake.lock

@@ -142,11 +142,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771469470,
+        "lastModified": 1773889306,
-        "narHash": "sha256-GnqdqhrguKNN3HtVfl6z+zbV9R9jhHFm3Z8nu7R6ml0=",
+        "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "4707eec8d1d2db5182ea06ed48c820a86a42dc13",
+        "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347",
         "type": "github"
       },
       "original": {
@@ -163,11 +163,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1771494902,
+        "lastModified": 1774773254,
-        "narHash": "sha256-G2yfLhPTuW4nSQCWdXzqknm9uop7OR+zQuoGll5rxLA=",
+        "narHash": "sha256-WuLfXm6DEjtWDM4qgCS640B+5wjG12Jc57yWdAF7TPo=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "07b71eb895d1f977c763899b985ee4980412dc57",
+        "rev": "9b89055deea1bc61867e3280f3f2cce798436807",
         "type": "gitlab"
       },
       "original": {
@@ -194,6 +194,22 @@
       }
     },
     "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1747046372,
@@ -209,7 +225,7 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
+    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1767039857,
@@ -232,11 +248,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769996383,
+        "lastModified": 1772408722,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
         "type": "github"
       },
       "original": {
@@ -250,11 +266,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1769996383,
+        "lastModified": 1772408722,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
         "type": "github"
       },
       "original": {
@@ -376,6 +392,51 @@
         "type": "github"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nix-gaming",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1774104215,
+        "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "f799ae951fde0627157f40aec28dec27b22076d0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-gaming",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "gnome-shell": {
       "flake": false,
       "locked": {
@@ -397,11 +458,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1771423359,
+        "lastModified": 1774777275,
-        "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=",
+        "narHash": "sha256-qogBiYFq8hZusDPeeKRqzelBAhZvREc7Cl+qlewGUCg=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b",
+        "rev": "b8f81636927f1af0cca812d22c876bad0a883ccd",
         "type": "github"
       },
       "original": {
@@ -438,11 +499,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771519029,
+        "lastModified": 1774738535,
-        "narHash": "sha256-H59Qf82wv5kBXVoyXsmUKW+9J3o8FqgY4uKaLdsLdLg=",
+        "narHash": "sha256-2jfBEZUC67IlnxO5KItFCAd7Oc+1TvyV/jQlR+2ykGQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "167e0b6837115e672ec5f58e2b0ea39093abe807",
+        "rev": "769e07ef8f4cf7b1ec3b96ef015abec9bc6b1e2a",
         "type": "github"
       },
       "original": {
@@ -533,16 +594,17 @@
     "nix-gaming": {
       "inputs": {
         "flake-parts": "flake-parts_2",
+        "git-hooks": "git-hooks",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1771504976,
+        "lastModified": 1774753090,
-        "narHash": "sha256-E6vYsfrmSugowvC30inu7cpChPXYl68Sjs+p7/3ZitY=",
+        "narHash": "sha256-+m3qW76gdb81rHxmsKUnFghOt5tIcrf10qFYBiLSHgI=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "06154d726ba4eb01c9b2d18edcc3d2476c83d3bc",
+        "rev": "9b5f9d96141e0e3215ddd4e7d8a6d6f7cb0b4967",
         "type": "github"
       },
       "original": {
@@ -558,11 +620,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771130777,
+        "lastModified": 1774762074,
-        "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=",
+        "narHash": "sha256-89Mh4Eb/5stVJX6kGagVMijcU2FmfeD8Qv7UXc5d92o=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "efec7aaad8d43f8e5194df46a007456093c40f88",
+        "rev": "bc13aeaed568be76eab84df88ff39261bb52ff70",
         "type": "github"
       },
       "original": {
@@ -573,18 +635,18 @@
     },
     "nix-minecraft": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
         "nixpkgs": [
           "nixpkgs"
         ],
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1771469368,
+        "lastModified": 1774754558,
-        "narHash": "sha256-yGRHre2BINQJBDAyUwxyzvgAce22J4pNdpLS8roo6fY=",
+        "narHash": "sha256-0BmAweYRGLnfDtngAM//GeinbTUi3o3Tlp2U1DAH6Ck=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "a708458be9b9421e377c54d86807d3490db53816",
+        "rev": "1ee061a6a553b796504087fc172a536381c5ffe4",
         "type": "github"
       },
       "original": {
@@ -595,15 +657,15 @@
     },
     "nixos-wsl": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_3",
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1771243519,
+        "lastModified": 1773882647,
-        "narHash": "sha256-oeHgjE5GpACBjDeXrTczIl6cKmHltLbk7inNSMgGFFQ=",
+        "narHash": "sha256-VzcOcE0LLpEnyoxLuMuptZ9ZWCkSBn99bTgEQoz5Viw=",
         "owner": "nix-community",
         "repo": "nixos-wsl",
-        "rev": "a2cb8eeecfbf4a1ce0083e6a32680b1bec8b045c",
+        "rev": "fd0eae98d1ecee31024271f8d64676250a386ee7",
         "type": "github"
       },
       "original": {
@@ -630,11 +692,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1769909678,
+        "lastModified": 1772328832,
-        "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
+        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "72716169fe93074c333e8d0173151350670b824c",
+        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
         "type": "github"
       },
       "original": {
@@ -660,11 +722,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1770019141,
+        "lastModified": 1773734432,
-        "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=",
+        "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137",
+        "rev": "cda48547b432e8d3b18b4180ba07473762ec8558",
         "type": "github"
       },
       "original": {
@@ -676,11 +738,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1771369470,
+        "lastModified": 1774386573,
-        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0182a361324364ae3f436a63005877674cf45efb",
+        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
         "type": "github"
       },
       "original": {
@@ -723,11 +785,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771523465,
+        "lastModified": 1771715712,
-        "narHash": "sha256-8uRhbSmeUcH3mC13BEyKUxM+a7nHIvIfZF3da5tXfeM=",
+        "narHash": "sha256-n0t8j/zczqbA73syWc9pt16PDnvWyX5LVtl7gkiX7qo=",
         "owner": "xunuwu",
         "repo": "nvim-config",
-        "rev": "1e2e80774f0a8d9d1b484af42413f11e989ddaf4",
+        "rev": "9b1d45b9d3200c19ae96dd6a04135a0954b6c57c",
         "type": "github"
       },
       "original": {
@@ -831,11 +893,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771166946,
+        "lastModified": 1774760784,
-        "narHash": "sha256-UFc4lfGBr+wJmwgDGJDn1cVD6DTr0/8TdronNUiyXlU=",
+        "narHash": "sha256-D+tgywBHldTc0klWCIC49+6Zlp57Y4GGwxP1CqfxZrY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "2d0cf89b4404529778bc82de7e42b5754e0fe4fa",
+        "rev": "8adb84861fe70e131d44e1e33c426a51e2e0bfa5",
         "type": "github"
       },
       "original": {
@@ -865,11 +927,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1771428844,
+        "lastModified": 1774124764,
-        "narHash": "sha256-rTzo6bZEsdT7yHUZ0B4BYe32XQZzm8SiWKvWLJnxerE=",
+        "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "801843d10e9e22d7a00f660d069e2de70aa2980a",
+        "rev": "e31c79f571c5595a155f84b9d77ce53a84745494",
         "type": "github"
       },
       "original": {

home/cli/git.nix

@@ -20,11 +20,11 @@
 
     signing = {
       key = "${config.home.homeDirectory}/.ssh/id_ed25519";
+      format = "ssh";
       signByDefault = true;
     };
 
     settings = {
-      gpg.format = "ssh";
       push.autoSetupRemote = true;
       pull.rebase = true;
       rebase.autostash = true;

home/cli/xdg.nix

@@ -19,8 +19,9 @@ in {
       pictures = home + "/pics";
       publicShare = home + "/share";
       videos = home + "/vids";
+      setSessionVariables = true;
       extraConfig = {
-        XDG_SCREENSHOTS_DIR = config.xdg.userDirs.pictures + "/screenshots";
+        SCREENSHOTS = config.xdg.userDirs.pictures + "/screenshots";
       };
     };
   };

home/desktop/sway/__waybar.nix

@@ -7,7 +7,7 @@
   programs.waybar = {
     enable = true;
     package = pkgs.waybar.overrideAttrs (final: prev: {
-      # patches = [./waybar-workspace.patch];
+      patches = [./waybar-workspace.patch];
     });
     settings = [
       {
@@ -48,9 +48,6 @@
         };
       }
     ];
-    systemd = {
+    systemd.enable = true;
-      enable = true;
-      target = "sway-session.target";
-    };
   };
 }

home/desktop/sway/default.nix

@@ -50,6 +50,7 @@
   wayland.windowManager.sway = {
     enable = true;
     checkConfig = true; # doesnt work with custom wallpaper
+    systemd.dbusImplementation = "broker"; # TODO maybe read from system config
     extraSessionCommands = ''
       export SDL_VIDEODRIVER=wayland,x11,windows
 

home/desktop/sway/waybar-workspace.patch

@@ -1,13 +1,13 @@
 diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
-index 8f273300..faed503c 100644
+index e0255893..13db7f3a 100644
 --- a/src/modules/sway/workspaces.cpp
 +++ b/src/modules/sway/workspaces.cpp
-@@ -343,9 +343,9 @@ auto Workspaces::update() -> void {
+@@ -344,9 +344,9 @@ auto Workspaces::update() -> void {
            fmt::arg("output", (*it)["output"].asString()));
      }
      if (!config_["disable-markup"].asBool()) {
--      static_cast<Gtk::Label *>(button.get_children()[0])->set_markup(output);
+-      static_cast<Gtk::Label*>(button.get_children()[0])->set_markup(output);
-+      static_cast<Gtk::Label *>(button.get_children()[0])->set_markup(trimWorkspaceName(output));
++      static_cast<Gtk::Label*>(button.get_children()[0])->set_markup(trimWorkspaceName(output));
      } else {
 -      button.set_label(output);
 +      button.set_label(trimWorkspaceName(output));

home/develop/langs/c.nix

@@ -2,6 +2,7 @@
   home.packages = with pkgs; [
     clang-tools
     buckle
+    valgrind
     gdb
     lldb
     lld

home/develop/langs/elixir.nix

@@ -1,6 +1,5 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
     elixir_1_18
-    lexical
   ];
 }

hosts/hopper/profiles/lab/minecraft.nix

@@ -38,6 +38,8 @@ in {
     "Z /srv/minecraft/createpack -    minecraft-createpack minecraft-createpack - -"
   ];
   systemd.services.minecraft-createpack = {
+    enable = false;
+
     description = "Minecraft Create Ultimate Selection 2 Server";
     wantedBy = ["multi-user.target"];
     after = ["network.target"];
@@ -91,7 +93,7 @@ in {
 
       cat > user_jvm_args.txt <<'EOF'
       -Xms1024M
-      -Xmx6144M
+      -Xmx4096M
       EOF
 
       echo "=== preStart finished ==="

hosts/nixdesk/home.nix

@@ -38,7 +38,7 @@
     # development
     develop.common
     develop.exercism
-    develop.docs
+    # develop.docs
 
     develop.langs.haskell
     develop.langs.go
@@ -161,6 +161,7 @@
     kdePackages.okular
 
     # games
+    ruffle
     heroic
     lutris
     ryubing # switch emu

pkgs/ida-pro/default.nix

@@ -21,7 +21,18 @@
   makeWrapper,
   openssl,
   stdenv,
-  xorg,
+  libice,
+  libsm,
+  libx11,
+  libxau,
+  libxcb,
+  libxext,
+  libxi,
+  libxrender,
+  libxcb-image,
+  libxcb-keysyms,
+  libxcb-render-util,
+  libxcb-wm,
   zlib,
   wrapGAppsHook3,
   ## crack
@@ -94,18 +105,18 @@ in
       libxkbcommon
       openssl
       stdenv.cc.cc
-      xorg.libICE
+      libice
-      xorg.libSM
+      libsm
-      xorg.libX11
+      libx11
-      xorg.libXau
+      libxau
-      xorg.libxcb
+      libxcb
-      xorg.libXext
+      libxext
-      xorg.libXi
+      libxi
-      xorg.libXrender
+      libxrender
-      xorg.xcbutilimage
+      libxcb-image
-      xorg.xcbutilkeysyms
+      libxcb-keysyms
-      xorg.xcbutilrenderutil
+      libxcb-render-util
-      xorg.xcbutilwm
+      libxcb-wm
       zlib
     ];
     buildInputs = runtimeDependencies;

sys/profiles/core/compat.nix

@@ -36,20 +36,20 @@
     stdenv.cc.cc
     systemd
     vulkan-loader
-    xorg.libX11
+    libx11
-    xorg.libXScrnSaver
+    libxscrnsaver
-    xorg.libXcomposite
+    libxcomposite
-    xorg.libXcursor
+    libxcursor
-    xorg.libXdamage
+    libxdamage
-    xorg.libXext
+    libxext
-    xorg.libXfixes
+    libxfixes
-    xorg.libXi
+    libxi
-    xorg.libXrandr
+    libxrandr
-    xorg.libXrender
+    libxrender
-    xorg.libXtst
+    libxtst
-    xorg.libxcb
+    libxcb
-    xorg.libxkbfile
+    libxkbfile
-    xorg.libxshmfence
+    libxshmfence
     zlib
 
     glfw

sys/profiles/core/docs.nix

@@ -1,7 +1,9 @@
 {pkgs, ...}: {
   documentation = {
     dev.enable = true;
-    man.generateCaches = false; # this does slow down builds by quite a lot
+
+    man.cache.enable = true;
+    man.cache.generateAtRuntime = true;
   };
   environment.systemPackages = with pkgs; [
     # linux-manual

sys/profiles/programs/steam.nix

@@ -8,10 +8,10 @@
     ];
     ## Fixes gamescope (NOTE: no clue what this means)
     extraPackages = with pkgs; [
-      xorg.libXcursor
+      libXcursor
-      xorg.libXi
+      libxi
-      xorg.libXinerama
+      libxinerama
-      xorg.libXScrnSaver
+      libxscrnsaver
       libpng
       libpulseaudio
       libvorbis