diff --git a/common/home/configs/desktop-full.nix b/common/home/configs/desktop-full.nix index d791d47..c5dc6b1 100644 --- a/common/home/configs/desktop-full.nix +++ b/common/home/configs/desktop-full.nix @@ -55,7 +55,7 @@ in { xdg.desktopEntries = { "renpy" = { name = "RenPy"; - exec = "${pkgs.renpy}/bin/renpy"; + exec = "${pkgs-stable.renpy}/bin/renpy"; }; "Vital" = { @@ -95,4 +95,4 @@ in { ) groups ); }; -} \ No newline at end of file +} diff --git a/common/home/home.nix b/common/home/home.nix index 761a38c..c44815e 100755 --- a/common/home/home.nix +++ b/common/home/home.nix @@ -255,6 +255,12 @@ text = builtins.readFile ./dotfiles/rustfmt.toml; }; + "ignore-dev-edition-profile" = { + target = ".mozilla/firefox/ignore-dev-edition-profile"; + enable = true; + text = ""; + }; + "qemu.conf" = { target = ".config/libvirt/qemu.conf"; enable = true; diff --git a/common/home/packages/avi.nix b/common/home/packages/avi.nix index ab7b6e4..b301e8d 100644 --- a/common/home/packages/avi.nix +++ b/common/home/packages/avi.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: let +{ pkgs, pkgs-stable, ... }: let unstable = with pkgs; [ # A/V/I (check stable) kdePackages.kdenlive @@ -10,39 +10,6 @@ libresprite vlc openutau - - (pkgs.wrapOBS { - plugins = with pkgs.obs-studio-plugins; [ - wlrobs - obs-backgroundremoval - obs-pipewire-audio-capture - obs-multi-rtmp - obs-mute-filter - input-overlay - obs-gstreamer - waveform - obs-3d-effect - looking-glass-obs - obs-vkcapture - obs-shaderfilter - obs-source-record - # obs-replay-source - obs-freeze-filter - obs-vintage-filter - obs-composite-blur - obs-command-source - obs-vertical-canvas - obs-move-transition - obs-transition-table - obs-3d-effect - # obs-tuna - obs-vaapi - # obs-nvfbc - obs-teleport - obs-webkitgtk - ]; - }) - obs-cli vital handbrake @@ -69,8 +36,6 @@ qsstv inkscape-with-extensions gimp-with-plugins - lmms - carla shortwave quodlibet-full # natron @@ -83,6 +48,44 @@ polyphone # mandelbulber ]; + + stable = with pkgs-stable; [ + (pkgs.wrapOBS { + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-backgroundremoval + obs-pipewire-audio-capture + obs-multi-rtmp + obs-mute-filter + input-overlay + obs-gstreamer + waveform + obs-3d-effect + looking-glass-obs + obs-vkcapture + obs-shaderfilter + obs-source-record + # obs-replay-source + obs-freeze-filter + obs-vintage-filter + obs-composite-blur + obs-command-source + # obs-vertical-canvas + obs-move-transition + obs-transition-table + obs-3d-effect + # obs-tuna + obs-vaapi + # obs-nvfbc + obs-teleport + obs-webkitgtk + ]; + }) + + + lmms + carla + ]; in { - packages = unstable; + packages = unstable ++ stable; } diff --git a/common/home/packages/dev.nix b/common/home/packages/dev.nix index ce49940..a31b94d 100644 --- a/common/home/packages/dev.nix +++ b/common/home/packages/dev.nix @@ -20,7 +20,6 @@ codeberg-pages zsh git - renpy godot_4 android-studio androidStudioPackages.canary @@ -57,7 +56,6 @@ crc qtcreator kdePackages.full - unityhub vrc-get alcom ]; @@ -78,6 +76,8 @@ # vagrant (lib.hiPrio zed-editor) + renpy + unityhub ]; in { packages = unstable ++ stable; diff --git a/common/home/packages/hacking.nix b/common/home/packages/hacking.nix index 1a396b6..ce9e0b5 100644 --- a/common/home/packages/hacking.nix +++ b/common/home/packages/hacking.nix @@ -25,26 +25,19 @@ synchrony ipgrep cewl - cewler john hashcat-utils hashcat metasploit exploitdb sqlmap - smbmap theharvester thc-hydra wpscan - kerbrute hcxdumptool wordlists - bloodhound - bloodhound-py aircrack-ng arp-scan - enum4linux - enum4linux-ng (ghidra.withExtensions (ext: with ext; [ ret-sync @@ -62,6 +55,16 @@ (pkgs.lib.hiPrio (cutter.withPlugins (ps: with ps; [ jsdec rz-ghidra sigdb ]))) ]; + stable = with pkgs-stable; [ + smbmap + kerbrute + bloodhound + bloodhound-py + enum4linux + enum4linux-ng + cewler + ]; + pwndbg-packages = let pkgs-pwndbg = pwndbg.packages."${pkgs.system}"; in with pkgs-pwndbg; [ @@ -69,5 +72,5 @@ pwndbg-lldb ]; in { - packages = unstable ++ pwndbg-packages; + packages = unstable ++ stable ++ pwndbg-packages; } diff --git a/common/home/packages/internet.nix b/common/home/packages/internet.nix index bafca98..6b31d0d 100644 --- a/common/home/packages/internet.nix +++ b/common/home/packages/internet.nix @@ -1,6 +1,6 @@ { pkgs, pkgs-stable, ... }: let unstable = with pkgs; [ - # firefox-devedition + firefox-devedition tor-browser-bundle-bin brave onioncircuits @@ -10,7 +10,7 @@ ungoogled-chromium megasync floorp - # vivaldi + vivaldi ]; stable = with pkgs-stable; [ diff --git a/common/home/packages/repair.nix b/common/home/packages/repair.nix index 5af879c..d3d92d1 100644 --- a/common/home/packages/repair.nix +++ b/common/home/packages/repair.nix @@ -3,7 +3,6 @@ # Repair gparted ventoy-full - idevicerestore man-pages glibcInfo (pkgs.lib.hiPrio stdmanpages) @@ -27,6 +26,10 @@ okteta rar ]; + + stable = with pkgs-stable; [ + idevicerestore + ]; in { - packages = unstable; + packages = unstable ++ stable; } diff --git a/common/nixos/default-config.nix b/common/nixos/default-config.nix index 7ba2c77..023a5e2 100644 --- a/common/nixos/default-config.nix +++ b/common/nixos/default-config.nix @@ -143,7 +143,7 @@ nix-ld = { enable = true; - libraries = import ../utils/nix-ld.nix { inherit pkgs lib; }; + libraries = import ../utils/nix-ld.nix { inherit pkgs pkgs-stable lib; }; }; command-not-found.enable = true; # This basically doesn't work imo. @@ -272,6 +272,7 @@ "gamemode" "video" config.services.kubo.group + "vboxusers" ]; }; }; diff --git a/common/utils/nix-ld.nix b/common/utils/nix-ld.nix index 3958e69..bbb1fd7 100644 --- a/common/utils/nix-ld.nix +++ b/common/utils/nix-ld.nix @@ -1,5 +1,5 @@ # Taken from the old NixOS 23.11 steam-run fhsenv. All credits to them for this. -{ pkgs, lib, ... }: with pkgs; [ +{ pkgs-stable, lib, ... }: with pkgs-stable; [ # Needed for operating system detection until # https://github.com/ValveSoftware/steam-for-linux/issues/5909 is resolved lsb-release diff --git a/flake.lock b/flake.lock index 2050011..0af0272 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1747867343, - "narHash": "sha256-FmEdhjLXtv92TQcFQHTetgVXkM4vBmD4nls8mvG9lMg=", + "lastModified": 1750597689, + "narHash": "sha256-3ComII0BkmdohISrshICQiAB6TU+VHHIRnWK0ckA0/s=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "2d87503f028c14f523f63ccb4a87d4b8d55c02d2", + "rev": "ec2ec4ec3f908ed9b125ea4afd52627bed60f183", "type": "github" }, "original": { @@ -23,18 +23,18 @@ }, "chaotic": { "inputs": { - "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1748736235, - "narHash": "sha256-/mt3riHxKDWkTXxE65pCkJpJ3DUtwRvSpwBu9yriu4o=", + "lastModified": 1751379121, + "narHash": "sha256-+zpgVvwkekHExQHXOoQ/mrxfULr9ejIMANTa7SGjNzg=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "8b8409130d8ca28aa8303f8a5d2286e9bfee118d", + "rev": "42cb2652781d132e2c458207d7290e6d1bc04622", "type": "github" }, "original": { @@ -51,11 +51,11 @@ ] }, "locked": { - "lastModified": 1748225455, - "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", + "lastModified": 1750903843, + "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=", "owner": "nix-community", "repo": "disko", - "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", + "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae", "type": "github" }, "original": { @@ -64,28 +64,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1748673500, - "narHash": "sha256-gILKNw2g7eGXt1aVJM0pUdeJQX0z6kXZNoiAJPjXHTo=", - "owner": "nix-community", - "repo": "fenix", - "rev": "4064670e8aeab5353001612efd17b19c7af7fde4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -176,11 +154,11 @@ ] }, "locked": { - "lastModified": 1748668774, - "narHash": "sha256-fYk/vk4ClmvHIgnGv/5GNRiDLtNCwXo9aLq36L/x+P4=", + "lastModified": 1751238753, + "narHash": "sha256-hJUPWfz/h+QgXKaKovPwFAdNBnALsvVMggAPgBB+Qvw=", "owner": "nix-community", "repo": "home-manager", - "rev": "60e4624302d956fe94d3f7d96a560d14d70591b9", + "rev": "cab8104e9236fab1eb9a702165454ffed353c20f", "type": "github" }, "original": { @@ -196,11 +174,11 @@ ] }, "locked": { - "lastModified": 1748737919, - "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", + "lastModified": 1751411489, + "narHash": "sha256-x+AJyQ5+4EPDU3NnQ1OPP/KuoG0C6UrbgptEW6PSLQ8=", "owner": "nix-community", "repo": "home-manager", - "rev": "5675a9686851d9626560052a032c4e14e533c1fa", + "rev": "e96a8a325cf23538a7f58b9335b4c4c0b393bacf", "type": "github" }, "original": { @@ -218,11 +196,11 @@ ] }, "locked": { - "lastModified": 1748683484, - "narHash": "sha256-RXiY6t9E9oLEtfdGChHk/OIPqxYg1tu8XLvbPnJlfi4=", + "lastModified": 1750403547, + "narHash": "sha256-XDDINMbHTtKQeSRpX5mwq20z23Wg/I/G4JUinA3V8Xg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "6f6bd4a27fb01c9dd623a157d769f34561407f47", + "rev": "52b86b86d925ec00c836ecc6d36f9c947bb15736", "type": "github" }, "original": { @@ -277,11 +255,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -293,11 +271,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1748421225, - "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", "type": "github" }, "original": { @@ -309,11 +287,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -325,11 +303,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -346,11 +324,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748782935, - "narHash": "sha256-wjo1BhHoBFzdtj92LrAonR1eJ8j5dt1YhnkPpqaam38=", + "lastModified": 1751423470, + "narHash": "sha256-ry+4FZtt7ZU6oo1B7BzD+WTVLH4Yh2MHcsPuC1olFEA=", "owner": "nix-community", "repo": "NUR", - "rev": "73385c8de1fac0066f513adc9a7e59d69f2327c2", + "rev": "fea869d1991122d940c718105cce6e96f6d08678", "type": "github" }, "original": { @@ -369,11 +347,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1748777329, - "narHash": "sha256-hE2j+cjYB0L10BK5/i9HGqqQ+2XkaNyLEkh6ugLgyVU=", + "lastModified": 1751367622, + "narHash": "sha256-zdsl/8KUZKyI5eeh6IMG8JskwpVkXZsn2lpeoRUnpH4=", "owner": "pwndbg", "repo": "pwndbg", - "rev": "5cff331bdef1c6135dd3b0ab709c61346be8ebc4", + "rev": "4ee3ce2e4f9564684730539a11f1ffbb9ae93710", "type": "github" }, "original": { @@ -444,38 +422,42 @@ "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", "pwndbg": "pwndbg", - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" } }, - "rust-analyzer-src": { - "flake": false, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1748636115, - "narHash": "sha256-SUkOBIqQmdZK2/CHxkVf/v36JDBlFQl2uckz9gbCLVo=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "987cd076e211a02542d5d82264474bb3325e8e7e", + "lastModified": 1751165203, + "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", "type": "github" }, "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", + "owner": "oxalica", + "repo": "rust-overlay", "type": "github" } }, - "rust-overlay": { + "rust-overlay_2": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1748746145, - "narHash": "sha256-bwkCAK9pOyI2Ww4Q4oO1Ynv7O9aZPrsIAMMASmhVGp4=", + "lastModified": 1751423951, + "narHash": "sha256-AowKhJGplXRkAngSvb+32598DTiI6LOzhAnzgvbCtYM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "12a0d94a2f2b06714f747ab97b2fa546f46b460c", + "rev": "1684ed5b15859b655caf41b467d046e29a994d04", "type": "github" }, "original": {