diff --git a/flake.lock b/flake.lock index ac7b497..6ea4c4b 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -187,24 +187,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nvim-nix", @@ -285,11 +267,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -303,11 +285,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -340,11 +322,11 @@ "fromYaml": { "flake": false, "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", "owner": "SenchoPens", "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", "type": "github" }, "original": { @@ -373,11 +355,11 @@ ] }, "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -428,11 +410,11 @@ }, "hardware": { "locked": { - "lastModified": 1731403644, - "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", + "lastModified": 1731797098, + "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "f6581f1c3b137086e42a08a906bdada63045f991", + "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "type": "github" }, "original": { @@ -468,11 +450,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1732303962, + "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c", "type": "github" }, "original": { @@ -490,11 +472,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1732025103, + "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "a46e702093a5c46e192243edbd977d5749e7f294", "type": "github" }, "original": { @@ -511,11 +493,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -563,11 +545,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1731240174, - "narHash": "sha256-HYu+bPoV3UILhwc4Ar5iQ7aF+DuQWHXl4mljN6Bwq6A=", + "lastModified": 1732122592, + "narHash": "sha256-lF54irx92m8ddNDQDtOUjKsZAnsGyPL3QTO7byjlxNg=", "owner": "astro", "repo": "microvm.nix", - "rev": "dd89404e1885b8d7033106f3898eaef8db660cb2", + "rev": "19650774c23df84d0b8f315d2527274563497cad", "type": "github" }, "original": { @@ -585,11 +567,11 @@ ] }, "locked": { - "lastModified": 1730779758, - "narHash": "sha256-5WI9AnsBwhLzVRnQm3Qn9oAbROnuLDQTpaXeyZCK8qw=", + "lastModified": 1732016537, + "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0e3f3f017c14467085f15d42343a3aaaacd89bcb", + "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4", "type": "github" }, "original": { @@ -598,28 +580,6 @@ "type": "github" } }, - "nix-gaming": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixpkgs" - ], - "umu": "umu" - }, - "locked": { - "lastModified": 1731375435, - "narHash": "sha256-O2piDr6aQmJd7USZkehOKTZale6jlG+DkoxEVRiu8Iw=", - "owner": "fufexan", - "repo": "nix-gaming", - "rev": "e9adb42d82ec425ff6218b6e45feb6a1a8eaddb0", - "type": "github" - }, - "original": { - "owner": "fufexan", - "repo": "nix-gaming", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -627,11 +587,11 @@ ] }, "locked": { - "lastModified": 1731209121, - "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=", + "lastModified": 1731814505, + "narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3", + "rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132", "type": "github" }, "original": { @@ -649,11 +609,11 @@ ] }, "locked": { - "lastModified": 1731462465, - "narHash": "sha256-SL/d2lvJO+CDzQno7sOyUuktE7+o6kW1qpWsG8tBte4=", + "lastModified": 1732326629, + "narHash": "sha256-JOnNXfPTm/Ge3JyKd5TXytIEr1Tn11tnmrEiRBiDZLQ=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "ac80fc4a7e7604c5699cbe61839af03bd55bf7bf", + "rev": "b2dbcc5bbfc981ef7a9e02b502c3b64ae0ee60d5", "type": "github" }, "original": { @@ -671,11 +631,11 @@ ] }, "locked": { - "lastModified": 1730453870, - "narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=", + "lastModified": 1731682434, + "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "adb6bc4b661a43328752b4575be4968a4990c033", + "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd", "type": "github" }, "original": { @@ -687,11 +647,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -701,18 +661,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1728538411, @@ -731,11 +679,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "lastModified": 1731531548, + "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "rev": "24f0d4acd634792badd6470134c387a3b039dace", "type": "github" }, "original": { @@ -749,7 +697,7 @@ "inputs": { "devshell": "devshell", "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", @@ -761,11 +709,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1731098432, - "narHash": "sha256-hly/Auyv2WUW0k8ST3BnDMkqvMrCWzgR47Ggw6/Ofm8=", + "lastModified": 1732315025, + "narHash": "sha256-vPAMWd5/akE3U3B8uXzi05X/9fUd71sZaOnfBrX4AR0=", "owner": "nix-community", "repo": "nixvim", - "rev": "93ffac6346eab42a6fac879d2559f7e2698e4e61", + "rev": "c1271fa10a54a3b35db6040dd6e779f349af52bf", "type": "github" }, "original": { @@ -776,11 +724,11 @@ }, "nur": { "locked": { - "lastModified": 1731515340, - "narHash": "sha256-GE/kuwXQhmUynUPdRbWp3ccuqfFshF6oLMg7TGXgl+8=", + "lastModified": 1732376696, + "narHash": "sha256-jtyN+D7xA9ai7GrdrXrvMGuf9wYDTegnUwrQPJH8BKA=", "owner": "nix-community", "repo": "NUR", - "rev": "4ae1080fdf68e0c54c05860030861a852439223a", + "rev": "6f31ab1bc688575f436a4a4d2796f204e4c592eb", "type": "github" }, "original": { @@ -800,11 +748,11 @@ ] }, "locked": { - "lastModified": 1730760712, - "narHash": "sha256-F4H98tjNgySlSLItuOqHYo9LF85rFoS/Vr0uOrq7BM4=", + "lastModified": 1731936508, + "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", "owner": "NuschtOS", "repo": "search", - "rev": "aa5214c81b904a19f7a54f7a8f288f7902586eee", + "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", "type": "github" }, "original": { @@ -822,11 +770,11 @@ ] }, "locked": { - "lastModified": 1718252448, - "narHash": "sha256-xZZBdKqe1ByITzvx65pVgGQ5jeb73MybjgrcfI84lEo=", + "lastModified": 1732172653, + "narHash": "sha256-GVjVivAz2AW7WNqpWTA5Uy9vN8Wh/3pjuZRFhsGVk24=", "owner": "berberman", "repo": "nvfetcher", - "rev": "fa7609950023462c6f91c425de7610c0bb6b86ba", + "rev": "15778ffefbeed7224594301161b0a204a76177bb", "type": "github" }, "original": { @@ -843,11 +791,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1731149699, - "narHash": "sha256-9D7kVUjRCqEwa5scX2U2BO+vUh0CgdO+3pEdHv/aFYE=", + "lastModified": 1732377463, + "narHash": "sha256-i6uaZjFu7o2xrxf6Mo+jYSQils26++9kkL8oiAaXD0g=", "owner": "xunuwu", "repo": "nvim-nix", - "rev": "d2abdf874b3e4b583d1d605e961eabfd96f8598f", + "rev": "c2a64547f5d1b4c6630efb5c8dc77c5a90d85666", "type": "github" }, "original": { @@ -863,7 +811,6 @@ "haumea": "haumea", "home-manager": "home-manager", "microvm": "microvm", - "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database", "nix-vscode-extensions": "nix-vscode-extensions", "nixos-wsl": "nixos-wsl", @@ -874,7 +821,7 @@ "sobercookie": "sobercookie", "sops-nix": "sops-nix", "stylix": "stylix", - "umu": "umu_2", + "umu": "umu", "vpn-confinement": "vpn-confinement" } }, @@ -900,17 +847,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": [ - "nixpkgs" ] }, "locked": { - "lastModified": 1731364708, - "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=", + "lastModified": 1732186149, + "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c91d52db103e757fc25b58998b0576ae702d659", + "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699", "type": "github" }, "original": { @@ -952,11 +896,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1731090365, - "narHash": "sha256-ti3gXhgVpIUL/7w6zDJuH+hOnyTZqxrIX/yYqALmiEI=", + "lastModified": 1732261424, + "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=", "owner": "danth", "repo": "stylix", - "rev": "6863412636c8f2cb3b7360f747fbd020fbfddf68", + "rev": "b667a340730dd3d0596083aa7c949eef01367c62", "type": "github" }, "original": { @@ -1114,11 +1058,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1732111664, + "narHash": "sha256-XWHuPWcP59QnHEewdZJXBX1TA2lAP78Vz4daG6tfIr4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "62003fdad7a5ab7b6af3ea9bd7290e4c220277d0", "type": "github" }, "original": { @@ -1130,41 +1074,16 @@ "umu": { "inputs": { "nixpkgs": [ - "nix-gaming", "nixpkgs" ] }, "locked": { "dir": "packaging/nix", - "lastModified": 1730836236, - "narHash": "sha256-8jrg1DQrgYVaO4hpPRxRTAVluo8cE1Lcuvyv2EXuXpA=", - "ref": "refs/heads/main", - "rev": "90352466d502c40e147cfd11a428dde6c2899ab3", - "revCount": 833, - "submodules": true, - "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" - }, - "original": { - "dir": "packaging/nix", - "submodules": true, - "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" - } - }, - "umu_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "dir": "packaging/nix", - "lastModified": 1731482559, - "narHash": "sha256-TOsVK6o2V8D7CLzVOkLs8AClrZmlVQTfeii32ZIQCu4=", + "lastModified": 1732337089, + "narHash": "sha256-lJjORlXC+NisdIn/FSWay9nmuCfLCcQZrN2CSmJ2QfA=", "owner": "Open-Wine-Components", "repo": "umu-launcher", - "rev": "223cd9e2a5f62a9eede6ab6695b2e522fcf78301", + "rev": "f6a6af3191f5497d95d8f8aaa08826a45da199c4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9b68c58..6deab2e 100644 --- a/flake.nix +++ b/flake.nix @@ -6,8 +6,7 @@ systems = ["x86_64-linux"]; imports = [ ./home/profiles - ./hosts/machines - ./modules + ./nix/machines ./home-modules ]; @@ -24,16 +23,7 @@ just home-manager sops - ## TODO remove after https://github.com/zhaofengli/colmena/pull/228 is merged - (colmena.overrideAttrs (final: prev: { - nativeBuildInputs = prev.nativeBuildInputs ++ [pkgs.makeBinaryWrapper]; - postInstall = - prev.postInstall - + '' - wrapProgram $out/bin/colmena \ - --prefix PATH ":" "${pkgs.lib.makeBinPath [pkgs.nixVersions.nix_2_18]}" - ''; - })) + colmena git-agecrypt inputs.nvfetcher.packages.${pkgs.system}.default ]; @@ -77,11 +67,6 @@ url = "github:nix-community/haumea"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-gaming = { - url = "github:fufexan/nix-gaming"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - ## deduplication flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/machines/nixdesk/testing.nix b/hosts/machines/nixdesk/testing.nix deleted file mode 100644 index 0c0c558..0000000 --- a/hosts/machines/nixdesk/testing.nix +++ /dev/null @@ -1,17 +0,0 @@ -{self, ...}: { - imports = [ - self.nixosModules.xun - ]; - xun.gaming = let - enabled = {enable = true;}; - in { - enable = true; - steam = enabled; - gamescope = enabled; - gamemode = enabled; - sunshine = { - enable = true; - openFirewall = true; - }; - }; -} diff --git a/modules/default.nix b/modules/default.nix deleted file mode 100644 index cbed782..0000000 --- a/modules/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - flake.nixosModules = { - #name = import ./name; - xun = import ./xun; - }; -} diff --git a/modules/xun/default.nix b/modules/xun/default.nix deleted file mode 100644 index 5fd7ee3..0000000 --- a/modules/xun/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./gaming - ]; -} diff --git a/modules/xun/gaming/default.nix b/modules/xun/gaming/default.nix deleted file mode 100644 index 62a3687..0000000 --- a/modules/xun/gaming/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: let - cfg = config.xun.gaming; -in { - options.xun.gaming = let - mkBool = lib.mkOption {type = lib.types.bool;}; - in { - enable = lib.mkEnableOption "gaming"; - steam.enable = lib.mkEnableOption "steam"; - gamemode.enable = lib.mkEnableOption "gamemode"; - gamescope.enable = lib.mkEnableOption "gamescope"; - sunshine = { - enable = lib.mkEnableOption "sunshine"; - openFirewall = mkBool; - }; - }; - - config = lib.mkIf cfg.enable (lib.mkMerge [ - (lib.mkIf cfg.gamescope.enable { - programs.gamescope = { - enable = true; - capSysNice = false; # doesnt work with steam & heroic - }; - }) - (lib.mkIf cfg.sunshine.enable { - services.sunshine = { - enable = true; - capSysAdmin = true; - openFirewall = cfg.sunshine.openFirewall; - }; - }) - (lib.mkIf cfg.gamemode.enable {programs.gamemode.enable = true;}) - (lib.mkIf cfg.steam.enable { - # TODO: protontricks & steamtinkerlaunch - programs.steam = { - enable = true; - remotePlay.openFirewall = true; - localNetworkGameTransfers.openFirewall = true; - extraCompatPackages = with pkgs; [ - proton-ge-bin - ]; - ## Fixes gamescope (NOTE: no clue what this means) - extraPackages = with pkgs; [ - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXScrnSaver - libpng - libpulseaudio - libvorbis - stdenv.cc.cc.lib - libkrb5 - keyutils - ]; - }; - }) - ]); -} diff --git a/hosts/machines/default.nix b/nix/machines/default.nix similarity index 96% rename from hosts/machines/default.nix rename to nix/machines/default.nix index 908efae..3ad7c0d 100644 --- a/hosts/machines/default.nix +++ b/nix/machines/default.nix @@ -98,7 +98,7 @@ in { desktop.ly desktop.awesome desktop.sway - #..desktop.hyprland + #desktop.hyprland programs.dconf programs.fonts @@ -115,15 +115,16 @@ in { services.syncthing services.virt.waydroid services.virt.virt-manager + services.sunshine #network.wifi #services.ollama desktop.x11.nosleep themes.dark - # programs.gamemode # TEMP: TODO - # programs.gamescope # TEMP: TODO - # programs.steam # TEMP: TODO + programs.gamemode + programs.gamescope + programs.steam programs.RE.default ]) diff --git a/hosts/machines/hopper/brawlstats.nix b/nix/machines/hopper/brawlstats.nix similarity index 100% rename from hosts/machines/hopper/brawlstats.nix rename to nix/machines/hopper/brawlstats.nix diff --git a/hosts/machines/hopper/default.nix b/nix/machines/hopper/default.nix similarity index 100% rename from hosts/machines/hopper/default.nix rename to nix/machines/hopper/default.nix diff --git a/hosts/machines/hopper/hardening.nix b/nix/machines/hopper/hardening.nix similarity index 100% rename from hosts/machines/hopper/hardening.nix rename to nix/machines/hopper/hardening.nix diff --git a/hosts/machines/hopper/hardware.nix b/nix/machines/hopper/hardware.nix similarity index 100% rename from hosts/machines/hopper/hardware.nix rename to nix/machines/hopper/hardware.nix diff --git a/hosts/machines/hopper/lab.nix b/nix/machines/hopper/lab.nix similarity index 100% rename from hosts/machines/hopper/lab.nix rename to nix/machines/hopper/lab.nix diff --git a/hosts/machines/hopper/newlab.nix b/nix/machines/hopper/newlab.nix similarity index 97% rename from hosts/machines/hopper/newlab.nix rename to nix/machines/hopper/newlab.nix index a9fdab8..900ae31 100644 --- a/hosts/machines/hopper/newlab.nix +++ b/nix/machines/hopper/newlab.nix @@ -219,13 +219,13 @@ in { "Obtaining" = [ { "transmission" = { - href = "http://hopper:9091"; + href = "http://${config.networking.hostName}:9091"; icon = "transmission"; }; } { "slskd" = { - href = "http://hopper:23488"; + href = "http://${config.networking.hostName}:23488"; icon = "slskd"; }; } @@ -239,6 +239,12 @@ in { icon = "jellyfin"; }; } + { + "lldap" = { + href = "http://${config.networking.hostName}:${toString config.services.lldap.settings.http_port}"; + icon = "lldap"; + }; + } # { # "nextcloud" = { # href = "https://nextcloud.xunuwu.xyz"; diff --git a/hosts/machines/kidney/default.nix b/nix/machines/kidney/default.nix similarity index 100% rename from hosts/machines/kidney/default.nix rename to nix/machines/kidney/default.nix diff --git a/hosts/machines/kidney/fonts.nix b/nix/machines/kidney/fonts.nix similarity index 100% rename from hosts/machines/kidney/fonts.nix rename to nix/machines/kidney/fonts.nix diff --git a/hosts/machines/kidney/hardware.nix b/nix/machines/kidney/hardware.nix similarity index 100% rename from hosts/machines/kidney/hardware.nix rename to nix/machines/kidney/hardware.nix diff --git a/hosts/machines/kidney/wsl.nix b/nix/machines/kidney/wsl.nix similarity index 100% rename from hosts/machines/kidney/wsl.nix rename to nix/machines/kidney/wsl.nix diff --git a/hosts/machines/liveiso/default.nix b/nix/machines/liveiso/default.nix similarity index 100% rename from hosts/machines/liveiso/default.nix rename to nix/machines/liveiso/default.nix diff --git a/hosts/machines/liveiso/sway.nix b/nix/machines/liveiso/sway.nix similarity index 100% rename from hosts/machines/liveiso/sway.nix rename to nix/machines/liveiso/sway.nix diff --git a/hosts/machines/liveiso/tools.nix b/nix/machines/liveiso/tools.nix similarity index 100% rename from hosts/machines/liveiso/tools.nix rename to nix/machines/liveiso/tools.nix diff --git a/hosts/machines/nixdesk/default.nix b/nix/machines/nixdesk/default.nix similarity index 97% rename from hosts/machines/nixdesk/default.nix rename to nix/machines/nixdesk/default.nix index d75545f..002b570 100644 --- a/hosts/machines/nixdesk/default.nix +++ b/nix/machines/nixdesk/default.nix @@ -2,7 +2,6 @@ imports = [ ./hardware.nix ./hibernate-boot.nix - ./testing.nix ./samba-mount.nix ]; diff --git a/hosts/machines/nixdesk/hardware.nix b/nix/machines/nixdesk/hardware.nix similarity index 100% rename from hosts/machines/nixdesk/hardware.nix rename to nix/machines/nixdesk/hardware.nix diff --git a/hosts/machines/nixdesk/hibernate-boot.nix b/nix/machines/nixdesk/hibernate-boot.nix similarity index 100% rename from hosts/machines/nixdesk/hibernate-boot.nix rename to nix/machines/nixdesk/hibernate-boot.nix diff --git a/hosts/machines/nixdesk/jellyfin.nix b/nix/machines/nixdesk/jellyfin.nix similarity index 100% rename from hosts/machines/nixdesk/jellyfin.nix rename to nix/machines/nixdesk/jellyfin.nix diff --git a/hosts/machines/nixdesk/samba-mount.nix b/nix/machines/nixdesk/samba-mount.nix similarity index 100% rename from hosts/machines/nixdesk/samba-mount.nix rename to nix/machines/nixdesk/samba-mount.nix diff --git a/nix/systemProfiles/programs/steam.nix b/nix/systemProfiles/programs/steam.nix index 59478b5..02ebfe3 100644 --- a/nix/systemProfiles/programs/steam.nix +++ b/nix/systemProfiles/programs/steam.nix @@ -1,27 +1,12 @@ -{pkgs, ...}: { - environment.systemPackages = [ - pkgs.protontricks - pkgs.steamtinkerlaunch - ]; - +_: {pkgs, ...}: { programs.steam = { enable = true; - #package = pkgs.steam.overrideAttrs (final: prev: { - # nativeBuildInputs = prev.nativeBuildInputs ++ [pkgs.breakpointHook]; - # postInstall = - # prev.postInstall - # ++ '' - # exit 33 - # ''; - #}); - remotePlay.openFirewall = true; localNetworkGameTransfers.openFirewall = true; extraCompatPackages = with pkgs; [ proton-ge-bin ]; - gamescopeSession.enable = true; - ## Fixes gamescope + ## Fixes gamescope (NOTE: no clue what this means) extraPackages = with pkgs; [ xorg.libXcursor xorg.libXi diff --git a/nix/systemProfiles/secrets/hopper/lldap.yaml b/nix/systemProfiles/secrets/hopper/lldap.yaml index 41adb8b..ce56028 100644 --- a/nix/systemProfiles/secrets/hopper/lldap.yaml +++ b/nix/systemProfiles/secrets/hopper/lldap.yaml @@ -1,6 +1,6 @@ lldap: - jwt: ENC[AES256_GCM,data:/s7dTCwufcURfCEm7dUyo8sstQjN/0592xkw4I/Qt35xYXPEWL6RSuYe2epJ8SRDTH6JZtak0YvSnsE02Edauy9dPmP8CA/Sl3YzQsoMe5LfGrpcP4a5CdlInXKuUUFmecaAO5vufCPaLliATsWDzPo6AY8D21leqdxY8QRa9oE=,iv:Tq9v4sQyzw3leMGD9syL9/Jdoxu/66c3SHRD583uqzc=,tag:miGWl1G57gWWjNRbEcVfAw==,type:str] - password: ENC[AES256_GCM,data:Y4TCgSOl+LiOHSzLseX8HeuyreOwGfa9LWrTcf3CGbr70RKgef5si+A3qi4vTJa9Ft/+smHoLd9eCH2Ti9kR1w==,iv:934juRr049XQEz4UG41ZNHyvq7qTyTzTiKRm+bbxkv0=,tag:NCnB0FMOOama8dm7wEv3AQ==,type:str] + jwt: ENC[AES256_GCM,data:kFvBDxZzZw3rgk7yhEc6LB+vqLJktwtc3xJlSxnm/kURXM0yh/uqhfjr+7PJF5CZ24rH/eEolLKnLbxMh196y3/vZx54RI9gEx6L6P+XcLffUp+QQUvlTrcIdhS+NuwdI0cFIuhBsIde/AFGzTouQlHLQg/cofHneP5CbCpUcOByvJKwHQtL0aelDx2WTQsgoRkCe9FBd8ORUfbwowb6ooBO+M3vQMY1t3JCsOH54IRylLietKyLJqkzSoozD9Icxk7E6Q6V8YZRVlKOVFhRBn89oHbh+eiIxDMWhe/38UDimYeS1re+kTtZZv1IuzOW8r/LWmbeqS3H9MClj6x6EQ==,iv:Sff5shR5CocdHdUxKwBiyRIT9d6U83k+1Cm83Gdu0dA=,tag:Pa31iMzZyUwUX+i2LrdhXg==,type:str] + password: ENC[AES256_GCM,data:mwPwme/th/mzjxFha/4atBSi/xpg5pEhiKl1j1Dy98KJt4MxH2qz5Y2W/xjS5StEz0x6wLu8+LNsPqMyw+FlE3/sf15oD5ehvcMUbVCokeSAwCjri+Kut+T+nY1h5vStogXHtvMQAd5nvp5SFji4qYBXfuyRE/nfhUTi4ik/q+rDSY6e8yvSrGz48NWRKjfYAYp9DYgBDSW2AF07qQb/bRHMe7MAEC766b6S/M1AUzv35yFGoxtCki7wrUXWiz7VFmJiX3gNlCbcuE2/TXGWlQWVkS/1l+TyTVb2RcAdRZyQcwVvurOF//EmA45ktMHreh9FVGwoIGPTR5ThS1p3LA==,iv:xMp63D4ELTSVidg7GEzQTeAW2M8KNKaasEqkLiJMN+0=,tag:j63xikfu6H1DfKHEO+Ak4g==,type:str] sops: kms: [] gcp_kms: [] @@ -25,8 +25,8 @@ sops: WFgzK1BpVks3YmcxT3gxYzl3eHpySFEKJwsayqczYl2bFViRTWlP1p2OomPA1NnE EKU51AINXIYfnNaXzMKWEj52yoVLvtKiA/rdJeVVOOopwD+qa/lRkw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-11-08T18:13:26Z" - mac: ENC[AES256_GCM,data:XArGpA+g2rBudPew1FlVbe+u3hfrqfsTpCb+u6a5MDp3+ro6EUXytnuUJRS3PpsmfJ6PfzmM4q2QHa5qjTnqt3G4DXtenrb2zVixiSykE4qBwr2Jj07aDqG0/8fDQskAkP868EhTjJ+/3KQ3MyNLoaoWEISGN8ryLjM/ASHxD5s=,iv:LrqLod4yS3H1QYRozZv+sEKzigtaMGnLb1UfWdvoSEs=,tag:HoxUl6oOOjKRpyPt86CGxA==,type:str] + lastmodified: "2024-11-21T17:19:18Z" + mac: ENC[AES256_GCM,data:6r8Y79Z04G+govQEwHe+ASatz1tMkn+c/M482tyOK3UoJGkV3XghrEs2M9s3QiFF3yG/HJ3naIG6DNDlqZdVKzNDdBBIlMsFFi0nxCKDpr1t+kFfljblw0rVKDE2jd+W6BSPF9hTmNQEoCrOiXNuIUdJdKTB1b4oJMp+hLGq+gg=,iv:WOmnVRRVF0agBf4Bftk+h0tZuPqxHn5M4mdwEbxqANU=,tag:Q9Nn6N4J5vGKemx3m5wNfA==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.1 diff --git a/nix/systemProfiles/secrets/hopper/slskd b/nix/systemProfiles/secrets/hopper/slskd index a092175..b7b7eca 100644 --- a/nix/systemProfiles/secrets/hopper/slskd +++ b/nix/systemProfiles/secrets/hopper/slskd @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data:eWuDg5+I6NvkF1VoAKg84y6zfZA9GJAwO59SLCViXZIH7YgXSGA8B+0lOROHA5j98IUAgPtGqsVT2625LXnUBduQT7ZNc+KieOnWE2mDVzcOu0olCiGmVn98s/M4slsq3P/y3fNpygGSqmlllOrWOu4LlmZrPSrc+5SG+M0asxT6Xs/jxtVjLjB2TwtBykPFJCwARBbVATAcgJeYdSSPi0WaEyozYhBiLoUZPoAKqBCen/jOcIHn3DEzqmpDOr9uSRLai6QKkZNXvPzBao0m4qw+ZnK4cQk52c3bCYXc+kiRFi8bD96h1mdGV6ZiaoQFp4bOs8ZK4dBD21wVB/sW6caf9STd4xBX6x9VUvSkQmFv4f8rmtfdeyREY9rcizSFIQbpyMYiy1LRLS/My6IqymC7ucIy0ntujZyoaW9fOrO4d1tsuJxcb1kR/hJ0hjRfs1oUdTutllTpvi5BBS2Z+gmiDBW/PEwyU6V0t2EADnkU6Y4MQuOSBNC3wwBAI5QsmALhHhcjtB/p+TkwIVPmfHAKnSBBkS0S6f83KpzdoSmAS/tkKwhMCont9b3sivycenb79xgQfeWHgLQ2SwZWreSbiDNIAUIMfoPYRc8DOsWByZoC3W6XLKl4UFH/lvJbv12myA54y4pxd2lVY3xbMNCMGC72G3BYkuIiVYbCRw3WG9dcHaqwtI8YsHmvgkdcyzwBe/GhHnzLX1fppdx6xAViKsl0YGKtpkoAR5Zxf5qNM0ViKbTLa9txetEhcP3J6NKocSCdBFGu+VjPn2x74L/5WlZMXBJ+JcYan8llQbY=,iv:s2WKqWG1hd2OU6wmb2Pz/dHCVoV6eRsEZicKj0v63wo=,tag:iiq/NMotzJB54qclG7XDqA==,type:str]", + "data": "ENC[AES256_GCM,data:VWw1v50MSG502oxaUFK9DabhlcxeBHgLtHwT3UjUndaMfhghc/BYswJ3t4kSI7Hi8ORrpro3onH6jMa0AbHdgFf8S1Iqk6z/asQ1SVN8xzYEgFDJ/U9A9/cSI0Kq65/LLds9Vkyk8mK3FgP6eAoBpn4TrwcwULMx9zYIzURUUb7BgLGsZU0NlD70TWQmFTL7SDzqyOXX34P3eCcX/DUwTW8oRFCy4zy73xqGb8OILhi3Afvn79G84fkCspOoEGPFgbW7PNxkUXP2l/J4pcqjkYNMr+9hTJfacKVUMg7XhQJwombge1JU+XLHcZeo1mZQWhZXHXV8Wj0s72Q3GYT97U8YDhmI,iv:pP9OBOeTPwsBjxpezQs9DAM2tdxrNBmqQL8G1SilVeE=,tag:xSh0vswSv9xk2IeHHpBblQ==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -15,10 +15,10 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOWXNpZlpySndGK1hRR2ZF\nUXdZZVhJVC9YMy96N3BzSVBJQzBOMEliMm1ZCi9ZWTgvOXcxSXdvMldYZXdsbjlX\nc0VDZTZNY3dSUHFMVmNZbWY0dzl4VkkKLS0tIFRtSzhJdFdLVHAzTVdBMmd3T3ho\naDI2WnBnT1FGUkgxQ0NrenpIYWZRM2MKN6hXjBR+jS4UkYy1SS5uHtlHTugfxCwW\nAErlX+kU0g0uBIQbHExNSr0/Xjk+bIRNqSg2O0CfxULxbQRtZrsqMA==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-04-24T17:51:03Z", - "mac": "ENC[AES256_GCM,data:qfQHPzpFgsyi28QEDZt2M1gGiWDbDqVImmyCtqWKbCHme3Lc6Y44G4uD9dQOZqXHQySC2nAbkric2WJ0ozzl1/eiUMMLG8S+yGq84e8/55s+8u81dbHCcZCPSnWMLzSVlWknpG/pjU/Z1lr1/Vj6roHYZtJyEpcTnJBbqQh2NU4=,iv:ja6zyxErPWbq979dBw5YWMbcWkA9tjMGqbqIZZE8QvM=,tag:Pau0HMocJ5HOorpen2gRrQ==,type:str]", + "lastmodified": "2024-11-21T17:18:26Z", + "mac": "ENC[AES256_GCM,data:oijVU+zW83/b8HVKT//NLHHGcXegA52oaCyOeh5fNR2kPuI8keNxBMIc+GN/Ybvn3ilyw05XVEWuW3AFT5qZXzJJkLIw6bs+d/QAHjA80H8VI4585d7CP5vRGXnK1TtT8QB2v/RnOPkwJo6R0wJu4YOBPEGN+vPCgbGOT+kNMEc=,iv:iQwrI41lE65m9028L68COreL7nAJKQbwtGaIrQrlPWM=,tag:n4urrzVUnR6R/ZZqOyHOzQ==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", - "version": "3.8.1" + "version": "3.9.1" } } \ No newline at end of file diff --git a/nix/systemProfiles/services/gamemode.nix b/nix/systemProfiles/services/gamemode.nix new file mode 100644 index 0000000..e69de29 diff --git a/nix/systemProfiles/services/pipewire.nix b/nix/systemProfiles/services/pipewire.nix index 08177b3..7526d40 100644 --- a/nix/systemProfiles/services/pipewire.nix +++ b/nix/systemProfiles/services/pipewire.nix @@ -1,10 +1,4 @@ -{ - lib, - inputs, - ... -}: { - imports = [inputs.nix-gaming.nixosModules.pipewireLowLatency]; - +{lib, ...}: { services.pipewire = { enable = true; alsa.enable = true; @@ -12,10 +6,22 @@ jack.enable = true; pulse.enable = true; - lowLatency = { - enable = true; - quantum = 64; - rate = 48000; + # https://wiki.archlinux.org/title/PipeWire#Noticeable_audio_delay_or_audible_pop/crack_when_starting_playback + wireplumber.extraConfig."51-disable-suspension.conf" = { + "monitor.alsa.rules" = lib.singleton { + matches = [ + {"node.name" = "~alsa_input.*";} + {"node.name" = "~alsa_output.*";} + ]; + actions.update-props."session.suspend-timeout.seconds" = 0; + }; + "monitor.bluez.rules" = lib.singleton { + matches = [ + {"node.name" = "~bluez_input.*";} + {"node.name" = "~bluez_output.*";} + ]; + actions.update-props."session.suspend-timeout-seconds" = 0; + }; }; }; diff --git a/nix/systemProfiles/services/sunshine.nix b/nix/systemProfiles/services/sunshine.nix new file mode 100644 index 0000000..cfdfbc2 --- /dev/null +++ b/nix/systemProfiles/services/sunshine.nix @@ -0,0 +1,7 @@ +{ + services.sunshine = { + enable = true; + capSysAdmin = true; + openFirewall = true; + }; +}