remove home-manager

flake.lock

@@ -103,27 +103,6 @@
         "type": "github"
       }
     },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1683221986,
-        "narHash": "sha256-n688GK4wO2pZpI4gHOxj/PF85bzUMPEJ8B3Wd3cHSjk=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "f3824311a16cbe70dbaeedc17a97dfcd11901c3f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "master",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "nix-std": {
       "locked": {
         "lastModified": 1652644856,
@@ -194,7 +173,6 @@
         "ci": "ci",
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "nur": "nur",
         "sops-nix": "sops-nix",

flake.nix

@@ -10,10 +10,6 @@
       url = "github:arcnmx/ci/v0.6";
       flake = false;
     };
-    home-manager = {
-      url = "github:nix-community/home-manager/master";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     flake-compat = {
       url = "github:edolstra/flake-compat";
       flake = false;

modules/home/disables.nix

@@ -1,3 +0,0 @@
-{ config, modulesPath, ... }: {
-  disabledModules = map (x: /. + "${toString modulesPath}/${x}") [ "programs/neovim.nix" ];
-}

modules/home/neovim.nix

@@ -1,412 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.programs.neovim;
-
-  jsonFormat = pkgs.formats.json { };
-
-  extraPython3PackageType = mkOptionType {
-    name = "extra-python3-packages";
-    description = "python3 packages in python.withPackages format";
-    check = with types;
-      (x: if isFunction x then isList (x pkgs.python3Packages) else false);
-    merge = mergeOneOption;
-  };
-
-  # Currently, upstream Neovim is pinned on Lua 5.1 for LuaJIT support.
-  # This will need to be updated if Neovim ever migrates to a newer
-  # version of Lua.
-  extraLua51PackageType = mkOptionType {
-    name = "extra-lua51-packages";
-    description = "lua5.1 packages in lua5_1.withPackages format";
-    check = with types;
-      (x: if isFunction x then isList (x pkgs.lua51Packages) else false);
-    merge = mergeOneOption;
-  };
-
-  pluginWithConfigType = types.submodule {
-    options = {
-      config = mkOption {
-        type = types.lines;
-        description =
-          "Script to configure this plugin. The scripting language should match type.";
-        default = "";
-      };
-
-      type = mkOption {
-        type =
-          types.either (types.enum [ "lua" "viml" "teal" "fennel" ]) types.str;
-        description =
-          "Language used in config. Configurations are aggregated per-language.";
-        default = "viml";
-      };
-
-      optional = mkEnableOption "optional" // {
-        description = "Don't load by default (load with :packadd)";
-      };
-
-      plugin = mkOption {
-        type = types.package;
-        description = "vim plugin";
-      };
-    };
-  };
-
-  # A function to get the configuration string (if any) from an element of 'plugins'
-  pluginConfig = p:
-    if p ? plugin && (p.config or "") != "" then ''
-      " ${p.plugin.pname or p.plugin.name} {{{
-      ${p.config}
-      " }}}
-    '' else
-      "";
-
-  allPlugins = cfg.plugins ++ optional cfg.coc.enable {
-    type = "viml";
-    plugin = cfg.coc.package;
-    config = cfg.coc.pluginConfig;
-    optional = false;
-  };
-
-  moduleConfigure = {
-    packages.home-manager = {
-      start = remove null (map
-        (x: if x ? plugin && x.optional == true then null else (x.plugin or x))
-        allPlugins);
-      opt = remove null
-        (map (x: if x ? plugin && x.optional == true then x.plugin else null)
-          allPlugins);
-    };
-    beforePlugins = "";
-  };
-
-  extraMakeWrapperArgs = lib.optionalString (cfg.extraPackages != [ ])
-    ''--suffix PATH : "${lib.makeBinPath cfg.extraPackages}"'';
-  extraMakeWrapperLuaCArgs = lib.optionalString (cfg.extraLuaPackages != [ ]) ''
-    --suffix LUA_CPATH ";" "${
-      lib.concatMapStringsSep ";" pkgs.lua51Packages.getLuaCPath
-      cfg.extraLuaPackages
-    }"'';
-  extraMakeWrapperLuaArgs = lib.optionalString (cfg.extraLuaPackages != [ ]) ''
-    --suffix LUA_PATH ";" "${
-      lib.concatMapStringsSep ";" pkgs.lua51Packages.getLuaPath
-      cfg.extraLuaPackages
-    }"'';
-
-in {
-  imports = [
-    (mkRemovedOptionModule [ "programs" "neovim" "withPython" ]
-      "Python2 support has been removed from neovim.")
-    (mkRemovedOptionModule [ "programs" "neovim" "extraPythonPackages" ]
-      "Python2 support has been removed from neovim.")
-  ];
-
-  options = {
-    programs.neovim = {
-      enable = mkEnableOption "Neovim";
-
-      viAlias = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Symlink <command>vi</command> to <command>nvim</command> binary.
-        '';
-      };
-
-      vimAlias = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Symlink <command>vim</command> to <command>nvim</command> binary.
-        '';
-      };
-
-      vimdiffAlias = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Alias <command>vimdiff</command> to <command>nvim -d</command>.
-        '';
-      };
-
-      withNodeJs = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enable node provider. Set to <literal>true</literal> to
-          use Node plugins.
-        '';
-      };
-
-      withRuby = mkOption {
-        type = types.nullOr types.bool;
-        default = true;
-        description = ''
-          Enable ruby provider.
-        '';
-      };
-
-      withPython3 = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Enable Python 3 provider. Set to <literal>true</literal> to
-          use Python 3 plugins.
-        '';
-      };
-      generatedConfigViml = mkOption {
-        type = types.unspecified;
-        visible = true;
-        readOnly = true;
-        description = ''
-          Generated vimscript config.
-        '';
-      };
-      extraPython3Packages = mkOption {
-        type = with types; either extraPython3PackageType (listOf package);
-        default = (_: [ ]);
-        defaultText = literalExpression "ps: [ ]";
-        example = literalExpression "(ps: with ps; [ python-language-server ])";
-        description = ''
-          A function in python.withPackages format, which returns a
-          list of Python 3 packages required for your plugins to work.
-        '';
-      };
-
-      extraLuaPackages = mkOption {
-        type = with types; either extraLua51PackageType (listOf package);
-        default = [ ];
-        defaultText = literalExpression "[ ]";
-        example = literalExpression "(ps: with ps; [ luautf8 ])";
-        description = ''
-          A function in lua5_1.withPackages format, which returns a
-          list of Lua packages required for your plugins to work.
-        '';
-      };
-
-      generatedConfigs = mkOption {
-        type = types.attrsOf types.lines;
-        visible = true;
-        readOnly = true;
-        example = literalExpression ''
-          {
-            viml = '''
-              " Generated by home-manager
-              set packpath^=/nix/store/cn8vvv4ymxjf8cfzg7db15b2838nqqib-vim-pack-dir
-              set runtimepath^=/nix/store/cn8vvv4ymxjf8cfzg7db15b2838nqqib-vim-pack-dir
-            ''';
-
-            lua = '''
-              -- Generated by home-manager
-              vim.opt.background = "dark"
-            ''';
-          }'';
-        description = ''
-          Generated configurations with as key their language (set via type).
-        '';
-      };
-
-      package = mkOption {
-        type = types.package;
-        default = pkgs.neovim-unwrapped;
-        defaultText = literalExpression "pkgs.neovim-unwrapped";
-        description = "The package to use for the neovim binary.";
-      };
-
-      finalPackage = mkOption {
-        type = types.package;
-        visible = false;
-        readOnly = true;
-        description = "Resulting customized neovim package.";
-      };
-
-      configure = mkOption {
-        type = types.attrsOf types.anything;
-        default = { };
-        example = literalExpression ''
-          configure = {
-              customRC = $''''
-              " here your custom configuration goes!
-              $'''';
-              packages.myVimPackage = with pkgs.vimPlugins; {
-                # loaded on launch
-                start = [ fugitive ];
-                # manually loadable by calling `:packadd $plugin-name`
-                opt = [ ];
-              };
-            };
-        '';
-        description = ''
-          Deprecated. Please use the other options.
-
-          Generate your init file from your list of plugins and custom commands,
-          and loads it from the store via <command>nvim -u /nix/store/hash-vimrc</command>
-
-          </para><para>
-
-          This option is mutually exclusive with <varname>extraConfig</varname>
-          and <varname>plugins</varname>.
-        '';
-      };
-
-      extraConfig = mkOption {
-        type = types.lines;
-        default = "";
-        example = ''
-          set nocompatible
-          set nobackup
-        '';
-        description = ''
-          Custom vimrc lines.
-
-          </para><para>
-
-          This option is mutually exclusive with <varname>configure</varname>.
-        '';
-      };
-
-      extraPackages = mkOption {
-        type = with types; listOf package;
-        default = [ ];
-        example = literalExpression "[ pkgs.shfmt ]";
-        description = "Extra packages available to nvim.";
-      };
-
-      plugins = mkOption {
-        type = with types; listOf (either package pluginWithConfigType);
-        default = [ ];
-        example = literalExpression ''
-          with pkgs.vimPlugins; [
-            yankring
-            vim-nix
-            { plugin = vim-startify;
-              config = "let g:startify_change_to_vcs_root = 0";
-            }
-          ]
-        '';
-        description = ''
-          List of vim plugins to install optionally associated with
-          configuration to be placed in init.vim.
-
-          </para><para>
-
-          This option is mutually exclusive with <varname>configure</varname>.
-        '';
-      };
-
-      coc = {
-        enable = mkEnableOption "Coc";
-
-        package = mkOption {
-          type = types.package;
-          default = pkgs.vimPlugins.coc-nvim;
-          defaultText = literalExpression "pkgs.vimPlugins.coc-nvim";
-          description = "The package to use for the CoC plugin.";
-        };
-
-        settings = mkOption {
-          type = jsonFormat.type;
-          default = { };
-          example = literalExpression ''
-            {
-              "suggest.noselect" = true;
-              "suggest.enablePreview" = true;
-              "suggest.enablePreselect" = false;
-              "suggest.disableKind" = true;
-              languageserver = {
-                haskell = {
-                  command = "haskell-language-server-wrapper";
-                  args = [ "--lsp" ];
-                  rootPatterns = [
-                    "*.cabal"
-                    "stack.yaml"
-                    "cabal.project"
-                    "package.yaml"
-                    "hie.yaml"
-                  ];
-                  filetypes = [ "haskell" "lhaskell" ];
-                };
-              };
-            };
-          '';
-          description = ''
-            Extra configuration lines to add to
-            <filename>$XDG_CONFIG_HOME/nvim/coc-settings.json</filename>
-            See
-            <link xlink:href="https://github.com/neoclide/coc.nvim/wiki/Using-the-configuration-file" />
-            for options.
-          '';
-        };
-
-        pluginConfig = mkOption {
-          type = types.lines;
-          default = "";
-          description = "Script to configure CoC. Must be viml.";
-        };
-      };
-    };
-  };
-
-  config = let
-    # transform all plugins into an attrset
-    pluginsNormalized = map (x:
-      if (x ? plugin) then
-        x
-      else {
-        type = x.type or "viml";
-        plugin = x;
-        config = "";
-        optional = false;
-      }) allPlugins;
-    suppressNotVimlConfig = p:
-      if p.type != "viml" then p // { config = ""; } else p;
-
-    neovimConfig = pkgs.neovimUtils.makeNeovimConfig {
-      inherit (cfg) extraPython3Packages withPython3 withRuby viAlias vimAlias;
-      withNodeJs = cfg.withNodeJs || cfg.coc.enable;
-      configure = cfg.configure // moduleConfigure;
-      plugins = map suppressNotVimlConfig pluginsNormalized;
-      customRC = cfg.extraConfig;
-    };
-
-  in mkIf cfg.enable {
-    warnings = optional (cfg.configure != { }) ''
-      programs.neovim.configure is deprecated.
-      Other programs.neovim options can override its settings or ignore them.
-      Please use the other options at your disposal:
-        configure.packages.*.opt  -> programs.neovim.plugins = [ { plugin = ...; optional = true; }]
-        configure.packages.*.start  -> programs.neovim.plugins = [ { plugin = ...; }]
-        configure.customRC -> programs.neovim.extraConfig
-    '';
-    programs.neovim.generatedConfigViml = neovimConfig;
-    programs.neovim.generatedConfigs = let
-      grouped = lib.lists.groupBy (x: x.type) pluginsNormalized;
-      concatConfigs = lib.concatMapStrings (p: p.config);
-    in mapAttrs (name: vals: concatConfigs vals) grouped;
-
-    home.packages = [ cfg.finalPackage ];
-
-    xdg.configFile."nvim/lua/init-home-manager.lua" =
-      mkIf (hasAttr "lua" config.programs.neovim.generatedConfigs) {
-        text = config.programs.neovim.generatedConfigs.lua;
-      };
-    xdg.configFile."nvim/coc-settings.json" = mkIf cfg.coc.enable {
-      source = jsonFormat.generate "coc-settings.json" cfg.coc.settings;
-    };
-
-    programs.neovim.finalPackage = pkgs.wrapNeovimUnstable cfg.package
-      (neovimConfig // {
-        wrapperArgs = (lib.escapeShellArgs neovimConfig.wrapperArgs) + " "
-          + extraMakeWrapperArgs + " " + extraMakeWrapperLuaCArgs + " "
-          + extraMakeWrapperLuaArgs;
-        wrapRc = false;
-      });
-
-    programs.bash.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
-    programs.fish.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
-    programs.zsh.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
-  };
-}

modules/meta/network.nix

@@ -86,9 +86,7 @@ with lib; {
   config.network = {
     nixos = {
       extraModules = [
-        inputs.home-manager.nixosModules.home-manager
         meta.modules.nixos
-        meta.system
       ];
       specialArgs = {
         inherit (config.network) nodes;

system/home.nix

@@ -1,20 +0,0 @@
-{
-  meta,
-  config,
-  lib,
-  inputs,
-  ...
-}:
-with lib; {
-  home-manager = {
-    extraSpecialArgs = {
-      inherit inputs meta;
-      nixos = config;
-    };
-    sharedModules = [
-      meta.modules.home
-    ];
-    useUserPackages = true;
-    useGlobalPkgs = true;
-  };
-}

system/root.nix

@@ -1,3 +0,0 @@
-{ config, meta, lib, ... }: {
-  home-manager.users.root.home.stateVersion = "20.09";
-}

tree.nix

@@ -50,19 +50,11 @@
             ]);
         };
       };
-      "modules/home" = {
-        functor = {
-          external = [
-            (import (inputs.arcexprs + "/modules")).home-manager
-          ];
-        };
-      };
       "modules/nixos".functor.enable = true;
       "modules/meta".functor.enable = true;
       "modules/system".functor.enable = true;
       "modules/home".functor.enable = true;
       "modules/type".functor.enable = true;
-      "nixos/systems".functor.enable = false;
       "nixos/*".functor = {
         enable = true;
       };