From e770bf9a6de59e388e9c3f0fd4ada92e0ad15601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C4=83t=C4=83lin?= Date: Thu, 11 Jun 2026 14:01:25 +0200 Subject: [PATCH 1/2] update system to 26.05 --- flake.lock | 24 +++++++++--------- flake.nix | 6 ++--- hosts/limgrave/nixos/default.nix | 42 ++++++++++++++++++++++++++++--- hosts/limgrave/nixos/flatpaks.nix | 2 ++ hosts/limgrave/nixos/packages.nix | 7 +++++- 5 files changed, 61 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index df0ba6f..9c068cf 100644 --- a/flake.lock +++ b/flake.lock @@ -8,16 +8,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1773709057, - "narHash": "sha256-hLt6CDHEPV8BVpOADVn4bLNcBz89eC2jKtIexHG0yAY=", + "lastModified": 1778629013, + "narHash": "sha256-XrJFetPs7TsbX5Cxekj+h3hlmQLoOpB7U+c36NM/jeA=", "owner": "atuinsh", "repo": "atuin", - "rev": "e737ba5b9a149eaec706418bc560e8ba7ea8c81b", + "rev": "671f96b60dac49d1d2de73cc0812986a5e22ce7b", "type": "github" }, "original": { "owner": "atuinsh", - "ref": "v18.13.3", + "ref": "v18.16.1", "repo": "atuin", "type": "github" } @@ -85,16 +85,16 @@ ] }, "locked": { - "lastModified": 1775077333, - "narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=", + "lastModified": 1781124985, + "narHash": "sha256-hIaUkf6qalGk2xxNEkBMP2m2aPBq+qXvUPOIwwEDySI=", "owner": "nix-community", "repo": "home-manager", - "rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2", + "rev": "d899b01766784bcc9a141ee13bad6dc689d47c37", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } @@ -133,16 +133,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1775002709, - "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", + "lastModified": 1780902259, + "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e", + "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 926a884..bd3f150 100644 --- a/flake.nix +++ b/flake.nix @@ -2,15 +2,15 @@ description = "NixOS flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; systems.url = "github:nix-systems/default-linux"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.7.0"; opencode.url = "github:GutMutCode/opencode-nix/"; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; - atuin.url = "github:atuinsh/atuin/v18.13.3"; + atuin.url = "github:atuinsh/atuin/v18.16.1"; }; outputs = { self, nixpkgs, nix-flatpak, systems, home-manager, opencode, ... } @ inputs: let diff --git a/hosts/limgrave/nixos/default.nix b/hosts/limgrave/nixos/default.nix index 0ff6831..360a784 100644 --- a/hosts/limgrave/nixos/default.nix +++ b/hosts/limgrave/nixos/default.nix @@ -10,7 +10,27 @@ loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; kernelPackages = pkgs.linuxPackages_latest; - initrd.luks.devices."luks-7565ba12-2da3-4933-adec-8d62e81afe52".device = "/dev/disk/by-uuid/7565ba12-2da3-4933-adec-8d62e81afe52"; + initrd.luks = { + devices."luks-7565ba12-2da3-4933-adec-8d62e81afe52".device = "/dev/disk/by-uuid/7565ba12-2da3-4933-adec-8d62e81afe52"; + cryptoModules = [ + "aes" + # "aes_generic" + "blowfish" + "twofish" + "serpent" + "cbc" + "xts" + "lrw" + "sha1" + "sha256" + "sha512" + "af_alg" + "algif_skcipher" + "cryptd" + "input_leds" + ]; + }; + }; nix = { @@ -38,6 +58,7 @@ alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; + jack.enable = true; }; udev.packages = with pkgs; [ gnome-settings-daemon ]; sysprof.enable = true; @@ -61,6 +82,7 @@ appimage.enable = true; appimage.binfmt = true; dconf.enable = true; + gamemode.enable = true; gamescope = { enable = true; capSysNice = true; @@ -137,15 +159,27 @@ }; virtualisation.docker.enable = true; - nixpkgs.config.allowUnfree = true; + nixpkgs.config ={ + allowUnfree = true; + permittedInsecurePackages = [ + "docker-28.5.2" + ]; + }; environment = { - sessionVariables.NIXOS_OZONE_WL = "1"; + sessionVariables = { + GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ + pkgs.gst_all_1.gst-plugins-good + pkgs.gst_all_1.gst-plugins-bad + pkgs.gst_all_1.gst-plugins-ugly + ]; + NIXOS_OZONE_WL = "1"; + }; + systemPackages = import ./packages.nix pkgs; loginShellInit = '' [[ "$(tty)" = "/dev/tty1" ]] && ~/.dotfiles/conf.d/utils/gs.sh ''; }; - system.stateVersion = "25.11"; } diff --git a/hosts/limgrave/nixos/flatpaks.nix b/hosts/limgrave/nixos/flatpaks.nix index f09a8fd..c954a75 100644 --- a/hosts/limgrave/nixos/flatpaks.nix +++ b/hosts/limgrave/nixos/flatpaks.nix @@ -18,4 +18,6 @@ "org.kde.kdenlive" "com.vysp3r.ProtonPlus" "com.github.IsmaelMartinez.teams_for_linux" + "io.github.Foldex.AdwSteamGtk" + "io.github.seadve.Kooha" ] diff --git a/hosts/limgrave/nixos/packages.nix b/hosts/limgrave/nixos/packages.nix index 0ead3d5..5efe8e0 100644 --- a/hosts/limgrave/nixos/packages.nix +++ b/hosts/limgrave/nixos/packages.nix @@ -14,7 +14,7 @@ kubeseal openssl xclip - resticprofile + #resticprofile gnupg awscli2 kor @@ -81,4 +81,9 @@ signal-desktop tflint kubeconform + shellcheck + ncdu + python3 + poetry + pulumi ] From 4e3b12a9951157f2a9ae14fd0266de77df6c1c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C4=83t=C4=83lin?= Date: Thu, 11 Jun 2026 17:12:22 +0200 Subject: [PATCH 2/2] split system packages --- hosts/limgrave/nixos/default.nix | 8 +- hosts/limgrave/nixos/flatpaks.nix | 7 +- hosts/limgrave/nixos/packages.nix | 89 ----------------------- hosts/limgrave/nixos/packages/cli.nix | 53 ++++++++++++++ hosts/limgrave/nixos/packages/gui.nix | 14 ++++ hosts/limgrave/nixos/packages/pandora.nix | 3 + hosts/limgrave/nixos/packages/rice.nix | 10 +++ hosts/limgrave/nixos/packages/system.nix | 14 ++++ 8 files changed, 103 insertions(+), 95 deletions(-) delete mode 100644 hosts/limgrave/nixos/packages.nix create mode 100644 hosts/limgrave/nixos/packages/cli.nix create mode 100644 hosts/limgrave/nixos/packages/gui.nix create mode 100644 hosts/limgrave/nixos/packages/pandora.nix create mode 100644 hosts/limgrave/nixos/packages/rice.nix create mode 100644 hosts/limgrave/nixos/packages/system.nix diff --git a/hosts/limgrave/nixos/default.nix b/hosts/limgrave/nixos/default.nix index 360a784..400f6bb 100644 --- a/hosts/limgrave/nixos/default.nix +++ b/hosts/limgrave/nixos/default.nix @@ -175,7 +175,13 @@ NIXOS_OZONE_WL = "1"; }; - systemPackages = import ./packages.nix pkgs; + systemPackages = with pkgs; ( + import ./packages/system.nix pkgs + ++ import ./packages/cli.nix pkgs + ++ import ./packages/gui.nix pkgs + ++ import ./packages/rice.nix pkgs + ++ import ./packages/pandora.nix pkgs + ); loginShellInit = '' [[ "$(tty)" = "/dev/tty1" ]] && ~/.dotfiles/conf.d/utils/gs.sh ''; diff --git a/hosts/limgrave/nixos/flatpaks.nix b/hosts/limgrave/nixos/flatpaks.nix index c954a75..4501f53 100644 --- a/hosts/limgrave/nixos/flatpaks.nix +++ b/hosts/limgrave/nixos/flatpaks.nix @@ -1,8 +1,4 @@ [ - "com.microsoft.Edge" - "dev.vencord.Vesktop" - "chat.revolt.RevoltDesktop" - "io.github.hkdb.Aerion" "io.github.mpobaschnig.Vaults" "com.bitwarden.desktop" "com.google.Chrome" @@ -17,7 +13,8 @@ "com.obsproject.Studio" "org.kde.kdenlive" "com.vysp3r.ProtonPlus" - "com.github.IsmaelMartinez.teams_for_linux" "io.github.Foldex.AdwSteamGtk" "io.github.seadve.Kooha" + "org.equicord.equibop" + "com.discordapp.Discord" ] diff --git a/hosts/limgrave/nixos/packages.nix b/hosts/limgrave/nixos/packages.nix deleted file mode 100644 index 5efe8e0..0000000 --- a/hosts/limgrave/nixos/packages.nix +++ /dev/null @@ -1,89 +0,0 @@ - pkgs: with pkgs; [ - bat - git - neovim - jetbrains-toolbox - coder - kitty - steam - steam-run - mpv - gnumake - kubernetes-helm - opentofu - kubeseal - openssl - xclip - #resticprofile - gnupg - awscli2 - kor - exiftool - gnome-themes-extra - hmcl - vlc - unrar-wrapper - atkinson-hyperlegible - libreoffice-qt - hunspell - hunspellDicts.es_ES - hunspellDicts.en_US - sqlite-interactive - ffmpeg - lrcget - yq - p7zip - ansible - k3sup - gamemode - lm_sensors - appimage-run - xcolor - samrewritten - protontricks - nmap - terragrunt - adwaita-icon-theme - ayugram-desktop - restic - pre-commit - cargo - inconsolata - k9s - kubectl - dotter - kubecolor - trash-cli - gnomeExtensions.appindicator - bruno - devenv - vim - direnv - marble-shell-theme - colloid-gtk-theme - colloid-icon-theme - sysprof - steam-run - streamlink - twitch-chat-downloader - jq - hmcl - tmux - atuin - tor - tor-browser - remmina - yt-dlp - mangohud - difftastic - libheif - ffmpegthumbnailer - signal-desktop - tflint - kubeconform - shellcheck - ncdu - python3 - poetry - pulumi - ] diff --git a/hosts/limgrave/nixos/packages/cli.nix b/hosts/limgrave/nixos/packages/cli.nix new file mode 100644 index 0000000..347c95f --- /dev/null +++ b/hosts/limgrave/nixos/packages/cli.nix @@ -0,0 +1,53 @@ +pkgs: with pkgs; [ + kubectl + k9s + kubecolor + kubeseal + kubeconform + kubernetes-helm + k3sup + + opentofu + tflint + terragrunt + ansible + pulumi + awscli2 + yq + + git + neovim + vim + bat + jq + tmux + direnv + cargo + python3 + poetry + pre-commit + shellcheck + atuin + dotter + restic + kor + devenv + + yt-dlp + streamlink + lrcget + exiftool + hunspell + hunspellDicts.es_ES + hunspellDicts.en_US + + xclip + unrar-wrapper + p7zip + xcolor + trash-cli + + steam-run + protontricks + mangohud +] \ No newline at end of file diff --git a/hosts/limgrave/nixos/packages/gui.nix b/hosts/limgrave/nixos/packages/gui.nix new file mode 100644 index 0000000..30ed56d --- /dev/null +++ b/hosts/limgrave/nixos/packages/gui.nix @@ -0,0 +1,14 @@ +pkgs: with pkgs; [ + steam + mpv + vlc + jetbrains-toolbox + coder + kitty + libreoffice-qt + signal-desktop + remmina + ayugram-desktop + tor-browser + samrewritten +] \ No newline at end of file diff --git a/hosts/limgrave/nixos/packages/pandora.nix b/hosts/limgrave/nixos/packages/pandora.nix new file mode 100644 index 0000000..7c5a36f --- /dev/null +++ b/hosts/limgrave/nixos/packages/pandora.nix @@ -0,0 +1,3 @@ +pkgs: with pkgs; [ + difftastic +] \ No newline at end of file diff --git a/hosts/limgrave/nixos/packages/rice.nix b/hosts/limgrave/nixos/packages/rice.nix new file mode 100644 index 0000000..a4ffcb7 --- /dev/null +++ b/hosts/limgrave/nixos/packages/rice.nix @@ -0,0 +1,10 @@ +pkgs: with pkgs; [ + gnome-themes-extra + adwaita-icon-theme + atkinson-hyperlegible + inconsolata + marble-shell-theme + colloid-gtk-theme + colloid-icon-theme + gnomeExtensions.appindicator +] \ No newline at end of file diff --git a/hosts/limgrave/nixos/packages/system.nix b/hosts/limgrave/nixos/packages/system.nix new file mode 100644 index 0000000..b64ed65 --- /dev/null +++ b/hosts/limgrave/nixos/packages/system.nix @@ -0,0 +1,14 @@ +pkgs: with pkgs; [ + openssl + gnupg + sqlite-interactive + ffmpeg + lm_sensors + nmap + gnumake + gamemode + libheif + ffmpegthumbnailer + appimage-run + sysprof +] \ No newline at end of file