From 35358cf01ce90b63415fd5f6f7ea00a2dfc3f4db Mon Sep 17 00:00:00 2001 From: imxyy_soope_ Date: Fri, 16 Jan 2026 22:22:12 +0800 Subject: [PATCH] feat: system76-scheduler --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 4 ++++ flake/hosts.nix | 17 +++++++++++------ modules/desktop/wm/niri/default.nix | 29 ++++++++++++++++++----------- 4 files changed, 54 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index eb67718..ac5a019 100644 --- a/flake.lock +++ b/flake.lock @@ -1097,6 +1097,7 @@ "plant": "plant", "sops-nix": "sops-nix", "stylix": "stylix", + "system76-scheduler-niri": "system76-scheduler-niri", "treefmt": "treefmt", "zen": "zen" } @@ -1173,6 +1174,26 @@ "type": "github" } }, + "system76-scheduler-niri": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768260017, + "narHash": "sha256-r1Y+TQLEC4dNxktRaDpP8vnWOha0MFrYsfrqPhV85BA=", + "owner": "Kirottu", + "repo": "system76-scheduler-niri", + "rev": "0ccb6c4d696c8db7c73153d1dcc2b2a2b2a37a84", + "type": "github" + }, + "original": { + "owner": "Kirottu", + "repo": "system76-scheduler-niri", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index fad692f..4377669 100644 --- a/flake.nix +++ b/flake.nix @@ -55,6 +55,10 @@ url = "github:danth/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; + system76-scheduler-niri = { + url = "github:Kirottu/system76-scheduler-niri"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # keep-sorted end # Useful software diff --git a/flake/hosts.nix b/flake/hosts.nix index f9b4232..cc98f65 100644 --- a/flake/hosts.nix +++ b/flake/hosts.nix @@ -15,10 +15,13 @@ let hmModule = { home-manager = { sharedModules = [ + # keep-sorted start + inputs.noctalia.homeModules.default inputs.sops-nix.homeManagerModules.sops inputs.stylix.homeModules.stylix - inputs.noctalia.homeModules.default + inputs.system76-scheduler-niri.homeModules.default inputs.zen.homeModules.beta + # keep-sorted end { stylix.overlays.enable = lib.mkForce false; } @@ -121,12 +124,14 @@ in (lib.mkAliasOptionModule [ "my" "hm" ] [ "home-manager" "users" vars.username ]) # Upstream modules - inputs.sops-nix.nixosModules.sops - inputs.impermanence.nixosModules.impermanence - inputs.home-manager.nixosModules.default - inputs.niri.nixosModules.niri - inputs.catppuccin.nixosModules.catppuccin + # keep-sorted start inputs.angrr.nixosModules.angrr + inputs.catppuccin.nixosModules.catppuccin + inputs.home-manager.nixosModules.default + inputs.impermanence.nixosModules.impermanence + inputs.niri.nixosModules.niri + inputs.sops-nix.nixosModules.sops + # keep-sorted end # pkgs and home-manager configuration pkgsModule diff --git a/modules/desktop/wm/niri/default.nix b/modules/desktop/wm/niri/default.nix index 5b02d0c..3749889 100644 --- a/modules/desktop/wm/niri/default.nix +++ b/modules/desktop/wm/niri/default.nix @@ -15,13 +15,26 @@ in }; config = lib.mkIf cfg.enable { + programs.niri = { + enable = true; + package = pkg; + }; + services.displayManager = { + sddm = { + enable = true; + wayland.enable = true; + }; + }; + security.pam.services.login.enableGnomeKeyring = true; + services.gnome.gnome-keyring.enable = true; my.persist.homeDirs = [ { directory = ".local/share/keyrings"; mode = "0700"; } ]; + xdg.portal = { enable = true; config = { @@ -41,17 +54,9 @@ in }; systemd.user.services.niri-flake-polkit.serviceConfig.ExecStart = lib.mkForce "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; - services.gnome.gnome-keyring.enable = true; - programs.niri = { - enable = true; - package = pkg; - }; - services.displayManager = { - sddm = { - enable = true; - wayland.enable = true; - }; - }; + + services.system76-scheduler.enable = true; + my.hm = { home.packages = with pkgs; [ xwayland-satellite-unstable @@ -68,6 +73,8 @@ in xdg-terminal-exec ]; + services.system76-scheduler-niri.enable = true; + programs.noctalia-shell = { enable = true; systemd.enable = true;