diff --git a/modules/deprecations.nix b/modules/deprecations.nix index 4dc5283b5..b2d30ad36 100644 --- a/modules/deprecations.nix +++ b/modules/deprecations.nix @@ -1,6 +1,11 @@ { lib, ... }: { imports = [ + (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. + '') + (lib.mkRemovedOptionModule [ "services" "password-store-sync" ] '' Use services.git-sync instead. '') diff --git a/modules/misc/news/2025/10/2025-10-27_00-33-43.nix b/modules/misc/news/2025/10/2025-10-27_00-33-43.nix deleted file mode 100644 index 45b526437..000000000 --- a/modules/misc/news/2025/10/2025-10-27_00-33-43.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - time = "2025-10-26T23:33:43+00:00"; - condition = true; - message = '' - A new module is available: 'programs.glab'. - - `glab` is an open source GitLab CLI tool that brings GitLab to your terminal. - ''; -} diff --git a/modules/programs/glab.nix b/modules/programs/glab.nix deleted file mode 100644 index 525456dc4..000000000 --- a/modules/programs/glab.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - cfg = config.programs.glab; - - yaml = pkgs.formats.yaml { }; - -in -{ - meta.maintainers = [ lib.maintainers.bmrips ]; - - options.programs.glab = { - enable = lib.mkEnableOption "{command}`glab`."; - package = lib.mkPackageOption pkgs "glab" { nullable = true; }; - aliases = lib.mkOption { - type = with lib.types; attrsOf str; - default = { }; - description = "Aliases written to {file}`$XDG_CONFIG_HOME/glab-cli/aliases.yml`."; - example.co = "mr checkout"; - }; - settings = lib.mkOption { - inherit (yaml) type; - default = { }; - description = "Configuration written to {file}`$XDG_CONFIG_HOME/glab-cli/config.yml`."; - example.check_update = false; - }; - }; - - config = lib.mkIf cfg.enable { - home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; - - # Use `systemd-tmpfiles` since glab requires its configuration file to have - # mode 0600. - systemd.user.tmpfiles.rules = - let - target = "${config.xdg.configHome}/glab-cli/config.yml"; - in - lib.mkIf (cfg.settings != { }) [ - "C+ ${target} - - - - ${yaml.generate "glab-config" cfg.settings}" - "z ${target} 0600" - ]; - - xdg.configFile."glab-cli/aliases.yml" = lib.mkIf (cfg.aliases != { }) { - source = yaml.generate "glab-aliases" cfg.aliases; - }; - }; -} diff --git a/tests/modules/programs/glab/aliases.nix b/tests/modules/programs/glab/aliases.nix deleted file mode 100644 index 3bb451189..000000000 --- a/tests/modules/programs/glab/aliases.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, ... }: - -{ - programs.glab = { - enable = true; - aliases.co = "mr checkout"; - }; - - nmt.script = '' - aliasesFile=home-files/.config/glab-cli/aliases.yml - assertFileExists $aliasesFile - assertFileContent $aliasesFile ${pkgs.writeText "glab-aliases.expected" '' - co: mr checkout - ''} - ''; -} diff --git a/tests/modules/programs/glab/default.nix b/tests/modules/programs/glab/default.nix deleted file mode 100644 index b89488ef9..000000000 --- a/tests/modules/programs/glab/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - glab-aliases = ./aliases.nix; -}