diff --git a/flake.lock b/flake.lock index 6b3e5bf..b209ef2 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1755946532, - "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", + "lastModified": 1764714051, + "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", + "rev": "a43bedcceced5c21ad36578ed823e6099af78214", "type": "github" }, "original": { @@ -40,11 +40,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758074020, - "narHash": "sha256-ygdb17DSpaWh3hAX7MkwJ8d9k4CuSo26Du73t+t6CA8=", + "lastModified": 1765974365, + "narHash": "sha256-i3gQQnWjf4X6O9F1yJ9EmUINgFra2yhvB/Z2ex6FtK8=", "owner": "Saghen", "repo": "blink.cmp", - "rev": "2fcf66aa31e37d4b443c669ec1bf189530dcbf20", + "rev": "b14922e5c4b30efe0857256989b72eaf1f14109f", "type": "github" }, "original": { @@ -60,11 +60,11 @@ ] }, "locked": { - "lastModified": 1731355357, - "narHash": "sha256-kTXsO+hskCfX36+Ez1fHu9SO54uUY2lofkrbMKE3Vrk=", + "lastModified": 1759253700, + "narHash": "sha256-pDsDzWEBaZlT9lHsBZMGm8aBJGncMxqerKwkzjEM/EI=", "owner": "dnut", "repo": "clipboard-sync", - "rev": "943e49e0a9a16b54bbab3704e99b6cf6ad4ea19f", + "rev": "138a59b8f3044dd9e7dcccd9607bbbb48c14bae6", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1747032090, - "narHash": "sha256-htgrHIR/P7V8WeRW/XDWJHXBzbTSWCDYZHsxPAzDuUY=", + "lastModified": 1761028747, + "narHash": "sha256-UqCbRuqnsVURCB0hLZL9SwFNDNftIE1Zxj7Ykf1aRj4=", "owner": "nix-community", "repo": "fenix", - "rev": "1436bb8b85b35ca3ba64ad97df31a3b23c7610a3", + "rev": "1dd37dd710195936f675eb0d36cf284806f99a94", "type": "github" }, "original": { @@ -96,6 +96,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1747046372, @@ -129,6 +145,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_3" + }, + "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" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -158,11 +192,11 @@ ] }, "locked": { - "lastModified": 1758593331, - "narHash": "sha256-p+904PfmINyekyA/LieX3IYGsiFtExC00v5gSYfJtpM=", + "lastModified": 1765860045, + "narHash": "sha256-7Lxp/PfOy4h3QIDtmWG/EgycaswqRSkDX4DGtet14NE=", "owner": "nix-community", "repo": "home-manager", - "rev": "9a2dc0efbc569ce9352a6ffb8e8ec8dbc098e142", + "rev": "09de9577d47d8bffb11c449b6a3d24e32ac16c99", "type": "github" }, "original": { @@ -236,11 +270,11 @@ ] }, "locked": { - "lastModified": 1758192433, - "narHash": "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ=", + "lastModified": 1763733840, + "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "c44e749dd611521dee940d00f7c444ee0ae4cfb7", + "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", "type": "github" }, "original": { @@ -254,22 +288,23 @@ "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", + "hyprland-guiutils": "hyprland-guiutils", "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1758542519, - "narHash": "sha256-dAMZsDFYTSqPkBbQHvQoCCiyX7Z07nyPKThKq8yFq9c=", + "lastModified": 1765902757, + "narHash": "sha256-NUOxXjV94sSVoCCjiFC1wECT8A+kAf7JrhJZzHnzWos=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "70a7047ee175d2e7fca1575d50a3738ac40fd2c6", + "rev": "709855842068315bb2109d8f422a70c2b5ed1931", "type": "github" }, "original": { @@ -278,6 +313,52 @@ "type": "github" } }, + "hyprland-guiutils": { + "inputs": { + "aquamarine": [ + "hyprland", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit", + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1764812575, + "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=", + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "rev": "fd321368a40c782cfa299991e5584ca338e36ebe", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -290,11 +371,11 @@ ] }, "locked": { - "lastModified": 1749046714, - "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", + "lastModified": 1759610243, + "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", + "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", "type": "github" }, "original": { @@ -303,74 +384,6 @@ "type": "github" } }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1749154592, - "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1757694755, - "narHash": "sha256-j+w5QUUr2QT/jkxgVKecGYV8J7fpzXCMgzEEr6LG9ug=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -387,11 +400,11 @@ ] }, "locked": { - "lastModified": 1756810301, - "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", + "lastModified": 1764612430, + "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", + "rev": "0d00dc118981531aa731150b6ea551ef037acddd", "type": "github" }, "original": { @@ -400,6 +413,58 @@ "type": "github" } }, + "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprland-guiutils", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1764592794, + "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -412,11 +477,11 @@ ] }, "locked": { - "lastModified": 1756117388, - "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=", + "lastModified": 1764962281, + "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0", + "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0", "type": "github" }, "original": { @@ -437,11 +502,11 @@ ] }, "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "lastModified": 1763640274, + "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", "type": "github" }, "original": { @@ -450,6 +515,35 @@ "type": "github" } }, + "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1764872015, + "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "7997451dcaab7b9d9d442f18985d514ec5891608", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, "naersk": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -469,6 +563,26 @@ "type": "github" } }, + "nix-minecraft": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1765937121, + "narHash": "sha256-maweGZo3MDkmLwkBsBpRLMa0sqrg98jTn62c3m4/H0o=", + "owner": "Infinidoge", + "repo": "nix-minecraft", + "rev": "d6b615e2c84e49174b4c2021ba4369a9af0fae62", + "type": "github" + }, + "original": { + "owner": "Infinidoge", + "repo": "nix-minecraft", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1736166416, @@ -527,11 +641,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1758198701, - "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -543,11 +657,27 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -567,11 +697,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1765016596, + "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", "type": "github" }, "original": { @@ -587,18 +717,19 @@ "home-manager": "home-manager", "hydractify-bot": "hydractify-bot", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_5", + "nix-minecraft": "nix-minecraft", + "nixpkgs": "nixpkgs_6", "spicetify-nix": "spicetify-nix" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1746889290, - "narHash": "sha256-h3LQYZgyv2l3U7r+mcsrEOGRldaK0zJFwAAva4hV/6g=", + "lastModified": 1760976639, + "narHash": "sha256-v+teOfOLbR9UFLuaMfbsd/L5ckJBcQJyeFj23V3lz8g=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "2bafe9d96c6734aacfd49e115f6cf61e7adc68bc", + "rev": "4a305f565ab964caf22dc72980a44b2970a9c2f1", "type": "github" }, "original": { @@ -613,14 +744,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_4" }, "locked": { - "lastModified": 1758584568, - "narHash": "sha256-FDxTheW6ynpbro/8eTZHhAY7J+HOf0jXeXq3jrJDcS8=", + "lastModified": 1765687197, + "narHash": "sha256-5aJgT+lEC7ypuAGE3DQLj3LzYDQ+kRG6MnkVr3ZF9RU=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "9e9e48ca16628bf09a02bc5449d4b0761e15eebd", + "rev": "fa6a5dde9d95bf7b8f075ff5aceeb1d97fa9043a", "type": "github" }, "original": { @@ -674,6 +805,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems" @@ -720,11 +866,11 @@ ] }, "locked": { - "lastModified": 1755354946, - "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=", + "lastModified": 1761431178, + "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0", + "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 40ea217..4bfa4fd 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,8 @@ hydractify-bot.url = "github:hydractify/hydractify-bot"; blink-cmp.url = "github:Saghen/blink.cmp"; + + nix-minecraft.url = "github:Infinidoge/nix-minecraft"; }; outputs = diff --git a/hosts/wizdesk/home-manager.nix b/hosts/wizdesk/home-manager.nix index d9c9e48..a213bf8 100644 --- a/hosts/wizdesk/home-manager.nix +++ b/hosts/wizdesk/home-manager.nix @@ -124,7 +124,7 @@ enable = true; # Enable ollama support - ollama.enable = true; + ollama.enable = false; # TODO: Re-enable when one of its dependencies gets fixed }; modules.hyprland = { diff --git a/hosts/wizdesk/nixos.nix b/hosts/wizdesk/nixos.nix index 47d5aa3..86d2958 100644 --- a/hosts/wizdesk/nixos.nix +++ b/hosts/wizdesk/nixos.nix @@ -64,6 +64,7 @@ 6567 # Mindustry 8211 # Palworld 3979 # OpenTTD + 24454 # Minecraft Simple Voice Chat ]; allowedTCPPortRanges = [ diff --git a/hosts/wizdesk/services/home-manager/hydractify-bot.nix b/hosts/wizdesk/services/home-manager/hydractify-bot.nix index f11cdb8..e743db5 100644 --- a/hosts/wizdesk/services/home-manager/hydractify-bot.nix +++ b/hosts/wizdesk/services/home-manager/hydractify-bot.nix @@ -8,7 +8,7 @@ Unit.After = "postgresql.service"; Service = { - ExecStart = "${hydractify-bot.defaultPackage.${pkgs.system}}/bin/hydractify"; + ExecStart = "${hydractify-bot.defaultPackage.${pkgs.stdenv.hostPlatform.system}}/bin/hydractify"; Restart = "on-failure"; Type = "simple"; WorkingDirectory = "/mnt/internal/hydractify/GitHub/hydractify"; diff --git a/hosts/wizdesk/services/nixos/caddy.nix b/hosts/wizdesk/services/nixos/caddy.nix index fb1f983..47c3d78 100644 --- a/hosts/wizdesk/services/nixos/caddy.nix +++ b/hosts/wizdesk/services/nixos/caddy.nix @@ -53,5 +53,10 @@ header X-Robots-Tag "none" reverse_proxy 127.0.0.1:7373 ''; + + virtualHosts."map.thewizard.link".extraConfig = '' + header X-Robots-Tag "none" + reverse_proxy 127.0.0.1:8123 + ''; }; } diff --git a/hosts/wizdesk/services/nixos/default.nix b/hosts/wizdesk/services/nixos/default.nix index fcdcf83..2a6fd22 100644 --- a/hosts/wizdesk/services/nixos/default.nix +++ b/hosts/wizdesk/services/nixos/default.nix @@ -6,6 +6,7 @@ ./caddy.nix ./forgejo.nix ./jellyfin.nix + ./minecraft.nix ./nix-serve.nix ./postgresql.nix ]; diff --git a/hosts/wizdesk/services/nixos/minecraft.nix b/hosts/wizdesk/services/nixos/minecraft.nix new file mode 100644 index 0000000..d4b141e --- /dev/null +++ b/hosts/wizdesk/services/nixos/minecraft.nix @@ -0,0 +1,35 @@ +{ nix-minecraft, pkgs, ... }: + +{ + imports = [ nix-minecraft.nixosModules.minecraft-servers ]; + nixpkgs.overlays = [ nix-minecraft.overlay ]; + + services.minecraft-servers = { + enable = true; + eula = true; + openFirewall = true; + + servers.cobblemon = { + enable = true; + package = pkgs.fabricServers.fabric-1_21_1.override { loaderVersion = "0.18.0"; }; + + openFirewall = true; + autoStart = true; + + jvmOpts = "-Xms2048M -Xmx8192M -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:MaxGCPauseMillis=50 -XX:G1HeapRegionSize=4M -XX:TargetSurvivorRatio=90 -XX:G1NewSizePercent=50 -XX:G1MaxNewSizePercent=80 -XX:InitiatingHeapOccupancyPercent=10 -XX:G1MixedGCLiveThresholdPercent=50"; + + operators = { + WizardLink = { + uuid = "55a58451-8fe9-4dfe-8011-1509e948e7a6"; + level = 3; + }; + }; + + serverProperties = { + allow-flight = true; + max-players = 15; + motd = "Welcome to \\u00A7c\\u00A7lHydractify\\u00A7r's \\u00A7bCobblemon\\u00A7r server!"; + }; + }; + }; +} diff --git a/hosts/wizlap/home-manager.nix b/hosts/wizlap/home-manager.nix index 12cf15e..72467c4 100644 --- a/hosts/wizlap/home-manager.nix +++ b/hosts/wizlap/home-manager.nix @@ -111,7 +111,7 @@ enable = true; # Enable ollama support - ollama.enable = true; + ollama.enable = false; # TODO: Re-enable when one of its dependencies gets fixed }; # Add monitor configuration to hyprland diff --git a/modules/emacs/doom/config.el b/modules/emacs/doom/config.el index 18d5583..48bb62c 100644 --- a/modules/emacs/doom/config.el +++ b/modules/emacs/doom/config.el @@ -87,6 +87,9 @@ (setq org-roam-directory "~/Documents/zettelkasten") (map! (:leader :desc "Opens a daily note through the calendar" :n "nrdF" #'org-roam-dailies-find-date)) +(use-package! websocket + :after org-roam) + (use-package! org-roam-ui :after org-roam :config diff --git a/modules/emacs/doom/init.el b/modules/emacs/doom/init.el index fcafad3..b9680fd 100644 --- a/modules/emacs/doom/init.el +++ b/modules/emacs/doom/init.el @@ -161,7 +161,7 @@ +gnuplot +pandoc +pretty - +roam2) + +roam) ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional diff --git a/modules/hyprland/home-manager.nix b/modules/hyprland/home-manager.nix index 822dee5..411cd1f 100644 --- a/modules/hyprland/home-manager.nix +++ b/modules/hyprland/home-manager.nix @@ -258,38 +258,58 @@ in bind = SHIFT CTRL, F12, pass, class:^(com\.obsproject\.Studio)$ # Window rules for xwaylandvideobridge - windowrule = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$ - windowrule = noanim,class:^(xwaylandvideobridge)$ - windowrule = nofocus,class:^(xwaylandvideobridge)$ - windowrule = noinitialfocus,class:^(xwaylandvideobridge)$ + windowrule { + name = xwaylandvideobridge + match:class = ^(xwaylandvideobridge)$ + + no_anim = true + no_focus = true + no_initial_focus = true + opacity = 0.0 + } # Rules for windowkill - windowrule = tag +windowkill, class:^(steam_app_2726450)$ - windowrule = noborder, tag:windowkill - windowrule = pin, tag:windowkill - windowrule = opacity 0.9, tag:windowkill + windowrule { + name = windowkill + match:class = ^(steam_app_2726450)$ + + border_size = 0 + opacity = 0.9 + pin = true + } # Rules for Awakened PoE - windowrule = tag +poe, class:^(steam_app_238960)$ - windowrule = allowsinput, tag:poe + windowrule = match:class ^(steam_app_238960)$, allows_input true + windowrule { + name = awakened-poe-trade + match:class = ^(awakened-poe-trade)$ - windowrule = tag +apt, class:^(awakened-poe-trade)$ - windowrule = float, tag:apt - windowrule = noblur, tag:apt - windowrule = noborder, tag:apt - windowrule = noshadow, tag:apt + border_size = 0 + float = true + no_blur = true + no_shadow = true + } # Rules for anki - windowrule = float, class:^(anki)$ + windowrule = match:class ^(anki)$, float true - windowrule = tag +gw2, class:^(steam_app_1284210)$ - windowrule = noblur, tag:gw2 - windowrule = noborder, tag:gw2 + # Rules for Guild Wars 2 + windowrule { + name = gw2 + match:class = ^(steam_app_1284210)$ + + border_size = 0 + no_blur = true + } # Rules for godot - windowrule = tag +godot, class:^(Godot)$, title:^(.+)$ - windowrule = center, tag:godot - windowrule = size 50% 50%, tag:godot + windowrule { + name = godot + match:class = ^(Godot)$ + + center = true + size = 50% 50% + } ''; }; } diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index 163fad1..0954ef0 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -48,14 +48,13 @@ in }; config = { - home.sessionVariables = - { - EDITOR = "nvim"; - MANPAGER = "nvim +Man!"; - } - // lib.optionalAttrs (config.programs.neovim.flakePath != null) { - FLAKE = config.programs.neovim.flakePath; - }; + home.sessionVariables = { + EDITOR = "nvim"; + MANPAGER = "nvim +Man!"; + } + // lib.optionalAttrs (config.programs.neovim.flakePath != null) { + FLAKE = config.programs.neovim.flakePath; + }; programs.neovim = { withNodeJs = true; @@ -154,7 +153,9 @@ in xdg.dataFile."nvim/lazy/blink.cmp/target/release/libblink_cmp_fuzzy.so" = { recursive = true; - source = "${blink-cmp.packages.${pkgs.system}.blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.so"; + source = "${ + blink-cmp.packages.${pkgs.stdenv.hostPlatform.system}.blink-fuzzy-lib + }/lib/libblink_cmp_fuzzy.so"; }; }; } diff --git a/shared/home-manager/common.nix b/shared/home-manager/common.nix index 371e9b3..d54be1f 100644 --- a/shared/home-manager/common.nix +++ b/shared/home-manager/common.nix @@ -61,6 +61,7 @@ xdg.mimeApps.defaultApplications = { "inode/directory" = [ "thunar.desktop" ]; "text/html" = [ "firefox.desktop" ]; + "text/plain" = [ "nvim.desktop" ]; "video/mp4" = [ "vlc.desktop" ]; "video/x-matroska" = [ "vlc.desktop" ]; "x-scheme-handler/about" = [ "firefox.desktop" ]; @@ -102,7 +103,7 @@ aseprite blender krita - self.packages.${system}.lmms + # self.packages.${system}.lmms # FIXME: Broken for now, gotta update the package orca-slicer shotcut vcv-rack diff --git a/shared/home-manager/dotfiles/git.nix b/shared/home-manager/dotfiles/git.nix index 1d5ae80..69cf0c6 100644 --- a/shared/home-manager/dotfiles/git.nix +++ b/shared/home-manager/dotfiles/git.nix @@ -6,27 +6,27 @@ enable = true; lfs.enable = true; - aliases = { - # List aliases - aliases = "config --get-regexp alias"; + settings = { + aliases = { + # List aliases + aliases = "config --get-regexp alias"; - # List all the contributors with commit amount - contributors = "shortlog --summary --numbered"; + # List all the contributors with commit amount + contributors = "shortlog --summary --numbered"; - # Output verbose info about branches and tags - branches = "branch -avv"; + # Output verbose info about branches and tags + branches = "branch -avv"; - # List all tags - tags = "tag -l"; + # List all tags + tags = "tag -l"; - # Pretty logs - plog = "log --graph --decorate --all"; + # Pretty logs + plog = "log --graph --decorate --all"; - # Pretty grep - gcommit = "log --graph --decorate --grep"; - }; + # Pretty grep + gcommit = "log --graph --decorate --grep"; + }; - extraConfig = { core = { # Set the editor to be used by GIT editor = "nvim"; diff --git a/shared/home-manager/dotfiles/spotify/default.nix b/shared/home-manager/dotfiles/spotify/default.nix index 9ae1c18..4ccb2d0 100644 --- a/shared/home-manager/dotfiles/spotify/default.nix +++ b/shared/home-manager/dotfiles/spotify/default.nix @@ -1,7 +1,7 @@ { pkgs, spicetify-nix, ... }: let - spicePkgs = spicetify-nix.legacyPackages.${pkgs.system}; + spicePkgs = spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system}; in { imports = [ spicetify-nix.homeManagerModules.default ]; diff --git a/shared/home-manager/gaming.nix b/shared/home-manager/gaming.nix index 1fba2da..b7755c6 100644 --- a/shared/home-manager/gaming.nix +++ b/shared/home-manager/gaming.nix @@ -1,7 +1,6 @@ { self, pkgs, ... }: { - home.file = { # Configuration for gamemode, for running games with optimizations. ".config/gamemode.ini".source = ./dotfiles/gamemode.ini; @@ -10,14 +9,24 @@ ".config/dxvk.conf".text = '' dxvk.enableGraphicsPipelineLibrary = Auto ''; + + ".local/share/scripts/rpc-bridge" = { + source = pkgs.fetchzip { + url = "https://github.com/EnderIce2/rpc-bridge/releases/download/v1.4.0.1/bridge.zip"; + hash = "sha256-bfGduu8DbhrPJXihTLlaKTiuBsDB6QRjQtF8zba/hO4="; + stripRoot = false; + }; + recursive = true; + }; }; home.packages = with pkgs; [ gamescope heroic + packwiz protontricks r2modman - self.packages.${system}.deadlock-api-ingest + self.packages.${pkgs.stdenv.hostPlatform.system}.deadlock-api-ingest wineWowPackages.stableFull winetricks diff --git a/shared/home-manager/scripts/games/launch_rpc.sh b/shared/home-manager/scripts/games/launch_rpc.sh new file mode 100755 index 0000000..621b8a4 --- /dev/null +++ b/shared/home-manager/scripts/games/launch_rpc.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +# This script is to pipe the game's RPC connection +# from wine and expose it to Linux processes. + +~/.local/share/scripts/rpc-bridge/bridge.sh ~/.local/share/scripts/games/launch.sh "$@" diff --git a/shared/nixos/desktop.nix b/shared/nixos/desktop.nix index 7f85486..6d69b13 100644 --- a/shared/nixos/desktop.nix +++ b/shared/nixos/desktop.nix @@ -70,9 +70,9 @@ fcitx5 = { addons = with pkgs; [ - fcitx5-mozc + catppuccin-fcitx5 fcitx5-gtk - fcitx5-catppuccin + fcitx5-mozc ]; quickPhrase = { @@ -97,8 +97,8 @@ flavor = "frappe"; font = "IBM Plex Sans"; fontSize = "11"; - # FIXME: Cannot set custom background anymore, tracking in https://github.com/NixOS/nixpkgs/issues/442758 - # background = "${../../assets/sddm/Background.jpg}"; + # FIXME: Background isn't applying but the configuration doesn't fails now + background = "${../../assets/sddm/Background.jpg}"; loginBackground = true; } )