diff --git a/flake.lock b/flake.lock index ec6ef8c..a66110e 100644 --- a/flake.lock +++ b/flake.lock @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1771469470, - "narHash": "sha256-GnqdqhrguKNN3HtVfl6z+zbV9R9jhHFm3Z8nu7R6ml0=", + "lastModified": 1768923567, + "narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=", "owner": "nix-community", "repo": "disko", - "rev": "4707eec8d1d2db5182ea06ed48c820a86a42dc13", + "rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28", "type": "github" }, "original": { @@ -163,11 +163,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1771494902, - "narHash": "sha256-G2yfLhPTuW4nSQCWdXzqknm9uop7OR+zQuoGll5rxLA=", + "lastModified": 1769054619, + "narHash": "sha256-LCc0gbSgjehdy41Gi1H5WNxEuW9PtRHFVaPXoFzslQU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "07b71eb895d1f977c763899b985ee4980412dc57", + "rev": "6509620630f68dc02ac3e99f15a67760778444ff", "type": "gitlab" }, "original": { @@ -232,11 +232,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -250,11 +250,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -272,11 +272,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -343,6 +343,24 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "inputs": { "systems": "systems_5" }, @@ -397,11 +415,11 @@ }, "hardware": { "locked": { - "lastModified": 1771423359, - "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", + "lastModified": 1769086393, + "narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", + "rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca", "type": "github" }, "original": { @@ -438,11 +456,11 @@ ] }, "locked": { - "lastModified": 1771519029, - "narHash": "sha256-H59Qf82wv5kBXVoyXsmUKW+9J3o8FqgY4uKaLdsLdLg=", + "lastModified": 1769102673, + "narHash": "sha256-/qvRFjn1s3bIJdSKG6IpaE6ML3j9anQKUqGhmt4Qe+E=", "owner": "nix-community", "repo": "home-manager", - "rev": "167e0b6837115e672ec5f58e2b0ea39093abe807", + "rev": "b0491fe55680bd19be8e74847969dad9d7784658", "type": "github" }, "original": { @@ -478,11 +496,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1769548169, - "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", + "lastModified": 1768941735, + "narHash": "sha256-OyxsfXNcOkt06/kM+4bnuC8moDx+t7Qr+RB0BBa83Ig=", "owner": "nix-community", "repo": "impermanence", - "rev": "7b1d382faf603b6d264f58627330f9faa5cba149", + "rev": "69ecf31e8fddc9354a4b418f3a517445d486bb54", "type": "github" }, "original": { @@ -501,11 +519,11 @@ ] }, "locked": { - "lastModified": 1771459510, - "narHash": "sha256-ZlLdKt0MpgzPIjBraJvKDdy62wj2ffLllMgZNLUjxsM=", + "lastModified": 1769040284, + "narHash": "sha256-zgZfWwXyL9EDqkTEk0y7hB2wUrsNhpTjoVZpmGa3VHw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "93414035e92a7ebc016b2931af9b7ffb01d398ba", + "rev": "ce27c2327ff2e41f79aa0b5933b931708d6f6804", "type": "github" }, "original": { @@ -517,11 +535,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1771458370, - "narHash": "sha256-rtLD1cwnEGPNQdGpZClJJZfcuWJl3pNYKaaoIhbVMd0=", + "lastModified": 1768992167, + "narHash": "sha256-pCe5bvBt8VYF/IrDY2RDmA0412YR5Uq0kbYRp/zBI4g=", "owner": "neovim", "repo": "neovim", - "rev": "ac84a3f3b6eebd4b3ba426b2d60a99204b05f436", + "rev": "25ce44845d2adf94dfc91c70eb792a50d8274aa1", "type": "github" }, "original": { @@ -538,11 +556,11 @@ ] }, "locked": { - "lastModified": 1771504976, - "narHash": "sha256-E6vYsfrmSugowvC30inu7cpChPXYl68Sjs+p7/3ZitY=", + "lastModified": 1768874893, + "narHash": "sha256-1WCbVm2Dqqb+HEuahu06l8lQ393P8jIAHEjM3jhm4gc=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "06154d726ba4eb01c9b2d18edcc3d2476c83d3bc", + "rev": "12c404b997930a1fe8ffcaa231f85fd8ebc6338a", "type": "github" }, "original": { @@ -558,11 +576,11 @@ ] }, "locked": { - "lastModified": 1771130777, - "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "efec7aaad8d43f8e5194df46a007456093c40f88", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -574,17 +592,17 @@ "nix-minecraft": { "inputs": { "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" - ], - "systems": "systems_2" + ] }, "locked": { - "lastModified": 1771469368, - "narHash": "sha256-yGRHre2BINQJBDAyUwxyzvgAce22J4pNdpLS8roo6fY=", + "lastModified": 1768962252, + "narHash": "sha256-HyWOOHcySV8rl36gs4+n0sxPinxpwWOgwXibfFPYeZ0=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "a708458be9b9421e377c54d86807d3490db53816", + "rev": "433cf697394104123e1fd02fa689534ac1733bfa", "type": "github" }, "original": { @@ -599,11 +617,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1771243519, - "narHash": "sha256-oeHgjE5GpACBjDeXrTczIl6cKmHltLbk7inNSMgGFFQ=", + "lastModified": 1768840529, + "narHash": "sha256-e22ou8nikeThx9x9/y29VdMEW4Fm7DBzlhp9ndDJUGE=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "a2cb8eeecfbf4a1ce0083e6a32680b1bec8b045c", + "rev": "b8e9a758fa2e08d8ac5c3be5d4b1fcc92fd3ce84", "type": "github" }, "original": { @@ -630,11 +648,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1769909678, - "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "72716169fe93074c333e8d0173151350670b824c", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -660,11 +678,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770019141, - "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -676,11 +694,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -723,11 +741,11 @@ ] }, "locked": { - "lastModified": 1771523465, - "narHash": "sha256-8uRhbSmeUcH3mC13BEyKUxM+a7nHIvIfZF3da5tXfeM=", + "lastModified": 1769111606, + "narHash": "sha256-oWQSTDeEfdHQccVtOOIoaLM/wVTrpmscgIeHVWz9p4c=", "owner": "xunuwu", "repo": "nvim-config", - "rev": "1e2e80774f0a8d9d1b484af42413f11e989ddaf4", + "rev": "cd11d2167f061c630264f5d30a30634763f0a7d2", "type": "github" }, "original": { @@ -831,11 +849,11 @@ ] }, "locked": { - "lastModified": 1771166946, - "narHash": "sha256-UFc4lfGBr+wJmwgDGJDn1cVD6DTr0/8TdronNUiyXlU=", + "lastModified": 1768863606, + "narHash": "sha256-1IHAeS8WtBiEo5XiyJBHOXMzECD6aaIOJmpQKzRRl64=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2d0cf89b4404529778bc82de7e42b5754e0fe4fa", + "rev": "c7067be8db2c09ab1884de67ef6c4f693973f4a2", "type": "github" }, "original": { @@ -865,11 +883,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1771428844, - "narHash": "sha256-rTzo6bZEsdT7yHUZ0B4BYe32XQZzm8SiWKvWLJnxerE=", + "lastModified": 1768744881, + "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=", "owner": "nix-community", "repo": "stylix", - "rev": "801843d10e9e22d7a00f660d069e2de70aa2980a", + "rev": "06684f00cfbee14da96fd4307b966884de272d3a", "type": "github" }, "original": { @@ -1070,7 +1088,7 @@ "wayland-appusage": { "inputs": { "crane": "crane_3", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] diff --git a/home/desktop/sway/__waybar.nix b/home/desktop/sway/__waybar.nix index 1f0f5cc..562ccbe 100644 --- a/home/desktop/sway/__waybar.nix +++ b/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 = [ { @@ -32,11 +32,11 @@ "sway/window" = { max-length = 80; }; - # "custom/miao-battery-percentage" = { - # return-type = "json"; - # exec = "${lib.getExe self.packages.${pkgs.stdenv.hostPlatform.system}.miao-battery-percentage}"; - # restart-interval = "60"; - # }; + "custom/miao-battery-percentage" = { + return-type = "json"; + exec = "${lib.getExe self.packages.${pkgs.stdenv.hostPlatform.system}.miao-battery-percentage}"; + restart-interval = "60"; + }; "custom/keyboard-state" = { return-type = "json"; exec = "${lib.getExe self.packages.${pkgs.stdenv.hostPlatform.system}.keyboard-state}"; diff --git a/hosts/hopper/hardware.nix b/hosts/hopper/hardware.nix index 99bcd34..5b38a29 100644 --- a/hosts/hopper/hardware.nix +++ b/hosts/hopper/hardware.nix @@ -70,7 +70,6 @@ }; "/home" = { device = "/dev/disk/by-uuid/1297e638-f2ff-49a2-a362-314ac7eeaabc"; - neededForBoot = true; fsType = "btrfs"; options = ["subvol=home" "compress=zstd"]; }; diff --git a/hosts/hopper/profiles/lab/create-ultimate-selection-2/create-ultimate-selection-2.pw.toml b/hosts/hopper/profiles/lab/create-ultimate-selection-2/create-ultimate-selection-2.pw.toml deleted file mode 100644 index ba7d762..0000000 --- a/hosts/hopper/profiles/lab/create-ultimate-selection-2/create-ultimate-selection-2.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Create Ultimate Selection 2 – Create Quests | Create Addons [1.21.1]" -filename = "Create Ultimate Selection 2 MC 1.21.1-5.2.0.zip" -side = "both" - -[download] -hash-format = "sha1" -hash = "f1bb7067d9a58492d1634d0ff5f15bee68ed1f7b" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 7634594 -project-id = 1324409 diff --git a/hosts/hopper/profiles/lab/create-ultimate-selection-2/index.toml b/hosts/hopper/profiles/lab/create-ultimate-selection-2/index.toml deleted file mode 100644 index 86bce5f..0000000 --- a/hosts/hopper/profiles/lab/create-ultimate-selection-2/index.toml +++ /dev/null @@ -1,6 +0,0 @@ -hash-format = "sha256" - -[[files]] -file = "create-ultimate-selection-2.pw.toml" -hash = "9ab2c65f33afcf236a0f406422cc1a6b7c6989f7da57a49f967699259d6e4e3e" -metafile = true diff --git a/hosts/hopper/profiles/lab/create-ultimate-selection-2/pack.toml b/hosts/hopper/profiles/lab/create-ultimate-selection-2/pack.toml deleted file mode 100644 index b367a8b..0000000 --- a/hosts/hopper/profiles/lab/create-ultimate-selection-2/pack.toml +++ /dev/null @@ -1,12 +0,0 @@ -name = "Packwiz Create Ultimate Selection" -version = "1.0.0" -pack-format = "packwiz:1.1.0" - -[index] -file = "index.toml" -hash-format = "sha256" -hash = "c1e5db361e3f6a0150a60e69742ea490985603d455146b1498075cfb2f718a55" - -[versions] -minecraft = "1.21.1" -neoforge = "21.1.219" diff --git a/hosts/hopper/profiles/lab/minecraft.nix b/hosts/hopper/profiles/lab/minecraft.nix index a586e59..724478c 100644 --- a/hosts/hopper/profiles/lab/minecraft.nix +++ b/hosts/hopper/profiles/lab/minecraft.nix @@ -2,109 +2,13 @@ inputs, pkgs, ... -}: let - modpackZip = pkgs.fetchurl { - url = "https://git.xunuwu.xyz/xun/nixos-config/releases/download/create-ultimate-thing-full/Create%20Ultimate%20Selection%202%20Serverpack%20MC%201.21.1-5.3.0.zip"; - name = "Create Ultimate Selection 2 MC 1.21.1-5.3.0.zip"; - hash = "sha256-xDChlZWivNNjYnmSCUIyrxfvqXAHrbvql7jyEDvVXvA="; - }; - neoforge = inputs.nix-minecraft.legacyPackages.${pkgs.stdenv.hostPlatform.system}.neoforgeServers.neoforge-1_21_1; - serverPackage = pkgs.stdenv.mkDerivation { - name = "minecraft-createpack-server"; - nativeBuildInputs = [pkgs.unzip]; - dontUnpack = true; - installPhase = '' - mkdir -p $out - cp -r ${neoforge}/* $out/ - - unzip ${modpackZip} -d temp - cp -r temp/* $out/ 2>/dev/null || true - rm -rf temp - ''; - }; -in { - users.users.minecraft-createpack = { - isSystemUser = true; - group = "minecraft-createpack"; - }; - users.groups.minecraft-createpack = {}; - - networking.firewall.allowedTCPPorts = [25565]; - networking.firewall.allowedUDPPorts = [24454]; - - systemd.tmpfiles.rules = [ - "d /srv/minecraft 0755 root root - -" - "d /srv/minecraft/createpack 0770 minecraft-createpack minecraft-createpack - -" - "Z /srv/minecraft/createpack - minecraft-createpack minecraft-createpack - -" - ]; - systemd.services.minecraft-createpack = { - description = "Minecraft Create Ultimate Selection 2 Server"; - wantedBy = ["multi-user.target"]; - after = ["network.target"]; - serviceConfig = { - User = "minecraft-createpack"; - Group = "minecraft-createpack"; - WorkingDirectory = "/srv/minecraft/createpack"; - Restart = "always"; - RestartSec = "5s"; - ExecStart = '' - ${pkgs.jdk21}/bin/java \ - @user_jvm_args.txt \ - @libraries/net/neoforged/neoforge/21.1.219/unix_args.txt \ - nogui - ''; - }; - preStart = '' - set -euo pipefail - echo "=== minecraft-createpack preStart ===" - - for dir in world logs crash-reports backups screenshots; do - if [ -d "$dir" ]; then - mv "$dir" "../$dir-tmp" 2>/dev/null || true - fi - done - - ${pkgs.rsync}/bin/rsync -a --delete \ - --exclude='world' --exclude='logs' --exclude='crash-reports' \ - --exclude='backups' --exclude='screenshots' \ - --exclude='user_jvm_args.txt' --exclude='server.properties' --exclude='eula.txt' \ - ${serverPackage}/ ./ - - for dir in world logs crash-reports backups screenshots; do - if [ -d "../$dir-tmp" ]; then - mv "../$dir-tmp" "$dir" - fi - done - - chown -R minecraft-createpack:minecraft-createpack . - chmod -R u+rwX . - - echo "eula=true" > eula.txt - - cat > server.properties <<'EOF' - motd=createpack!! - max-players=5 - difficulty=normal - allow-flight=true - view-distance=16 - EOF - - cat > user_jvm_args.txt <<'EOF' - -Xms1024M - -Xmx6144M - EOF - - echo "=== preStart finished ===" - ''; - }; - +}: { services.minecraft-servers = { - enable = false; + enable = true; eula = true; openFirewall = true; - managementSystem.systemd-socket.enable = true; servers.owo = { - enable = false; + enable = true; package = inputs.nix-minecraft.legacyPackages.${pkgs.stdenv.hostPlatform.system}.fabricServers.fabric-1_21_5; serverProperties = { max-players = 5; diff --git a/hosts/hopper/profiles/lab/navidrome/default.nix b/hosts/hopper/profiles/lab/navidrome/default.nix index abdf6f2..621e329 100644 --- a/hosts/hopper/profiles/lab/navidrome/default.nix +++ b/hosts/hopper/profiles/lab/navidrome/default.nix @@ -7,10 +7,10 @@ services.navidrome = { enable = true; - # package = pkgs.navidrome.overrideAttrs { - # patches = [./scrobbleAlbumArtist.patch]; - # doCheck = false; - # }; + package = pkgs.navidrome.overrideAttrs { + patches = [./scrobbleAlbumArtist.patch]; + doCheck = false; + }; settings = { MusicFolder = "/media/library/music"; Address = config.vpnNamespaces."wg".bridgeAddress; diff --git a/hosts/nixdesk/default.nix b/hosts/nixdesk/default.nix index 5cfc41d..0293133 100644 --- a/hosts/nixdesk/default.nix +++ b/hosts/nixdesk/default.nix @@ -132,7 +132,6 @@ "rider" "clion" "idea-ultimate" - "android-studio" "android-studio-stable" "krunker" ]; diff --git a/sys/profiles/core/docs.nix b/sys/profiles/core/docs.nix index 39130f4..ccb1e12 100644 --- a/sys/profiles/core/docs.nix +++ b/sys/profiles/core/docs.nix @@ -4,7 +4,7 @@ man.generateCaches = false; # this does slow down builds by quite a lot }; environment.systemPackages = with pkgs; [ - # linux-manual + linux-manual man-pages man-pages-posix ];