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 ]