diff --git a/flake.lock b/flake.lock index 8a2a553..e9aa29e 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1735468753, - "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", + "lastModified": 1734701201, + "narHash": "sha256-hk0roBX10j/hospoWIJIJj3i2skd7Oml6yKQBx7mTFk=", "owner": "nix-community", "repo": "disko", - "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", + "rev": "2ee76c861af3b895b3b104bae04777b61397485b", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1735774679, - "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -223,14 +223,18 @@ "nixpkgs": [ "nixvim", "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -285,11 +289,11 @@ ] }, "locked": { - "lastModified": 1735925111, - "narHash": "sha256-/NptDI4njO5hH0ZVQ2yzbvTXmBOabZaGYkjhnMJ37TY=", + "lastModified": 1734992499, + "narHash": "sha256-f9UyHMTb+BwF6RDZ8eO9HOkSlKeeSPBlcYhMmV1UNIk=", "owner": "nix-community", "repo": "home-manager", - "rev": "ef64efdbaca99f9960f75efab991e4c49e79a5f1", + "rev": "f1b1786ea77739dcd181b920d430e30fb1608b8a", "type": "github" }, "original": { @@ -306,11 +310,11 @@ ] }, "locked": { - "lastModified": 1735900408, - "narHash": "sha256-U+oZBQ3f5fF2hHsupKQH4ihgTKLHgcJh6jEmKDg+W10=", + "lastModified": 1734862405, + "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c8d4c8d592e8fab4cff4397db5529ec6f078cf9", + "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", "type": "github" }, "original": { @@ -327,11 +331,11 @@ ] }, "locked": { - "lastModified": 1735774425, - "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", + "lastModified": 1733085484, + "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", + "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", "type": "github" }, "original": { @@ -376,11 +380,11 @@ ] }, "locked": { - "lastModified": 1735931035, - "narHash": "sha256-f3WRxasPYVKzrvAlLq+/3FRHQVfxVf5xxf0WWwnO99k=", + "lastModified": 1734725857, + "narHash": "sha256-bivlV9l/UjMtTfz/CZaoNJ5RfH2Lre4P9Ds64conoUQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "7e530766a5fd9b7577296fedd655f3255f7495d8", + "rev": "dbae2fd6adaf34c947d310bec08deac7c4ed265b", "type": "github" }, "original": { @@ -401,11 +405,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1735926524, - "narHash": "sha256-BRcp1VNIeGL709AfiVTKx06ZnjhuixZtB7Wjryo8c+s=", + "lastModified": 1735381519, + "narHash": "sha256-Nti4KlTGglrdaO/9WM3SOr12mbgI9EquYXLZ11vyGTI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "470ebbc098914eded248cc257bcd67f0036e96a4", + "rev": "95351433dd401ddd764ad5745c8211ddc36a9a8a", "type": "github" }, "original": { @@ -434,11 +438,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1735914396, - "narHash": "sha256-QMvvPKqqaTCfGQf4v77lyz8n8gabuQbocc5tzA8x8cw=", + "lastModified": 1735303376, + "narHash": "sha256-LhKE5o5R6LDhfdoJ0xh2qODcw6nLUv14n3dvsazIito=", "owner": "YaLTeR", "repo": "niri", - "rev": "b3c6f0e661878c7ab4f3c84c480ae61a5de5d3b3", + "rev": "4e357e9659e5aafeec3cdeb18581698716d97a78", "type": "github" }, "original": { @@ -455,11 +459,11 @@ ] }, "locked": { - "lastModified": 1735685839, - "narHash": "sha256-62xAPSs5VRZoPH7eRanUn5S5vZEd+8vM4bD5I+zxokc=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "6a1fdb2a1204c0de038847b601cff5012e162b5e", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -492,11 +496,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1735388221, - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "lastModified": 1734954597, + "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "rev": "def1d472c832d77885f174089b0d34854b007198", "type": "github" }, "original": { @@ -507,11 +511,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -523,11 +527,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1735669367, - "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", + "lastModified": 1735264675, + "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", + "rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966", "type": "github" }, "original": { @@ -552,11 +556,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735937973, - "narHash": "sha256-kUNsnN7AUMS7I/GOSRCdftM77zY4EOuEROlE7whBRPU=", + "lastModified": 1734956286, + "narHash": "sha256-8h7Fs6S+Ftg3NNmwT/KkYWI9epUNPCMPn56QFXOfmTM=", "owner": "nix-community", "repo": "nixvim", - "rev": "4f4917be697e7ef39ebada3737e51cb42e0cbe79", + "rev": "8938e09db14d510dcc2f266e8b2e738ee527d386", "type": "github" }, "original": { @@ -575,11 +579,11 @@ ] }, "locked": { - "lastModified": 1735854821, - "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "owner": "NuschtOS", "repo": "search", - "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "type": "github" }, "original": { @@ -609,11 +613,11 @@ ] }, "locked": { - "lastModified": 1735844895, - "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=", + "lastModified": 1734546875, + "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", "owner": "mic92", "repo": "sops-nix", - "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32", + "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", "type": "github" }, "original": { @@ -641,11 +645,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1735933801, - "narHash": "sha256-SbkFaIYzfoasvu6GN5fdlaltrcEtUcoPsTRulWNkH7E=", + "lastModified": 1734885904, + "narHash": "sha256-NxA4JnLuXyle2/nUKDbW8vORwSd+Z20limIl7DhlZbs=", "owner": "danth", "repo": "stylix", - "rev": "e0a41d3a2562ce1b43cad8560333673d04b111b8", + "rev": "4d87b96ceca38532f39c1b7efd8a9235bfcee3d6", "type": "github" }, "original": { @@ -742,11 +746,11 @@ ] }, "locked": { - "lastModified": 1735905407, - "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { diff --git a/hosts/Lenni/default.nix b/hosts/Lenni/default.nix index d184692..4e04e63 100644 --- a/hosts/Lenni/default.nix +++ b/hosts/Lenni/default.nix @@ -12,8 +12,6 @@ desktop = { enable = true; - dev.enable = true; - laser.enable = true; windowManager = "niri-session"; hyprland.enable = false; }; diff --git a/hosts/Lillie/default.nix b/hosts/Lillie/default.nix index 448ea0f..02a808c 100644 --- a/hosts/Lillie/default.nix +++ b/hosts/Lillie/default.nix @@ -12,8 +12,6 @@ desktop = { enable = true; autostart.enable = false; - emulation.enable = true; - laser.enable = true; hyprland = { hardware.Lillie = true; diff --git a/hosts/Puenktchen/default.nix b/hosts/Puenktchen/default.nix index be6471e..caa0592 100644 --- a/hosts/Puenktchen/default.nix +++ b/hosts/Puenktchen/default.nix @@ -10,8 +10,6 @@ desktop = { enable = true; - dev.enable = true; - emulation.enable = true; hyprlock.enable = false; hypridle.enable = false; diff --git a/modules/default/common/desktop/default.nix b/modules/default/common/desktop/default.nix index 7b7d2a7..02f4793 100644 --- a/modules/default/common/desktop/default.nix +++ b/modules/default/common/desktop/default.nix @@ -4,8 +4,7 @@ ./applications.nix ./autostart.nix ./boot.nix - ./dev.nix - ./k40.nix + ./emulation.nix ./keyboard.nix ./nfs-client.nix ./nix-ld.nix @@ -15,7 +14,6 @@ ./remoteBuilder.nix ./ssh-server.nix ./thunar.nix - ./udev.nix ]; diff --git a/modules/default/common/desktop/dev.nix b/modules/default/common/desktop/dev.nix deleted file mode 100644 index 3c5291d..0000000 --- a/modules/default/common/desktop/dev.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ lib, config, pkgs, ... }: -lib.mkIf config.desktop.dev.enable { - - environment.systemPackages = with pkgs; [ - jetbrains.rust-rover - jetbrains.pycharm-community-bin - ]; -} diff --git a/modules/default/common/desktop/games/emulation.nix b/modules/default/common/desktop/emulation.nix similarity index 71% rename from modules/default/common/desktop/games/emulation.nix rename to modules/default/common/desktop/emulation.nix index aa9f9ac..8147364 100644 --- a/modules/default/common/desktop/games/emulation.nix +++ b/modules/default/common/desktop/emulation.nix @@ -1,9 +1,9 @@ { lib, config, pkgs, ... }: -lib.mkIf config.desktop.emulation.enable { +lib.mkIf config.desktop.enable { environment.systemPackages = with pkgs; [ melonDS dolphin-emu - #lime3ds + lime3ds cemu steam-rom-manager ]; diff --git a/modules/default/common/desktop/games/default.nix b/modules/default/common/desktop/games/default.nix index fad0a49..965fc7d 100644 --- a/modules/default/common/desktop/games/default.nix +++ b/modules/default/common/desktop/games/default.nix @@ -4,7 +4,6 @@ imports = [ ./ROG_Pugio_II_fixes.nix - ./emulation.nix ./mangohud.nix ./minecraft.nix ./moonlight.nix diff --git a/modules/default/common/desktop/k40.nix b/modules/default/common/desktop/k40.nix deleted file mode 100644 index 86f23b6..0000000 --- a/modules/default/common/desktop/k40.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, config, pkgs, ... }: -lib.mkIf config.desktop.laser.enable { - - services.udev.extraRules = '' - SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="5512", MODE:="0666" - ''; - - environment.systemPackages = with pkgs; [ - k40-whisperer - ]; - -} diff --git a/modules/default/common/desktop/udev.nix b/modules/default/common/desktop/udev.nix deleted file mode 100644 index 52c14b8..0000000 --- a/modules/default/common/desktop/udev.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ ... }: -{ -} diff --git a/modules/default/common/options.nix b/modules/default/common/options.nix index a5d33a6..ec6c81b 100644 --- a/modules/default/common/options.nix +++ b/modules/default/common/options.nix @@ -2,32 +2,14 @@ { options = { desktop = { - enable = lib.mkOption { default = false; type = lib.types.bool; }; - - emulation.enable = lib.mkOption { - default = false; - type = lib.types.bool; - }; - - dev.enable = lib.mkOption { - default = false; - type = lib.types.bool; - }; - - laser.enable = lib.mkOption { - default = false; - type = lib.types.bool; - }; - windowManager = lib.mkOption { default = "Hyprland"; type = lib.types.str; }; - }; server.enable = lib.mkOption { default = false;