diff --git a/common/derivations/distro-grub-themes.nix b/common/derivations/distro-grub-themes.nix deleted file mode 100644 index 1893a37..0000000 --- a/common/derivations/distro-grub-themes.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs }: pkgs.stdenv.mkDerivation { - pname = "distro-grub-themes"; - version = "3.1"; - - src = pkgs.fetchFromGitHub { - owner = "AdisonCavani"; - repo = "distro-grub-themes"; - rev = "v3.1"; - hash = "sha256-ZcoGbbOMDDwjLhsvs77C7G7vINQnprdfI37a9ccrmPs="; - }; - - installPhase = "cp -r customize/nixos $out"; -} \ No newline at end of file diff --git a/common/home/dotfiles/.zshrc b/common/home/dotfiles/.zshrc index 7d5e7ad..7ff158e 100644 --- a/common/home/dotfiles/.zshrc +++ b/common/home/dotfiles/.zshrc @@ -74,7 +74,7 @@ if command -v wget &> /dev/null; then fi if command -v nix-store &> /dev/null; then - alias nix-clean="nix-store --gc" + alias nix-clean="sudo nix-collect-garbage -d; nix-store --gc" fi if [ "$SSH_CLIENT" ]; then diff --git a/common/home/home.nix b/common/home/home.nix index ccb0ad9..c99a7e4 100755 --- a/common/home/home.nix +++ b/common/home/home.nix @@ -36,7 +36,7 @@ defaultEditor = true; vimAlias = true; viAlias = true; - extraLuaConfig = builtins.readFile ./dotfiles/init.lua; + initLua = builtins.readFile ./dotfiles/init.lua; plugins = with pkgs.vimPlugins; [ catppuccin-nvim diff --git a/common/home/packages/alien.nix b/common/home/packages/alien.nix index 6d84523..57927bf 100644 --- a/common/home/packages/alien.nix +++ b/common/home/packages/alien.nix @@ -9,7 +9,7 @@ gearlever simh kdePackages.kdialog - wineWowPackages.waylandFull + wineWow64Packages.waylandFull winetricks protontricks basiliskii diff --git a/common/home/packages/dev.nix b/common/home/packages/dev.nix index d50b1a3..62e401c 100644 --- a/common/home/packages/dev.nix +++ b/common/home/packages/dev.nix @@ -35,7 +35,6 @@ arduino arduino-ide screen - minipro pandoc qemu wimlib diff --git a/common/home/packages/games.nix b/common/home/packages/games.nix index ee0a479..b030934 100644 --- a/common/home/packages/games.nix +++ b/common/home/packages/games.nix @@ -1,11 +1,17 @@ -{ pkgs, pkgs-stable, nixpkgs-xr, ... }: let +{ + pkgs, + pkgs-stable, + nixpkgs-xr, + ... +}: +let unstable = with pkgs; [ # Games (see stable) - itch + itch prismlauncher steamcmd steam-run - ryubing + ryubing dolphin-emu rpcs3 ps3-disc-dumper @@ -14,12 +20,11 @@ xemu the-powder-toy gzdoom - qzdl + qzdl r2modman - # gale ruffle - steamtinkerlaunch - sidequest + steamtinkerlaunch + sidequest (lutris.override { extraLibraries = pkgs: [ @@ -28,7 +33,7 @@ ]; extraPkgs = pkgs: [ - wineWowPackages.waylandFull + wineWow64Packages.waylandFull ]; }) @@ -41,10 +46,8 @@ superTuxKart # gargoyle # colobot - rrootage - # lime3ds - # duckstation - shadps4 + azahar + shadps4 ]; stable = with pkgs-stable; [ @@ -53,13 +56,19 @@ openrct2 # itchiodl openttd + duckstation + rrootage ]; - xr = let - pkgs-xr = nixpkgs-xr.packages."${pkgs.stdenv.hostPlatform.system}"; - in with pkgs-xr; [ - wayvr-dashboard - ]; -in { + xr = + let + pkgs-xr = nixpkgs-xr.packages."${pkgs.stdenv.hostPlatform.system}"; + in + with pkgs-xr; + [ + wayvr + ]; +in +{ packages = unstable ++ stable ++ xr; } diff --git a/common/home/packages/hacking.nix b/common/home/packages/hacking.nix index 6550e08..3116b67 100644 --- a/common/home/packages/hacking.nix +++ b/common/home/packages/hacking.nix @@ -9,7 +9,6 @@ veracrypt gephi xxd - hexcurse sleuthkit exiftool samba4 @@ -26,6 +25,7 @@ john hashcat-utils hashcat + hashid metasploit exploitdb sqlmap @@ -43,6 +43,7 @@ stable = with pkgs-stable; [ (lib.hiPrio autopsy) + hexcurse smbmap kerbrute bloodhound diff --git a/common/home/packages/office.nix b/common/home/packages/office.nix index 51d6d50..c5cb431 100644 --- a/common/home/packages/office.nix +++ b/common/home/packages/office.nix @@ -34,8 +34,8 @@ gnome-obfuscate curtail xournalpp - wlx-overlay-s logseq + lmstudio # Translation # whisper-ctranslate2 diff --git a/common/home/packages/repair.nix b/common/home/packages/repair.nix index 3373c7d..d9b836c 100644 --- a/common/home/packages/repair.nix +++ b/common/home/packages/repair.nix @@ -17,7 +17,6 @@ kdiskmark impression czkawka-full - minipro minicom kitty kitty-img @@ -29,6 +28,7 @@ stable = with pkgs-stable; [ idevicerestore rar + minipro ]; in { packages = unstable ++ stable; diff --git a/common/home/packages/toys.nix b/common/home/packages/toys.nix index 67f5c4d..ae0201d 100644 --- a/common/home/packages/toys.nix +++ b/common/home/packages/toys.nix @@ -21,6 +21,8 @@ kdePackages.kdeconnect-kde python313Packages.meshtastic rymdport + magic-wormhole + peco ]; in { packages = unstable; diff --git a/common/nixos/default-config.nix b/common/nixos/default-config.nix index fed955f..3b68723 100644 --- a/common/nixos/default-config.nix +++ b/common/nixos/default-config.nix @@ -1,21 +1,38 @@ -{ pkgs, pkgs-stable, lib, config, rust-overlay, nixGL, hostConfig, ... }: { +{ + pkgs, + pkgs-stable, + lib, + config, + rust-overlay, + nixGL, + hostConfig, + distro-grub-themes, + ... +}: +let + system = "x86_64-linux"; +in +{ imports = [ ../home ]; # Enable flake support, since that's "experimental" (despite most new installs using flakes anyways). nix = { - settings = { - experimental-features = [ "nix-command" "flakes" ]; - trusted-users = [ "${hostConfig.username}" ]; - }; - - gc = { - automatic = true; - persistent = true; - dates = "weekly"; - }; - }; + settings = { + experimental-features = [ + "nix-command" + "flakes" + ]; + trusted-users = [ "${hostConfig.username}" ]; + }; + + gc = { + automatic = true; + persistent = true; + dates = "weekly"; + }; + }; nixpkgs = { config = import ../utils/nix-config.nix; @@ -23,7 +40,8 @@ overlays = [ nixGL.overlays.default rust-overlay.overlays.default - ] ++ import ../overlays; + ] + ++ import ../overlays; }; # nix.settings.auto-optimise-store = true; # Slow AF @@ -40,7 +58,7 @@ boot = { loader.grub = { configurationLimit = 15; - theme = import ../derivations/distro-grub-themes.nix { inherit pkgs; }; + theme = distro-grub-themes.packages.${system}.nixos-grub-theme; }; kernelPackages = pkgs.linuxPackages_zen; @@ -52,9 +70,9 @@ # gasket # shufflecake v4l2loopback - systemtap - vendor-reset - # rtl8852au + systemtap + vendor-reset + # rtl8852au ]; kernelParams = [ @@ -81,22 +99,42 @@ networking = { networkmanager.enable = true; # wireless.enable = false; - - hosts = { - "192.168.0.219" = [ "server.idm.reboot-codes.com" ]; - }; - - firewall.interfaces = { - "tailscale0" = { - allowedUDPPortRanges = [ { from = 0; to = 65535; } ]; - allowedTCPPortRanges = [ { from = 0; to = 65535; } ]; - }; - - "ztt6jt6i65" = { - allowedUDPPortRanges = [ { from = 0; to = 65535; } ]; - allowedTCPPortRanges = [ { from = 0; to = 65535; } ]; - }; - }; + + hosts = { + "192.168.0.219" = [ "server.idm.reboot-codes.com" ]; + }; + + firewall.interfaces = { + "tailscale0" = { + allowedUDPPortRanges = [ + { + from = 0; + to = 65535; + } + ]; + allowedTCPPortRanges = [ + { + from = 0; + to = 65535; + } + ]; + }; + + "ztt6jt6i65" = { + allowedUDPPortRanges = [ + { + from = 0; + to = 65535; + } + ]; + allowedTCPPortRanges = [ + { + from = 0; + to = 65535; + } + ]; + }; + }; }; security = { @@ -104,7 +142,7 @@ polkit.enable = true; }; - hardware.flipperzero.enable = true; + hardware.flipperzero.enable = true; programs = { gnupg.agent = { @@ -123,7 +161,7 @@ nix-update = "CUSTOMZSHCONSOLEPREVWORKINGDIR=$(pwd) cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .# --impure -L --show-trace; cd $CUSTOMZSHCONSOLEPREVWORKINGDIR"; nix-rebuild = "sudo nixos-rebuild switch --flake /etc/nixos/# --impure -L --show-trace"; nix-config = "sudo nvim /etc/nixos/configuration.nix"; - nix-clean = "nix-store --gc"; + nix-clean = "sudo nix-collect-garbage -d; nix-store --gc"; start-default-virtd-network = "sudo virsh net-start default"; clear-qmlcache = "find $${XDG_CACHE_HOME:-$HOME/.cache}/**/qmlcache -type f -delete"; ll = "eza -l --icons"; @@ -144,13 +182,13 @@ }; }; - java = { + java = { enable = true; binfmt = true; }; - nix-ld = { - enable = true; + nix-ld = { + enable = true; libraries = import ../utils/nix-ld.nix { inherit pkgs pkgs-stable lib; }; }; @@ -160,19 +198,19 @@ services = { openssh.enable = true; atd.enable = true; - envfs.enable = true; + envfs.enable = true; tailscale = { enable = true; useRoutingFeatures = "client"; }; - cron.enable = true; + cron.enable = true; - fcron = { - # enable = true; - allow = ["reboot"]; - }; + fcron = { + # enable = true; + allow = [ "reboot" ]; + }; tor = { enable = true; @@ -189,19 +227,19 @@ }; }; - avahi = { - enable = true; - openFirewall = true; - nssmdns4 = true; - nssmdns6 = true; + avahi = { + enable = true; + openFirewall = true; + nssmdns4 = true; + nssmdns6 = true; - publish = { - enable = true; - domain = true; - addresses = true; - workstation = true; - }; - }; + publish = { + enable = true; + domain = true; + addresses = true; + workstation = true; + }; + }; flatpak = { remotes = [ @@ -230,8 +268,8 @@ "/home/reboot/.config/gtk-2.0/:ro" "/home/reboot/.config/gtk-3.0/:ro" "/home/reboot/.config/gtk-4.0/:ro" - "/home/reboot/.config/gtkrc:ro" - "/home/reboot/.config/gtkrc-2.0:ro" + "/home/reboot/.config/gtkrc:ro" + "/home/reboot/.config/gtkrc-2.0:ro" ]; # sockets = ["wayland" "!x11" "fallback-x11"]; @@ -243,7 +281,7 @@ }; "org.signal.Signal".Environment = { - ELECTRON_OZONE_PLATFORM_HINT="auto"; + ELECTRON_OZONE_PLATFORM_HINT = "auto"; }; }; @@ -272,15 +310,15 @@ "adbuser" "docker" "libvirtd" - "libvirt" + "libvirt" "kvm" "adbusers" "xrdp" "gamemode" "video" config.services.kubo.group - "vboxusers" - "dialout" + "vboxusers" + "dialout" ]; }; }; @@ -288,17 +326,20 @@ fonts.fontDir.enable = true; environment = { - sessionVariables = { - # TL;DR: all of our QT shit uses wayland. or... should, anyways, so this is global, and makes theming work. - QT_QPA_PLATFORM = "wayland"; - }; + sessionVariables = { + # TL;DR: all of our QT shit uses wayland. or... should, anyways, so this is global, and makes theming work. + QT_QPA_PLATFORM = "wayland"; + }; # Install Soundfonts TODO: only Fluid copies over... might wanna fix that soon. etc = { - "/soundfonts/FluidR3_GM2-2.sf2".source = "${pkgs.soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2"; + "/soundfonts/FluidR3_GM2-2.sf2".source = + "${pkgs.soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2"; "/share/soundfonts/arachno.sf2".source = "${pkgs.soundfont-arachno}/share/soundfonts/arachno.sf2"; - "/share/soundfonts/GeneralUser-GS.sf2".source = "${pkgs.soundfont-generaluser}/share/soundfonts/GeneralUser-GS.sf2"; - "/share/soundfonts/YDP-GrandPiano.sf2".source = "${pkgs.soundfont-ydp-grand}/share/soundfonts/YDP-GrandPiano.sf2"; + "/share/soundfonts/GeneralUser-GS.sf2".source = + "${pkgs.soundfont-generaluser}/share/soundfonts/GeneralUser-GS.sf2"; + "/share/soundfonts/YDP-GrandPiano.sf2".source = + "${pkgs.soundfont-ydp-grand}/share/soundfonts/YDP-GrandPiano.sf2"; }; shellInit = '' diff --git a/common/nixos/default.nix b/common/nixos/default.nix index eca4844..a8344be 100644 --- a/common/nixos/default.nix +++ b/common/nixos/default.nix @@ -1,3 +1,4 @@ -{ hostConfig, pkgs, pkgs-stable, ... }: { +{ ... }: +{ imports = [ ./default-config.nix ]; -} \ No newline at end of file +} diff --git a/common/utils/nix-config.nix b/common/utils/nix-config.nix index 5290a54..1ce76c9 100644 --- a/common/utils/nix-config.nix +++ b/common/utils/nix-config.nix @@ -9,7 +9,7 @@ "olm-3.2.16" "dotnet-sdk-7.0.120" "SDL_ttf-2.0.11" - "ventoy-1.1.07" + "ventoy-1.1.10" "gradle-7.6.6" ]; diff --git a/common/utils/nix-ld.nix b/common/utils/nix-ld.nix index ff4bd43..af2fbc5 100644 --- a/common/utils/nix-ld.nix +++ b/common/utils/nix-ld.nix @@ -1,6 +1,7 @@ # Taken from the old NixOS 23.11 steam-run fhsenv. All credits to them for this. { pkgs-stable, lib, ... }: with pkgs-stable; [ llvmPackages_16.libcxx + stdenv.cc.cc.lib # (python313.withPackages (ps: [ ps.rpyc ps.tkinter ])) # Needed for operating system detection until diff --git a/flake.lock b/flake.lock index 4feffda..2d5afe8 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1766424259, - "narHash": "sha256-ikKwd1/8rLIz8I+B8kwLaNwW5Hh75bkgGRalC+gEpw0=", + "lastModified": 1771170334, + "narHash": "sha256-tCgoCWORfNHaRXTh2QS44LwxlV8q28jVvjN5ioMicv8=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "37c289121c7ed44f723c326b6c079cd8aaeb35cf", + "rev": "821b4f92c2c0981ea5b571b03403df87d2b2e2ae", "type": "github" }, "original": { @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1766150702, - "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", + "lastModified": 1771469470, + "narHash": "sha256-GnqdqhrguKNN3HtVfl6z+zbV9R9jhHFm3Z8nu7R6ml0=", "owner": "nix-community", "repo": "disko", - "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", + "rev": "4707eec8d1d2db5182ea06ed48c820a86a42dc13", "type": "github" }, "original": { @@ -65,14 +65,33 @@ "type": "github" } }, + "distro-grub-themes": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1734806114, + "narHash": "sha256-FWkDtoLMTTk2Lz4d4LkFjtV/xYyIlpwZlX5Np1QhXls=", + "owner": "AdisonCavani", + "repo": "distro-grub-themes", + "rev": "ebbd17419890059e371a6f2dbf2a7e76190327d4", + "type": "github" + }, + "original": { + "owner": "AdisonCavani", + "repo": "distro-grub-themes", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { @@ -88,7 +107,7 @@ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -149,6 +168,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": [ "nixpkgs-xr", @@ -171,11 +208,11 @@ }, "flatpaks": { "locked": { - "lastModified": 1739444422, - "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", + "lastModified": 1767983141, + "narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", + "rev": "440818969ac2cbd77bfe025e884d0aa528991374", "type": "github" }, "original": { @@ -213,11 +250,11 @@ ] }, "locked": { - "lastModified": 1766963849, - "narHash": "sha256-9a1PTYJByzRUurF8Vb5kNXcO5HEBj9uGQMS7JoLUGTI=", + "lastModified": 1771531206, + "narHash": "sha256-1R3Wx6KUkMb4x4E5UOhW9p6rqiexzSGGWxZqSHqW5n0=", "owner": "nix-community", "repo": "home-manager", - "rev": "87785ddbc70fbd379cf3ee0d1ebd778957172248", + "rev": "91be7cce763fa4022c7cf025a71b0c366d1b6e77", "type": "github" }, "original": { @@ -278,11 +315,11 @@ ] }, "locked": { - "lastModified": 1765267181, - "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", + "lastModified": 1771130777, + "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", + "rev": "efec7aaad8d43f8e5194df46a007456093c40f88", "type": "github" }, "original": { @@ -293,7 +330,7 @@ }, "nixGL": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] @@ -347,18 +384,18 @@ "nixpkgs-xr": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_5", "nvfetcher": "nvfetcher", - "systems": "systems_2", + "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1766538331, - "narHash": "sha256-biwvZsCGC4vCXS6rzs3tUkELqqEXPko0E3R9IhYKavE=", + "lastModified": 1771553299, + "narHash": "sha256-5QDTPX+CsW+vOjouBO+oCK1NJyRV2u1g4mgjbaUnhZU=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "9e8efcd2c4ea906772dea99204a9819284a29b81", + "rev": "71505d3a9ba76e68da9db4dfd443f18d8f499146", "type": "github" }, "original": { @@ -385,15 +422,15 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", - "owner": "NixOS", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -401,11 +438,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -417,11 +454,27 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0182a361324364ae3f436a63005877674cf45efb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -434,14 +487,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1766965629, - "narHash": "sha256-3WPHmtOp7/PgSVilz2AK/GSycPZTcOUsLcZvCAGdaRE=", + "lastModified": 1771603594, + "narHash": "sha256-PXorFKRWA18beQXKgLnD/DVLa2qmT+DCShPnooC1mx0=", "owner": "nix-community", "repo": "NUR", - "rev": "550229be6f173ebacbb7368108878349b780c778", + "rev": "ac7e1d2193a0edf5f294d09e0d3c51006a731785", "type": "github" }, "original": { @@ -466,16 +519,17 @@ ] }, "locked": { - "lastModified": 1765698311, - "narHash": "sha256-78sPqekEDJiol2YD3Hx2zHu5E4AtrbNrUKi0032HMHo=", - "owner": "berberman", + "lastModified": 1766178214, + "narHash": "sha256-tKDXreDwrRkdjvfot5fr1++ed6oOq3+/hW/Dj8WfTgs=", + "owner": "Red-M", "repo": "nvfetcher", - "rev": "dbae9626c46b93d9fd6b85c8b292939ae569c4fc", + "rev": "a84b3ce67f1d7acd85b3aa2b9967ab91ed6e7a71", "type": "github" }, "original": { - "owner": "berberman", + "owner": "Red-M", "repo": "nvfetcher", + "rev": "a84b3ce67f1d7acd85b3aa2b9967ab91ed6e7a71", "type": "github" } }, @@ -489,11 +543,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1766861643, - "narHash": "sha256-Zl5D3qws8aF+djyv1CByEcvGuU9jrq0ypCGM2iNEplY=", + "lastModified": 1771451240, + "narHash": "sha256-qA8rm0zxrFBVbleYEOJziggyJtZEu1DFeAo3OAkbmB4=", "owner": "pwndbg", "repo": "pwndbg", - "rev": "dca241bf82d70392e4ceb783d1af9cef20081cc2", + "rev": "5eb91f443cefb75fae9567aa23931670dc2277a9", "type": "github" }, "original": { @@ -518,11 +572,11 @@ ] }, "locked": { - "lastModified": 1757296493, - "narHash": "sha256-6nzSZl28IwH2Vx8YSmd3t6TREHpDbKlDPK+dq1LKIZQ=", + "lastModified": 1763662255, + "narHash": "sha256-4bocaOyLa3AfiS8KrWjZQYu+IAta05u3gYZzZ6zXbT0=", "owner": "pyproject-nix", "repo": "build-system-pkgs", - "rev": "5b8e37fe0077db5c1df3a5ee90a651345f085d38", + "rev": "042904167604c681a090c07eb6967b4dd4dae88c", "type": "github" }, "original": { @@ -539,11 +593,11 @@ ] }, "locked": { - "lastModified": 1757246327, - "narHash": "sha256-6pNlGhwOIMfhe/RLjHdpXveKS4FyLHvlGe+KtjDild4=", + "lastModified": 1769936401, + "narHash": "sha256-kwCOegKLZJM9v/e/7cqwg1p/YjjTAukKPqmxKnAZRgA=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "8d77f342d66ad1601cdb9d97e9388b69f64d4c8e", + "rev": "b0d513eeeebed6d45b4f2e874f9afba2021f7812", "type": "github" }, "original": { @@ -557,11 +611,12 @@ "aagl": "aagl", "chaotic": "chaotic", "disko": "disko", + "distro-grub-themes": "distro-grub-themes", "flatpaks": "flatpaks", "home-manager": "home-manager_2", "nix-index-database": "nix-index-database", "nixGL": "nixGL", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-xr": "nixpkgs-xr", "nur": "nur", @@ -574,11 +629,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764470739, - "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=", + "lastModified": 1770952264, + "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a", + "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188", "type": "github" }, "original": { @@ -615,11 +670,11 @@ ] }, "locked": { - "lastModified": 1766890375, - "narHash": "sha256-0Zi7ChAtjq/efwQYmp7kOJPcSt6ya9ynSUe6ppgZhsQ=", + "lastModified": 1771556776, + "narHash": "sha256-zKprqMQDl3xVfhSSYvgru1IGXjFdxryWk+KqK0I20Xk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "91e1f7a0017065360f447622d11b7ce6ed04772f", + "rev": "8b3f46b8a6d17ab46e533a5e3d5b1cc2ff228860", "type": "github" }, "original": { @@ -644,6 +699,21 @@ } }, "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -666,11 +736,11 @@ ] }, "locked": { - "lastModified": 1766000401, - "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", + "lastModified": 1770228511, + "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", + "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", "type": "github" }, "original": { @@ -691,11 +761,11 @@ ] }, "locked": { - "lastModified": 1756973152, - "narHash": "sha256-9JcKAA7T9J98LWdcxbXvmf+amQG3ZErxqQnBjEJI04I=", + "lastModified": 1769957392, + "narHash": "sha256-6PkqwwYf5K2CHi2V+faI/9pqjfz/HxUkI/MVid6hlOY=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "64298e806f4a5f63a51c625edc100348138491aa", + "rev": "d18bc50ae1c3d4be9c41c2d94ea765524400af75", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a9b5ea5..b41cb9b 100755 --- a/flake.nix +++ b/flake.nix @@ -6,13 +6,13 @@ extra-substituters = [ "https://nix-community.cachix.org" "https://pwndbg.cachix.org" - "http://custom-odin-nixos.tail90c5.ts.net:5000" + "http://custom-odin-nixos.tail90c5.ts.net:5000" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "pwndbg.cachix.org-1:HhtIpP7j73SnuzLgobqqa8LVTng5Qi36sQtNt79cD3k=" - "custom-odin-nixos.tail90c5.ts.net:4HayvfsG++iTVCjRk4OtrrKwvLJhwFpKE84RrKOCej4=" + "custom-odin-nixos.tail90c5.ts.net:4HayvfsG++iTVCjRk4OtrrKwvLJhwFpKE84RrKOCej4=" ]; }; @@ -32,7 +32,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nur.url = github:nix-community/NUR; + nur.url = "github:nix-community/NUR"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; aagl = { @@ -55,22 +55,70 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nix-index-database = { - url = "github:nix-community/nix-index-database"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + nix-index-database = { + url = "github:nix-community/nix-index-database"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + nixpkgs-xr.url = "github:nix-community/nixpkgs-xr"; - nixpkgs-xr.url = "github:nix-community/nixpkgs-xr"; + distro-grub-themes.url = "github:AdisonCavani/distro-grub-themes"; }; - outputs = { self, nixpkgs, nixpkgs-stable, home-manager, flatpaks, rust-overlay, nur, chaotic, aagl, nixGL, disko, pwndbg, nix-index-database, nixpkgs-xr }: { - nixosConfigurations = import ./nixos { - inherit nixpkgs nixpkgs-stable home-manager flatpaks rust-overlay nur chaotic aagl nixGL disko pwndbg nix-index-database nixpkgs-xr; - }; + outputs = + { + self, + nixpkgs, + nixpkgs-stable, + home-manager, + flatpaks, + rust-overlay, + nur, + chaotic, + aagl, + nixGL, + disko, + pwndbg, + nix-index-database, + nixpkgs-xr, + distro-grub-themes, + }: + { + nixosConfigurations = import ./nixos { + inherit + nixpkgs + nixpkgs-stable + home-manager + flatpaks + rust-overlay + nur + chaotic + aagl + nixGL + disko + pwndbg + nix-index-database + nixpkgs-xr + distro-grub-themes + ; + }; - # For *nix systems that are not NixOS or macOS - homeConfigurations = import ./home-manager.nix { - inherit nixpkgs nixpkgs-stable home-manager flatpaks rust-overlay nur chaotic aagl nixGL pwndbg nix-index-database nixpkgs-xr; + # For *nix systems that are not NixOS or macOS + homeConfigurations = import ./home-manager.nix { + inherit + nixpkgs + nixpkgs-stable + home-manager + flatpaks + rust-overlay + nur + chaotic + aagl + nixGL + pwndbg + nix-index-database + nixpkgs-xr + ; + }; }; - }; } diff --git a/nixos/custom-odin-nixos/configuration.nix b/nixos/custom-odin-nixos/configuration.nix index 9c852a2..b92c524 100755 --- a/nixos/custom-odin-nixos/configuration.nix +++ b/nixos/custom-odin-nixos/configuration.nix @@ -306,7 +306,6 @@ in { defaultEditor = true; }; - adb.enable = true; virt-manager.enable = true; nbd.enable = true; xwayland.enable = true; @@ -415,7 +414,7 @@ in { ]; extraRules = '' - SUBSYSTEM=="kvmfr", OWNER="reboot", GROUP="kvm", MODE="0660" + SUBSYSTEM=="kvmfr", MODE="0660", GROUP="kvm" SUBSYSTEM=="usb", MODE="0660", GROUP="wheel" ''; }; diff --git a/nixos/default.nix b/nixos/default.nix index 4f7852b..9df97d4 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -12,6 +12,7 @@ pwndbg, nix-index-database, nixpkgs-xr, + distro-grub-themes, ... }: let @@ -68,6 +69,7 @@ in pwndbg nix-index-database nixpkgs-xr + distro-grub-themes ; };