From ce1af87bdfa210ec34cb382f263f8b8f271030e1 Mon Sep 17 00:00:00 2001 From: William Date: Sat, 18 Oct 2025 18:43:23 -0300 Subject: [PATCH] finally, niri is finished --- flake.lock | 142 +++++++++++++++++++++++++++--- flake.nix | 2 + hosts/modules/desktop/desktop.nix | 14 ++- users/modules/desktop.nix | 12 +-- users/modules/stylix.nix | 8 +- 5 files changed, 152 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 3e04b70..64bae33 100644 --- a/flake.lock +++ b/flake.lock @@ -456,6 +456,62 @@ "type": "github" } }, + "niri": { + "inputs": { + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable", + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": "xwayland-satellite-unstable" + }, + "locked": { + "lastModified": 1760774008, + "narHash": "sha256-NchPYxFkN9XOOuocGXBmRFAh9NVFybmAev62zG1nL2A=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "27e012b4cd49e9ac438573ec7a6db3e5835828c3", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.08", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1760768097, + "narHash": "sha256-RvlONuKFKu+v7h/MorLONcPzXMMe6zs8aJUDOsfjr1I=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "8c8447918f4fd7bc6c86a8622b1db52417fbbbbd", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1754777568, @@ -475,7 +531,7 @@ "nix-options-doc": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { @@ -497,7 +553,7 @@ "inputs": { "flake-compat": "flake-compat_2", "nix-options-doc": "nix-options-doc", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1759846470, @@ -545,6 +601,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1760580664, + "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1760423683, "narHash": "sha256-Tb+NYuJhWZieDZUxN6PgglB16yuqBYQeMJyYBGCXlt8=", @@ -561,6 +633,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1760524057, + "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1740695751, "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", @@ -576,7 +664,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1759070547, "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", @@ -592,7 +680,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1760524057, "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", @@ -608,7 +696,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1758690382, "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", @@ -624,7 +712,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1755615617, "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", @@ -696,10 +784,11 @@ "home-manager": "home-manager_2", "home-manager-stable": "home-manager-stable", "impermanence": "impermanence", + "niri": "niri", "nix-flatpak": "nix-flatpak", "nixos-cli": "nixos-cli", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable_2", "stylix": "stylix", "zen-browser": "zen-browser" } @@ -735,7 +824,7 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_2", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nur": "nur", "systems": "systems_4", "tinted-foot": "tinted-foot", @@ -917,10 +1006,43 @@ "type": "github" } }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1755491097, + "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "388d291e82ffbc73be18169d39470f340707edaa", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.7", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1759707084, + "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "a9188e70bd748118b4d56a529871b9de5adb9988", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1760588585, diff --git a/flake.nix b/flake.nix index 4f3fac0..b9ca962 100644 --- a/flake.nix +++ b/flake.nix @@ -42,6 +42,8 @@ impermanence.url = "github:nix-community/impermanence"; deploy-rs.url = "github:serokell/deploy-rs"; + + niri.url = "github:sodiboo/niri-flake"; }; outputs = diff --git a/hosts/modules/desktop/desktop.nix b/hosts/modules/desktop/desktop.nix index ebffd49..045c088 100644 --- a/hosts/modules/desktop/desktop.nix +++ b/hosts/modules/desktop/desktop.nix @@ -6,7 +6,10 @@ }: { - imports = [ inputs.nix-flatpak.nixosModules.nix-flatpak ]; + imports = [ + inputs.niri.nixosModules.niri + inputs.nix-flatpak.nixosModules.nix-flatpak + ]; environment = { sessionVariables = { @@ -69,7 +72,7 @@ enable = true; settings = { default_session = { - command = "${lib.getExe pkgs.tuigreet} --time --remember --asterisks --cmd ${lib.getExe pkgs.niri}"; + command = "${lib.getExe pkgs.tuigreet} --time --remember --asterisks --cmd ${pkgs.niri}/bin/niri-session"; user = "greeter"; }; initial_session = { @@ -111,7 +114,10 @@ }; programs = { - niri.enable = true; + niri = { + enable = true; + package = pkgs.niri; + }; dconf.enable = true; kdeconnect.enable = true; appimage = { @@ -120,6 +126,8 @@ }; }; + niri-flake.cache.enable = false; + fonts = { fontDir.enable = true; packages = with pkgs; [ diff --git a/users/modules/desktop.nix b/users/modules/desktop.nix index 3f7545a..f2517f3 100644 --- a/users/modules/desktop.nix +++ b/users/modules/desktop.nix @@ -8,6 +8,8 @@ fonts.fontconfig.enable = true; + home.packages = with pkgs; [ xwayland-satellite ]; + programs = { dankMaterialShell = { enable = true; @@ -33,21 +35,13 @@ keybind = [ "shift+enter=esc:\\x1b[13;2u" ]; }; }; + password-store = { enable = true; package = pkgs.pass-wayland; }; }; - xdg.portal = { - enable = true; - xdgOpenUsePortal = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - ]; - config.common.default = "*"; - }; - gtk = { enable = true; gtk3.extraConfig = { diff --git a/users/modules/stylix.nix b/users/modules/stylix.nix index 1c3712a..2c2d39f 100644 --- a/users/modules/stylix.nix +++ b/users/modules/stylix.nix @@ -13,15 +13,15 @@ polarity = "dark"; base16Scheme = "${pkgs.base16-schemes}/share/themes/hardhacker.yaml"; cursor = { - package = pkgs.kdePackages.breeze-icons; - name = "Breeze_Light"; + package = pkgs.kdePackages.breeze; + name = "breeze_cursors"; size = 24; }; icons = { enable = true; package = pkgs.morewaita-icon-theme; - light = "adwaita"; - dark = "adwaita-dark"; + light = "MoreWaita"; + dark = "MoreWaita"; }; opacity = { applications = 1.0;