diff --git a/flake.lock b/flake.lock index df48ba8..7049fc3 100644 --- a/flake.lock +++ b/flake.lock @@ -112,16 +112,16 @@ ] }, "locked": { - "lastModified": 1779506708, - "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", + "lastModified": 1782704057, + "narHash": "sha256-G1I1gd32F7mp9LAe1DaZ4ZL7NX5gyiKwdCMwro1Vrck=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", + "rev": "868d0a692de703c2de98fab61968e4e310b7c28e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } @@ -197,6 +197,21 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1780908363, + "narHash": "sha256-llGS4y3Qh1eUkli3/Y2VY9FV3GOUKFZR1E2BDftt45Q=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "1df08625f0f8c7d6e300a0e5df7955bbb877d809", + "type": "github" + }, + "original": { + "owner": "gmodena", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1782118813, @@ -278,16 +293,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1781509190, - "narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=", + "lastModified": 1782535326, + "narHash": "sha256-ZeRxu4yn6shd3SNF5ZUQb4r7BaVo1zBKMjRhfoNSBmw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4", + "rev": "714a5f8c4ead6b31148d829288440ed033ccc041", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -362,6 +377,7 @@ "home-manager": "home-manager", "import-tree": "import-tree", "niri-flake": "niri-flake", + "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "qml-niri": "qml-niri", diff --git a/flake.nix b/flake.nix index 9d8a7d7..47140f3 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,13 @@ { 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"; import-tree.url = "github:vic/import-tree"; flake-aspects.url = "github:vic/flake-aspects"; den.url = "github:vic/den"; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -24,6 +24,7 @@ }; claude-code.url = "github:sadjow/claude-code-nix"; + nix-flatpak.url = "github:gmodena/nix-flatpak"; qml-niri = { url = "github:imiric/qml-niri/main"; diff --git a/installer/default.nix b/installer/default.nix index ae11a1f..b8f81ed 100644 --- a/installer/default.nix +++ b/installer/default.nix @@ -211,6 +211,7 @@ in { # the dependency on the Ventoy device remaining accessible during boot. # See: https://github.com/NixOS/nixpkgs/issues/245101 boot.kernelParams = [ "copytoram" ]; + boot.zfs.forceImportRoot = false; services.getty.autologinUser = lib.mkForce "root"; diff --git a/modules/_home/niri.nix b/modules/_home/niri.nix index c472417..1d54f3f 100644 --- a/modules/_home/niri.nix +++ b/modules/_home/niri.nix @@ -14,12 +14,9 @@ in { command = "${pkgs.niri}/bin/niri msg action power-off-monitors"; } ]; - events = [ - { - event = "before-sleep"; - command = "${pkgs.swaylock}/bin/swaylock -f -i ${wallpaper}"; - } - ]; + events = { + before-sleep = "${pkgs.swaylock}/bin/swaylock -f -i ${wallpaper}"; + }; }; home.sessionVariables = { @@ -37,7 +34,7 @@ in { # Niri session tools fuzzel swaylock - swww + awww rofimoji libnotify @@ -87,12 +84,12 @@ in { ''; }; - home.file.".local/bin/swww-init" = { + home.file.".local/bin/awww-init" = { executable = true; text = '' #!/usr/bin/env bash - swww-daemon & - swww img "${wallpaper}" --transition-type none + awww-daemon & + awww img "${wallpaper}" --transition-type none ''; }; @@ -130,7 +127,7 @@ in { prefer-no-csd spawn-at-startup "quickshell" - spawn-at-startup "bash" "-c" "$HOME/.local/bin/swww-init" + spawn-at-startup "bash" "-c" "$HOME/.local/bin/awww-init" screenshot-path "${config.xdg.userDirs.pictures}/screenshots/%Y-%m-%d %H-%M-%S.png" diff --git a/modules/_home/theme.nix b/modules/_home/theme.nix index 31d374e..c4c5fe9 100644 --- a/modules/_home/theme.nix +++ b/modules/_home/theme.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ config, pkgs, ... }: { home.packages = with pkgs; [ gruvbox-gtk-theme gruvbox-plus-icons @@ -14,6 +14,7 @@ name = "Gruvbox-Plus-Dark"; package = pkgs.gruvbox-plus-icons; }; + gtk4.theme = config.gtk.theme; }; qt = { diff --git a/modules/_home/xdg-dirs.nix b/modules/_home/xdg-dirs.nix index ec00dce..57ac2aa 100644 --- a/modules/_home/xdg-dirs.nix +++ b/modules/_home/xdg-dirs.nix @@ -1,7 +1,8 @@ { config, ... }: { xdg.userDirs = { - enable = true; - createDirectories = true; + enable = true; + createDirectories = true; + setSessionVariables = true; desktop = "${config.home.homeDirectory}/Desktop"; download = "${config.home.homeDirectory}/Downloads"; diff --git a/modules/gaming.nix b/modules/gaming.nix index 1ce0e7e..cf73ffc 100644 --- a/modules/gaming.nix +++ b/modules/gaming.nix @@ -1,4 +1,4 @@ -{ den, pkgs-unstable, ... }: { +{ den, ... }: { den.aspects.gaming.nixos = { pkgs, ... }: { hardware.graphics = { enable = true; @@ -7,7 +7,6 @@ programs.steam = { enable = true; - package = pkgs-unstable.steam; remotePlay.openFirewall = false; dedicatedServer.openFirewall = false; diff --git a/modules/leisure.nix b/modules/leisure.nix index 51f93c7..c57e0b7 100644 --- a/modules/leisure.nix +++ b/modules/leisure.nix @@ -1,9 +1,19 @@ -{ den, pkgs-unstable, ... }: { +{ den, inputs, pkgs-unstable, ... }: { den.aspects.leisure.nixos = { ... }: { - environment.systemPackages = with pkgs-unstable; [ - # Streaming - stremio-linux-shell + imports = [ inputs.nix-flatpak.nixosModules.nix-flatpak ]; + services.flatpak = { + enable = true; + remotes = [{ + name = "flathub"; + location = "https://flathub.org/repo/flathub.flatpakrepo"; + }]; + packages = [ + { appId = "com.stremio.Stremio"; origin = "flathub"; } + ]; + }; + + environment.systemPackages = with pkgs-unstable; [ # Torrenting qbittorrent