From c975a66a56306b38eaa3108f54bbc11e213f42f6 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Thu, 9 Apr 2026 11:30:35 +0200 Subject: [PATCH] niriswitcher: remove module The upstream project has been archived. --- .github/labeler.yml | 1 - modules/deprecations.nix | 5 ++ modules/lib/maintainers.nix | 6 -- modules/programs/niriswitcher.nix | 88 ------------------- .../modules/programs/niriswitcher/default.nix | 4 - .../programs/niriswitcher/expected.toml | 12 --- .../programs/niriswitcher/niriswitcher.nix | 30 ------- tests/modules/programs/niriswitcher/style.css | 7 -- 8 files changed, 5 insertions(+), 148 deletions(-) delete mode 100644 modules/programs/niriswitcher.nix delete mode 100644 tests/modules/programs/niriswitcher/default.nix delete mode 100644 tests/modules/programs/niriswitcher/expected.toml delete mode 100644 tests/modules/programs/niriswitcher/niriswitcher.nix delete mode 100644 tests/modules/programs/niriswitcher/style.css diff --git a/.github/labeler.yml b/.github/labeler.yml index c1499a6fd..40692bb55 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -660,7 +660,6 @@ - modules/programs/fuzzel.nix - modules/programs/hyprlock.nix - modules/programs/kickoff.nix - - modules/programs/niriswitcher.nix - modules/programs/onagre.nix - modules/programs/sway-easyfocus.nix - modules/programs/swaylock.nix diff --git a/modules/deprecations.nix b/modules/deprecations.nix index b2d30ad36..2ef83f27c 100644 --- a/modules/deprecations.nix +++ b/modules/deprecations.nix @@ -1,6 +1,11 @@ { lib, ... }: { imports = [ + (lib.mkRemovedOptionModule [ "programs" "niriswitcher" "enable" ] '' + The niriswitcher module has been removed because the upstream project + has been archived. + '') + (lib.mkRemovedOptionModule [ "programs" "glab" "enable" ] '' The glab module has been removed because changes are needed upstream to support mixing declarative and stateful configurations. See #8066. diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix index 3441b0a55..a794ae76c 100644 --- a/modules/lib/maintainers.nix +++ b/modules/lib/maintainers.nix @@ -517,12 +517,6 @@ github = "silmarp"; githubId = 67292496; }; - vortriz = { - name = "Rishi Vora"; - email = "vorarishi22+nix@gmail.com"; - github = "Vortriz"; - githubId = 97402159; - }; zorrobert = { name = "zorrobert"; email = "118135271+zorrobert@users.noreply.github.com"; diff --git a/modules/programs/niriswitcher.nix b/modules/programs/niriswitcher.nix deleted file mode 100644 index b1b8443e0..000000000 --- a/modules/programs/niriswitcher.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.programs.niriswitcher; - - settingsFormat = pkgs.formats.toml { }; -in -{ - meta.maintainers = [ lib.hm.maintainers.vortriz ]; - - options.programs.niriswitcher = { - enable = lib.mkEnableOption "niriswitcher, an application switcher for niri"; - - package = lib.mkPackageOption pkgs "niriswitcher" { nullable = true; }; - - settings = lib.mkOption { - type = lib.types.nullOr settingsFormat.type; - default = null; - example = lib.literalExpression '' - { - keys = { - modifier = "Super"; - switch = { - next = "Tab"; - prev = "Shift+Tab"; - }; - }; - center_on_focus = true; - appearance = { - system_theme = "dark"; - icon_size = 64; - }; - } - ''; - description = '' - niriswitcher configuration. - For available settings see . - ''; - }; - - style = lib.mkOption { - type = with lib.types; nullOr (either path lines); - default = null; - example = '' - .application-name { - opacity: 1; - color: rgba(255, 255, 255, 0.6); - } - .application.selected .application-name { - color: rgba(255, 255, 255, 1); - } - ''; - description = '' - CSS style of the switcher. - - for the documentation. - - If the value is set to a path literal, then the path will be used as the CSS file. - ''; - }; - }; - - config = lib.mkIf cfg.enable { - assertions = [ - (lib.hm.assertions.assertPlatform "programs.niriswitcher" pkgs lib.platforms.linux) - ]; - - home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; - - xdg.configFile = { - "niriswitcher/config.toml" = lib.mkIf (cfg.settings != null) { - source = settingsFormat.generate "config.toml" cfg.settings; - }; - - "niriswitcher/style.css" = lib.mkIf (cfg.style != null) { - source = - if builtins.isPath cfg.style || lib.isStorePath cfg.style then - cfg.style - else - pkgs.writeText "niriswitcher/style.css" cfg.style; - }; - }; - }; -} diff --git a/tests/modules/programs/niriswitcher/default.nix b/tests/modules/programs/niriswitcher/default.nix deleted file mode 100644 index 42cf668f7..000000000 --- a/tests/modules/programs/niriswitcher/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ lib, pkgs, ... }: -lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { - niriswitcher-program = ./niriswitcher.nix; -} diff --git a/tests/modules/programs/niriswitcher/expected.toml b/tests/modules/programs/niriswitcher/expected.toml deleted file mode 100644 index 956cc1246..000000000 --- a/tests/modules/programs/niriswitcher/expected.toml +++ /dev/null @@ -1,12 +0,0 @@ -center_on_focus = true - -[appearance] -icon_size = 64 -system_theme = "dark" - -[keys] -modifier = "Super" - -[keys.switch] -next = "Tab" -prev = "Shift+Tab" diff --git a/tests/modules/programs/niriswitcher/niriswitcher.nix b/tests/modules/programs/niriswitcher/niriswitcher.nix deleted file mode 100644 index 3ebd60b5e..000000000 --- a/tests/modules/programs/niriswitcher/niriswitcher.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - programs.niriswitcher = { - enable = true; - - settings = { - center_on_focus = true; - keys = { - modifier = "Super"; - switch = { - next = "Tab"; - prev = "Shift+Tab"; - }; - }; - appearance = { - system_theme = "dark"; - icon_size = 64; - }; - }; - - style = ./style.css; - }; - - nmt.script = '' - assertFileExists home-files/.config/niriswitcher/config.toml - assertFileContent home-files/.config/niriswitcher/config.toml ${./expected.toml} - - assertFileExists home-files/.config/niriswitcher/style.css - assertFileContent home-files/.config/niriswitcher/style.css ${./style.css} - ''; -} diff --git a/tests/modules/programs/niriswitcher/style.css b/tests/modules/programs/niriswitcher/style.css deleted file mode 100644 index cf5d12e67..000000000 --- a/tests/modules/programs/niriswitcher/style.css +++ /dev/null @@ -1,7 +0,0 @@ -.application-name { - opacity: 1; - color: rgba(255, 255, 255, 0.6); -} -.application.selected .application-name { - color: rgba(255, 255, 255, 1); -}