diff --git a/.direnv/flake-profile b/.direnv/flake-profile index 1c824f2..e6d65ca 120000 --- a/.direnv/flake-profile +++ b/.direnv/flake-profile @@ -1 +1 @@ -flake-profile-20-link \ No newline at end of file +flake-profile-24-link \ No newline at end of file diff --git a/.direnv/flake-profile-20-link b/.direnv/flake-profile-20-link deleted file mode 120000 index 066f822..0000000 --- a/.direnv/flake-profile-20-link +++ /dev/null @@ -1 +0,0 @@ -/nix/store/dp0bq0r5xrrlq3k1wa0l643cm8yb2h45-nix-shell-env \ No newline at end of file diff --git a/.direnv/flake-profile-24-link b/.direnv/flake-profile-24-link new file mode 120000 index 0000000..4cecc78 --- /dev/null +++ b/.direnv/flake-profile-24-link @@ -0,0 +1 @@ +/nix/store/fkr15kl8apr8hla4a50d0kn6b4z5c5wp-nix-shell-env \ No newline at end of file diff --git a/common/home/home.nix b/common/home/home.nix index f86e2b9..41d51e0 100755 --- a/common/home/home.nix +++ b/common/home/home.nix @@ -52,7 +52,7 @@ catppuccin-nvim { plugin = lightline-vim; - type = "viml"; + type = "viml"; # TODO: Configure lightline. config = '' @@ -210,6 +210,11 @@ alacritty = import ./programs/alacritty.nix; + vicinae = { + enable = true; + enableFirefoxIntegration = true; + }; + hyprlock = { enable = true; diff --git a/common/home/packages/comms.nix b/common/home/packages/comms.nix index 05c7740..5b9fee0 100644 --- a/common/home/packages/comms.nix +++ b/common/home/packages/comms.nix @@ -1,13 +1,13 @@ -{ pkgs, pkgs-stable, ... }: let +{ pkgs, pkgs-stable, ... }: +let unstable = with pkgs; [ # Comms zoom-us - session-desktop telegram-desktop thunderbird element-desktop - telegram-desktop - kotatogram-desktop + telegram-desktop + kotatogram-desktop discord signal-cli signalbackup-tools @@ -19,6 +19,7 @@ mumble discover-overlay ]; -in { +in +{ packages = unstable; } diff --git a/common/home/packages/crypto.nix b/common/home/packages/crypto.nix index f010bc4..e2454d3 100644 --- a/common/home/packages/crypto.nix +++ b/common/home/packages/crypto.nix @@ -1,18 +1,19 @@ -{ pkgs, pkgs-stable, ... }: let +{ pkgs, pkgs-stable, ... }: +let unstable = with pkgs; [ # Crypto (see stable) monero-gui monero-cli xmrig-mo - xmrig-proxy - bisq2 + xmrig-proxy + bisq2 ]; stable = with pkgs-stable; [ # Crypto electrum - electrum-ltc ]; -in { +in +{ packages = unstable ++ stable; } diff --git a/common/home/packages/dev.nix b/common/home/packages/dev.nix index 14e9f4a..cea1dcf 100644 --- a/common/home/packages/dev.nix +++ b/common/home/packages/dev.nix @@ -21,14 +21,13 @@ let act codeberg-cli codeberg-pages - lazygit + lazygit zsh git godot_4 android-studio androidStudioPackages.canary android-tools - pipx (python313.withPackages (ps: [ ps.rpyc ps.tkinter @@ -67,13 +66,13 @@ let stable = with pkgs-stable; [ # Dev (symlinkJoin { - name = "idea-community"; - paths = [ jetbrains.idea-community ]; + name = "idea"; + paths = [ jetbrains.idea ]; buildInputs = [ makeWrapper ]; # stuff to make MC modding work. postBuild = '' - wrapProgram $out/bin/idea-community \ + wrapProgram $out/bin/idea \ --prefix LD_LIBRARY_PATH : "${ lib.makeLibraryPath [ libpulseaudio diff --git a/common/home/packages/games.nix b/common/home/packages/games.nix index 13d1704..deaf1d8 100644 --- a/common/home/packages/games.nix +++ b/common/home/packages/games.nix @@ -43,9 +43,9 @@ let openrct2 # itchiodl openttd - duckstation rrootage rpcs3 + pcsx2 (lutris.override { extraLibraries = pkgs: [ diff --git a/common/home/packages/hacking.nix b/common/home/packages/hacking.nix index 8676ee3..75fb7c6 100644 --- a/common/home/packages/hacking.nix +++ b/common/home/packages/hacking.nix @@ -1,4 +1,10 @@ -{ pkgs, pkgs-stable, pwndbg, ... }: let +{ + pkgs, + pkgs-stable, + pwndbg, + ... +}: +let unstable = with pkgs; [ # Hacking (see stable) wireshark @@ -11,67 +17,87 @@ xxd exiftool samba4 - smbnetfs + gvfs # Replaces smbnetfs gdb ltrace pe-bear flare-floss # garble - synchrony ipgrep - cewl - john - hashcat-utils - hashcat - hashid - metasploit - exploitdb - sqlmap - theharvester - thc-hydra - wpscan - hcxdumptool - wordlists - aircrack-ng - arp-scan - - (rizin.withPlugins (ps: with ps; [ jsdec rz-ghidra sigdb ])) + cewl + john + hashcat-utils + hashcat + hashid + metasploit + exploitdb + sqlmap + theharvester + thc-hydra + wpscan + hcxdumptool + aircrack-ng + arp-scan + + (rizin.withPlugins ( + ps: with ps; [ + jsdec + rz-ghidra + sigdb + ] + )) ]; - stable = with pkgs-stable; [ - (pkgs.lib.hiPrio (cutter.withPlugins (ps: with ps; [ jsdec rz-ghidra sigdb ]))) - hexcurse - smbmap - kerbrute - bloodhound - bloodhound-py - enum4linux - enum4linux-ng - cewler + stable = with pkgs-stable; [ + (pkgs.lib.hiPrio ( + cutter.withPlugins ( + ps: with ps; [ + jsdec + rz-ghidra + sigdb + ] + ) + )) + hexcurse + smbmap + kerbrute + bloodhound + bloodhound-py + enum4linux + enum4linux-ng cryptomator - binwalk - - (ghidra.withExtensions (ext: with ext; [ - ret-sync - findcrypt - lightkeeper - sleighdevtools - machinelearning - gnudisassembler - ghidraninja-ghidra-scripts - ghidra-delinker-extension - ghidra-golanganalyzerextension - ])) + binwalk + synchrony + wordlists + # cewler - jadx - ]; + (ghidra.withExtensions ( + ext: with ext; [ + ret-sync + findcrypt + lightkeeper + sleighdevtools + machinelearning + gnudisassembler + ghidraninja-ghidra-scripts + ghidra-delinker-extension + ghidra-golanganalyzerextension + ] + )) - pwndbg-packages = let - pkgs-pwndbg = pwndbg.packages."${pkgs.stdenv.hostPlatform.system}"; - in with pkgs-pwndbg; [ - default - pwndbg-lldb + jadx ]; -in { + + pwndbg-packages = + let + pkgs-pwndbg = pwndbg.packages."${pkgs.stdenv.hostPlatform.system}"; + in + with pkgs-pwndbg; + [ + default + pwndbg-lldb + ]; +in +{ packages = unstable ++ stable ++ pwndbg-packages; } diff --git a/common/home/packages/internet.nix b/common/home/packages/internet.nix index b46b51c..9f0464d 100644 --- a/common/home/packages/internet.nix +++ b/common/home/packages/internet.nix @@ -1,8 +1,9 @@ -{ pkgs, pkgs-stable, ... }: let +{ pkgs, pkgs-stable, ... }: +let unstable = with pkgs; [ firefox-devedition tor-browser - brave + brave onioncircuits # lokinet persepolis @@ -10,14 +11,14 @@ ungoogled-chromium megasync floorp-bin - vivaldi - librewolf - ladybird + librewolf + ladybird ]; stable = with pkgs-stable; [ onionshare-gui ]; -in { +in +{ packages = unstable ++ stable; } diff --git a/common/home/packages/media-acquisistion.nix b/common/home/packages/media-acquisistion.nix index a5d5c2b..9d507b0 100644 --- a/common/home/packages/media-acquisistion.nix +++ b/common/home/packages/media-acquisistion.nix @@ -1,4 +1,5 @@ -{ pkgs, pkgs-stable, ... }: let +{ pkgs, pkgs-stable, ... }: +let unstable = with pkgs; [ # Media Acquisition ani-cli @@ -14,7 +15,9 @@ guymager vcdimager gImageReader + yt-dlp ]; -in { +in +{ packages = unstable; } diff --git a/common/home/packages/office.nix b/common/home/packages/office.nix index e63e331..cf99f56 100644 --- a/common/home/packages/office.nix +++ b/common/home/packages/office.nix @@ -4,8 +4,8 @@ let # Office (see stable) keepassxc libreoffice-qt - onlyoffice-desktopeditors - naps2 + onlyoffice-desktopeditors + naps2 hunspell hunspellDicts.en-us hunspellDicts.de-de @@ -48,7 +48,6 @@ let stable = with pkgs-stable; [ # Office - pdfslicer kiwix kiwix-tools zim diff --git a/common/utils/nix-ld.nix b/common/utils/nix-ld.nix index af2fbc5..1442074 100644 --- a/common/utils/nix-ld.nix +++ b/common/utils/nix-ld.nix @@ -1,8 +1,9 @@ # 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 ])) +{ pkgs-stable, lib, ... }: with pkgs-stable; +[ + llvmPackages.libcxx + stdenv.cc.cc.lib + # (python313.withPackages (ps: [ ps.rpyc ps.tkinter ])) # Needed for operating system detection until # https://github.com/ValveSoftware/steam-for-linux/issues/5909 is resolved @@ -10,7 +11,7 @@ # Errors in output without those pciutils # Games' dependencies - xorg.xrandr + xrandr which # Needed by gdialog, including in the steam-runtime perl @@ -23,18 +24,18 @@ procps usbutils - opencl-clhpp - opencl-clang - opencl-headers - fuse3 - fuse - wayland - kdePackages.wayland-protocols - pkg-config - cmake - kdePackages.qtbase - kdePackages.qqc2-desktop-style - kdePackages.kirigami + opencl-clhpp + intel-graphics-compiler + opencl-headers + fuse3 + fuse + wayland + kdePackages.wayland-protocols + pkg-config + cmake + kdePackages.qtbase + kdePackages.qqc2-desktop-style + kdePackages.kirigami # It tries to execute xdg-user-dir and spams the log with command not founds xdg-user-dirs @@ -43,13 +44,13 @@ mesa sqlite - # These are required by steam with proper errors - xorg.libXcomposite - xorg.libXtst - xorg.libXrandr - xorg.libXext - xorg.libX11 - xorg.libXfixes + # These are required by steam with proper errors + libXcomposite + libXtst + libXrandr + libXext + libX11 + libXfixes libGL libva pipewire @@ -67,21 +68,21 @@ vulkan-loader expat wayland - xorg.libxcb - xorg.libXdamage - xorg.libxshmfence - xorg.libXxf86vm + libxcb + libXdamage + libxshmfence + libXxf86vm libelf (lib.getLib elfutils) # Without these it silently fails - xorg.libXinerama - xorg.libXcursor - xorg.libXrender - xorg.libXScrnSaver - xorg.libXi - xorg.libSM - xorg.libICE + libXinerama + libXcursor + libXrender + libXScrnSaver + libXi + libSM + libICE gnome2.GConf curlWithGnuTls nspr @@ -98,13 +99,13 @@ # Verified games requirements fontconfig freetype - xorg.libXt - xorg.libXmu + libXt + libXmu libogg libvorbis SDL SDL2_image - glew110 + glew_1_10 libdrm libidn tbb @@ -143,7 +144,7 @@ libunwind libvpx librsvg - xorg.libXft + libXft libvdpau # required by coreutils stuff to run correctly @@ -155,7 +156,7 @@ # Not formally in runtime but needed by some games at-spi2-atk - at-spi2-core # CrossCode + at-spi2-core # CrossCode gst_all_1.gstreamer gst_all_1.gst-plugins-ugly gst_all_1.gst-plugins-base @@ -167,9 +168,9 @@ mono ncurses # Crusader Kings III openssl - xorg.xkeyboardconfig - xorg.libpciaccess - xorg.libXScrnSaver # Dead Cells + xkeyboardconfig + libpciaccess + libXScrnSaver # Dead Cells icu # dotnet runtime, e.g. Stardew Valley # screeps dependencies @@ -194,5 +195,3 @@ nghttp2.lib rtmpdump ] - - diff --git a/flake.lock b/flake.lock index 8e5667f..2c11902 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1780372639, - "narHash": "sha256-VFzXYHlIGwO4h4ovtnpZj9sX/Qu6+dlI00sXjHdwi2w=", + "lastModified": 1783689476, + "narHash": "sha256-Ac4EGPZr9e+mPUdmavJFSTft4vgoXml40+YOFYKTXPg=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "1ee1e8864a1fcfcc21a5fb5af4bd328b3c829f42", + "rev": "af94408291ad477cae8eed964981ab41f90eb184", "type": "github" }, "original": { @@ -26,17 +26,14 @@ "inputs": { "flake-schemas": "flake-schemas", "home-manager": "home-manager", - "jovian": "jovian", - "niks3": "niks3", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1781537090, - "narHash": "sha256-Mzzi1Bu+buo13CTHgz86FFFQk1A4fIGMq0ULsm0O8ac=", + "lastModified": 1785658983, + "narHash": "sha256-z+L5OCPOisb/CdSR9hPhf8rcwQsRd+h8zc2vas9gsMg=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "33d24aaa9ba2d3c4c8b738dd2a95c541434db878", + "rev": "01550f84c0af977a55bb4b14623de93a4be8fe0f", "type": "github" }, "original": { @@ -138,16 +135,16 @@ }, "flake-schemas": { "locked": { - "lastModified": 1721999734, - "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", - "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", - "revCount": 75, + "lastModified": 1780327564, + "narHash": "sha256-HiRPtA0spK+Dkgbhz/1zW9glXxNVB+L4Rj2VYmdawb8=", + "rev": "6cc9bd98891b1fc6bb2b8cb3277df8bc72799ca6", + "revCount": 149, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.5.0/019e83cf-9af3-78b1-ac5b-70e68ad1efe1/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.5.0.tar.gz" } }, "flake-utils": { @@ -231,11 +228,11 @@ ] }, "locked": { - "lastModified": 1781497404, - "narHash": "sha256-9GAF8sSsnkyCVCWkomXR0T+zdSxyUlfPt6neQidimdg=", + "lastModified": 1785531816, + "narHash": "sha256-vkMnV0JIyw+g/NmcfoajlGaAO+9a0ezia+FZohQJrik=", "owner": "nix-community", "repo": "home-manager", - "rev": "1285cd3d6882a9847f2d56ed5541b3350c8a6162", + "rev": "bf9ce9fec78f95f374e8dd3b503863a3ec128ebe", "type": "github" }, "original": { @@ -251,11 +248,11 @@ ] }, "locked": { - "lastModified": 1781533608, - "narHash": "sha256-Mgsu/x5cs8EqlhIQ7bMBo14LpkAYtgzDbG/S/eattJA=", + "lastModified": 1785531816, + "narHash": "sha256-vkMnV0JIyw+g/NmcfoajlGaAO+9a0ezia+FZohQJrik=", "owner": "nix-community", "repo": "home-manager", - "rev": "8aec76cc1e045f37b55d82ca3cee4910ae04d3db", + "rev": "bf9ce9fec78f95f374e8dd3b503863a3ec128ebe", "type": "github" }, "original": { @@ -264,55 +261,6 @@ "type": "github" } }, - "jovian": { - "inputs": { - "nix-github-actions": [ - "chaotic" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1781344759, - "narHash": "sha256-S6UBeQM7NLaQX6RZYS65fMypWfRQL/F4iRu0y8sTLPc=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "ffac737e4117f7e9f070d38078801a5433f19d5b", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, - "niks3": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "treefmt-nix": [ - "chaotic" - ] - }, - "locked": { - "lastModified": 1781027181, - "narHash": "sha256-IHIUd1/lYTaS4ilHZNV6+x0fchxDpvUdMjwnnEBASu4=", - "owner": "Mic92", - "repo": "niks3", - "rev": "c74d275536d9a38ff279b498612fae0fd68cfe85", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "niks3", - "rev": "c74d275536d9a38ff279b498612fae0fd68cfe85", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -320,11 +268,11 @@ ] }, "locked": { - "lastModified": 1781422160, - "narHash": "sha256-W7S8O86bVrw2gaomEwkHStOzmPpnFIHQ6lS4Q2HffJ0=", + "lastModified": 1785650611, + "narHash": "sha256-q4kR7g+pCcz6NASvoVPYu+CWWUurX03wogtBqGmR4h0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "854d04e2368fb2e9c328a36b3c0a04cd713bfae1", + "rev": "dbc756c9d7287de19b3e0e38c928c47510d42c3e", "type": "github" }, "original": { @@ -356,11 +304,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1781074563, - "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", + "lastModified": 1785454630, + "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", + "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746", "type": "github" }, "original": { @@ -372,16 +320,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "lastModified": 1785491804, + "narHash": "sha256-p00vplVOyfKGlhju0+eGGPAxyYYKaY0lpyuoHLFIx2Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "rev": "5b4f72e1705a63aace42900610c4db82cb4af0ec", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -396,11 +344,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1781496885, - "narHash": "sha256-xFzT8fcusZPlIKP08C79qkwIlncFFAc5RxkE9srNk50=", + "lastModified": 1785639327, + "narHash": "sha256-ab+81Lz4qfvdvtnFctv5zkfy65Lw+b2RAIeExlm8dEY=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "9da9f0dfb17f48b2f28f5909913b3e79b243dd9e", + "rev": "3bbb507f7691e21f1232ae3cfed243e7b123c728", "type": "github" }, "original": { @@ -427,11 +375,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1781074563, - "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", + "lastModified": 1785571196, + "narHash": "sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", + "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06", "type": "github" }, "original": { @@ -443,11 +391,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1781074563, - "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", + "lastModified": 1785571196, + "narHash": "sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", + "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06", "type": "github" }, "original": { @@ -459,11 +407,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1781074563, - "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", + "lastModified": 1785571196, + "narHash": "sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", + "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06", "type": "github" }, "original": { @@ -479,11 +427,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1781539966, - "narHash": "sha256-eA0tQ1Di+h83id9Kh0dh3Cw1Il/hYC27nU/SwyAQ9sk=", + "lastModified": 1785680825, + "narHash": "sha256-HGsaRI+h685jeL4wR2g8n7ZRiozQp0m49IDFMhpcN7c=", "owner": "nix-community", "repo": "NUR", - "rev": "e87773f13ebe40f64737ab35251c76ed9c951547", + "rev": "a139c18f56e7807ec4c02756099fb8d11c5c8fd2", "type": "github" }, "original": { @@ -532,11 +480,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1781284530, - "narHash": "sha256-HHim1IhHn9SB8qsJLwm8SvLbIKuoshkPCmPmAhR2SF8=", + "lastModified": 1785598746, + "narHash": "sha256-y6MpkWLrd5/efDcWvQKkp9I0SPEPqCnEfZgD+eYuK+c=", "owner": "pwndbg", "repo": "pwndbg", - "rev": "6328085872c8ae570228d9fb828865cfc732bbd1", + "rev": "207fbf1f53a21f1978cda56639147f5b52e0e817", "type": "github" }, "original": { @@ -610,7 +558,7 @@ "nixpkgs-xr": "nixpkgs-xr", "nur": "nur", "pwndbg": "pwndbg", - "rust-overlay": "rust-overlay_3", + "rust-overlay": "rust-overlay_2", "sops-nix": "sops-nix" } }, @@ -622,11 +570,11 @@ ] }, "locked": { - "lastModified": 1780197589, - "narHash": "sha256-FVCr2Ij/jKf59a4LW481eeOF6rJRreOBrVgW/aUBTrw=", + "lastModified": 1782875958, + "narHash": "sha256-5eqDcnBjb1424HRQdnhuhNOBZguq1Z2tqSa2OMF/m2c=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "21632e942d89bf1cce4e5a63d7e58a215a0cbfcc", + "rev": "13139aefa973f3d96c60c0fbab801de058ae25ca", "type": "github" }, "original": { @@ -636,38 +584,17 @@ } }, "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1781493707, - "narHash": "sha256-lzf7qdQWuiY0T9VEbfH2CmP1LZQAYooU/sZuSgEJEBk=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "06f25b8e40805beb2121a4dae4cc37d6f981800f", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1781493707, - "narHash": "sha256-lzf7qdQWuiY0T9VEbfH2CmP1LZQAYooU/sZuSgEJEBk=", + "lastModified": 1785648791, + "narHash": "sha256-4wZa7NDOxbcm9pTNNcg88nvvPb9uVcWsJ+Ncil8eB1I=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "06f25b8e40805beb2121a4dae4cc37d6f981800f", + "rev": "32346a8154e65fa10bac36f7b476a5294cb8b150", "type": "github" }, "original": { @@ -683,11 +610,11 @@ ] }, "locked": { - "lastModified": 1780547341, - "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=", + "lastModified": 1783174389, + "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a", + "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9", "type": "github" }, "original": { @@ -749,11 +676,11 @@ ] }, "locked": { - "lastModified": 1780220602, - "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "lastModified": 1785360170, + "narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1b52473..5564293 100755 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-26.05"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/nixos/custom-odin-nixos/configuration.nix b/nixos/custom-odin-nixos/configuration.nix index fd1b1c8..c567ba0 100755 --- a/nixos/custom-odin-nixos/configuration.nix +++ b/nixos/custom-odin-nixos/configuration.nix @@ -15,10 +15,10 @@ let vfio-pci-ids = [ # RTX 2060 - "10de:1f08" - "10de:10f9" - "10de:1ada" - "10de:1adb" + #"10de:1f08" + #"10de:10f9" + #"10de:1ada" + #"10de:1adb" # Mobo's WI-FI 7 (we don't use this, but VIFO dies if all of the devices aren't sent to the driver) #"17cb:1107" @@ -76,8 +76,6 @@ in options kvm_amd emulate_invalid_guest_state=0 options kvm ignore_msrs=1 options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 - blacklist nouveau - options nouveau modeset=0 options kvmfr static_size_mb=64 ''; @@ -96,12 +94,12 @@ in "vfio_virqfd" ]; blacklistedKernelModules = [ - "nouveau" - "nvidia" - "nvidia_drm" - "nvidia_uvm" - "nvidia_modeset" - "i2c_nvidia_gpu" + #"nouveau" + #"nvidia" + #"nvidia_drm" + #"nvidia_uvm" + #"nvidia_modeset" + #"i2c_nvidia_gpu" ]; binfmt = { @@ -125,8 +123,8 @@ in "riscv32-linux" "riscv64-linux" "loongarch64-linux" - "wasm32-wasi" - "wasm64-wasi" + "wasm32-wasip1" + "wasm64-wasip1" "s390x-linux" ]; }; @@ -320,9 +318,9 @@ in defaultNetwork.settings.dns_enabled = true; }; - containers = { + containers = { enable = true; - }; + }; # virtualbox.host.enable = true; # virtualbox.host.enableExtensionPack = true; # Requires previous, will compile all of vbox if enabled! @@ -711,7 +709,6 @@ in # Python # python3Full - pipx # Global Apps firefox diff --git a/nixos/latitude7390-loki-nixos/configuration.nix b/nixos/latitude7390-loki-nixos/configuration.nix index 8f2afc9..8ffc20a 100755 --- a/nixos/latitude7390-loki-nixos/configuration.nix +++ b/nixos/latitude7390-loki-nixos/configuration.nix @@ -465,7 +465,6 @@ # Python # python3Full - pipx # Global Apps firefox diff --git a/nixos/minisforum-valkyrie-2-nixos.cloud.reboot-codes.com/configuration.nix b/nixos/minisforum-valkyrie-2-nixos.cloud.reboot-codes.com/configuration.nix index f8df371..f6a58d0 100755 --- a/nixos/minisforum-valkyrie-2-nixos.cloud.reboot-codes.com/configuration.nix +++ b/nixos/minisforum-valkyrie-2-nixos.cloud.reboot-codes.com/configuration.nix @@ -552,7 +552,6 @@ # Python # python3Full - pipx # Global Apps firefox