From 822f9345baf44398a977cc6d1fc77b1ad3518b04 Mon Sep 17 00:00:00 2001 From: "Gustavo \"Guz\" L de Mello" Date: Wed, 10 Jun 2026 17:43:28 -0300 Subject: [PATCH] chore: update nixos to 26.05 --- flake.lock | 116 ++++++++++++----------------- flake.nix | 6 +- home/terminal/configuration.nix | 5 ++ home/terminal/home.nix | 17 +++++ hosts/dreadnought/impermanence.nix | 96 ++++++++++++++++++------ 5 files changed, 146 insertions(+), 94 deletions(-) diff --git a/flake.lock b/flake.lock index 67d4e36..51a0015 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1760703920, - "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", + "lastModified": 1776754714, + "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "d646af9b7d14bff08824538164af99d0c521b185", + "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", "type": "github" }, "original": { @@ -111,11 +111,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1779670703, + "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -272,20 +272,18 @@ "gnome-shell": { "flake": false, "locked": { - "host": "gitlab.gnome.org", "lastModified": 1767737596, "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "gitlab" + "type": "github" }, "original": { - "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "gnome-49", "repo": "gnome-shell", - "type": "gitlab" + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "type": "github" } }, "godotdev": { @@ -352,16 +350,16 @@ ] }, "locked": { - "lastModified": 1778905220, - "narHash": "sha256-ox/5IHc8uwy6UTw6N7Shp6uCHIgu/S2PsWeuXsOHSo8=", + "lastModified": 1781115013, + "narHash": "sha256-3BopHqMvh26sKim6rumZBY568VrISCWtRgqDuLGR/H0=", "owner": "nix-community", "repo": "home-manager", - "rev": "d1686dc7d36cbd1234cb226ad6ef97e882716acb", + "rev": "fcbbf5484ab2c733e886ef4fa91e8da1c8c028f5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } @@ -462,11 +460,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1777402031, - "narHash": "sha256-6gkfl9y3+ti0Z6dgby8/R4/DRT8sWU0I0TLCIxwWtjk=", + "lastModified": 1780908363, + "narHash": "sha256-llGS4y3Qh1eUkli3/Y2VY9FV3GOUKFZR1E2BDftt45Q=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "22a3adbe7c5c8c8a10a635d32c9ef7fc01a6e4b8", + "rev": "1df08625f0f8c7d6e300a0e5df7955bbb877d809", "type": "github" }, "original": { @@ -507,11 +505,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1778039471, - "narHash": "sha256-Arjg44jFcpSqOKK05EIxbKIjhfjou/EGF12COFU+9QA=", + "lastModified": 1780375694, + "narHash": "sha256-TznzgYVONg28KiSFB2rVdf/eLVIMtEQOxKt13Kzyrp8=", "owner": "infinidoge", "repo": "nix-minecraft", - "rev": "87611ef4788116de05f851920c5958f0c37d5b05", + "rev": "e6f8bec35104ca5955efe73742da58d2823684f7", "type": "github" }, "original": { @@ -538,11 +536,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "lastModified": 1780749050, + "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", "type": "github" }, "original": { @@ -650,16 +648,16 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1778737229, - "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", + "lastModified": 1780902259, + "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", + "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -676,11 +674,11 @@ ] }, "locked": { - "lastModified": 1767886815, - "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=", + "lastModified": 1779766384, + "narHash": "sha256-P7Ohnlq8b8b2fU+Sgkrej7LBTM60LBTkHleLuYzmLmU=", "owner": "nix-community", "repo": "NUR", - "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef", + "rev": "57800b7ab648725ccd33551d01484ee14952ad3f", "type": "github" }, "original": { @@ -769,11 +767,11 @@ ] }, "locked": { - "lastModified": 1777944972, - "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", + "lastModified": 1780547341, + "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", + "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a", "type": "github" }, "original": { @@ -796,23 +794,22 @@ ], "nur": "nur", "systems": "systems_4", - "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1778680496, - "narHash": "sha256-tUq1WASV0dHLv3j18log8V6Esq0NYkXuzNH2EHsstcg=", + "lastModified": 1780702455, + "narHash": "sha256-+srjPGNy67nKytYwdlepycL51IG6S34sS4MKRZXK8G0=", "owner": "danth", "repo": "stylix", - "rev": "fc5bec2e44678eeaa221d566d447a0257a884737", + "rev": "54fa19702f4f2c7f6a981a92850678933588af9a", "type": "github" }, "original": { "owner": "danth", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "stylix", "type": "github" } @@ -899,23 +896,6 @@ "type": "github" } }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, "tinted-kitty": { "flake": false, "locked": { @@ -935,11 +915,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767817087, - "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=", + "lastModified": 1777806186, + "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", "owner": "tinted-theming", "repo": "schemes", - "rev": "bd99656235aab343e3d597bf196df9bc67429507", + "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", "type": "github" }, "original": { @@ -951,11 +931,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1778379944, + "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "fe0203a198690e71a5ff11e08812a4673de3678d", "type": "github" }, "original": { @@ -967,11 +947,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1778378178, + "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "9cd816033ff969415b190722cddf134e78a5665f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 72d0bc5..b9d1334 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -20,7 +20,7 @@ }; stylix = { - url = "github:danth/stylix/release-25.11"; + url = "github:danth/stylix/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/terminal/configuration.nix b/home/terminal/configuration.nix index f2aa2ea..70146ba 100644 --- a/home/terminal/configuration.nix +++ b/home/terminal/configuration.nix @@ -56,6 +56,8 @@ # Steam programs.steam.enable = true; + programs.gamemode.enable = true; + programs.gamemode.enableRenice = true; # Drawing Tablet hardware.opentabletdriver.enable = true; @@ -75,6 +77,9 @@ "via" "vivaldi" ]; + nixpkgs.config.permittedInsecurePackages = [ + "electron-39.8.10" + ]; environment.sessionVariables.NIXOS_OZONE_WL = "1"; } diff --git a/home/terminal/home.nix b/home/terminal/home.nix index db80735..b174149 100644 --- a/home/terminal/home.nix +++ b/home/terminal/home.nix @@ -52,6 +52,23 @@ # Element (Matrix) programs.element-desktop.enable = true; + # Lutris + programs.lutris.enable = true; + # programs.lutris.package = pkgs.lutris.override {extraLibraries = p: [p.libunwind];}; + programs.lutris.steamPackage = osConfig.programs.steam.package; + programs.lutris.extraPackages = with pkgs; [ + libunwind + gamemode + mangohud + ]; + programs.lutris.protonPackages = with pkgs; [ + proton-ge-bin + ]; + programs.lutris.winePackages = with pkgs; [ + wine + wineWow64Packages.full + ]; + # Godot programs.godot.enable = true; diff --git a/hosts/dreadnought/impermanence.nix b/hosts/dreadnought/impermanence.nix index afe5b7f..9adea67 100644 --- a/hosts/dreadnought/impermanence.nix +++ b/hosts/dreadnought/impermanence.nix @@ -36,33 +36,83 @@ ]; }; - boot.initrd.postResumeCommands = let - # https://github.com/nix-community/impermanence?tab=readme-ov-file#btrfs-subvolumes - script = pkgs.writeShellScriptBin "rollback" '' - mkdir -p /btrfs_tmp + boot.initrd.systemd = { + services.impermanence-btrfs-rolling-root = { + description = "Impermanence script for btrfs on boot"; + unitConfig.DefaultDependencies = false; + serviceConfig = { + Type = "oneshot"; + StandardOutput = "journal+console"; + }; + requiredBy = ["initrd.target"]; + before = ["sysroot.mount"]; + requires = ["initrd-root-device.target"]; + after = ["initrd-root-device.target" "local-fs-pre.target"]; + script = '' + mkdir -p /btrfs_tmp - mount -o subvol=/ /dev/mapper/cryptroot /btrfs_tmp + mount -o subvol=/ /dev/mapper/cryptroot /btrfs_tmp - if [[ -e /btrfs_tmp/root ]]; then - mkdir -p /btrfs_tmp/old_roots - timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S") - mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" - fi + if [[ -e /btrfs_tmp/root ]]; then + mkdir -p /btrfs_tmp/old_roots + timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S") + mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" + fi - delete_subvolume_recursively() { - IFS=$'\n' - for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do - delete_subvolume_recursively "/btrfs_tmp/$i" + delete_subvolume_recursively() { + IFS=$'\n' + for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do + delete_subvolume_recursively "/btrfs_tmp/$i" + done + btrfs subvolume delete "$1" + } + + for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do + delete_subvolume_recursively "$i" done - btrfs subvolume delete "$1" - } - for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do - delete_subvolume_recursively "$i" - done + btrfs subvolume create /btrfs_tmp/root + umount /btrfs_tmp + ''; + }; + extraBin = { + "mkdir" = lib.getExe' pkgs.coreutils "mkdir"; + "date" = lib.getExe' pkgs.coreutils "date"; + "stat" = lib.getExe' pkgs.coreutils "stat"; + "mv" = lib.getExe' pkgs.coreutils "mv"; + "find" = lib.getExe' pkgs.findutils "find"; + "btrfs" = lib.getExe' pkgs.btrfs-progs "btrfs"; + }; + }; - btrfs subvolume create /btrfs_tmp/root - umount /btrfs_tmp - ''; - in "${builtins.readFile (lib.getExe script)}"; + # boot.initrd.postResumeCommands = let + # # https://github.com/nix-community/impermanence?tab=readme-ov-file#btrfs-subvolumes + # script = pkgs.writeShellScriptBin "rollback" '' + # mkdir -p /btrfs_tmp + # + # mount -o subvol=/ /dev/mapper/cryptroot /btrfs_tmp + # + # if [[ -e /btrfs_tmp/root ]]; then + # mkdir -p /btrfs_tmp/old_roots + # timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S") + # mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" + # fi + # + # delete_subvolume_recursively() { + # IFS=$'\n' + # for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do + # delete_subvolume_recursively "/btrfs_tmp/$i" + # done + # btrfs subvolume delete "$1" + # } + # + # for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do + # delete_subvolume_recursively "$i" + # done + # + # btrfs subvolume create /btrfs_tmp/root + # umount /btrfs_tmp + # ''; + # in + # lib.mkAfter "${builtins.readFile (lib.getExe script)}"; }