From 14329a9a5de0def79493086dbc280442cdf71d10 Mon Sep 17 00:00:00 2001 From: oddlama Date: Mon, 4 Sep 2023 16:43:57 +0200 Subject: [PATCH] refactor: move full neovim config to only myuser --- modules/config/microvms.nix | 3 +-- users/common/default.nix | 3 +-- users/common/modules/minimal.nix | 5 ---- .../common/{neovim/minimal.nix => neovim.nix} | 0 users/common/neovim/default.nix | 23 ------------------- users/myuser/default.nix | 10 ++------ users/myuser/graphical/default.nix | 4 ++++ users/myuser/neovim/default.nix | 15 ++++++++++++ users/{common => myuser}/neovim/init.lua | 0 .../{common => myuser}/neovim/lua/keymaps.lua | 0 .../{common => myuser}/neovim/lua/options.lua | 0 .../neovim/lua/plugins/alpha.lua | 0 .../neovim/lua/plugins/cmp.lua | 0 .../neovim/lua/plugins/gitsigns.lua | 0 .../neovim/lua/plugins/lspconfig.lua | 0 .../neovim/lua/plugins/neo-tree.lua | 0 .../neovim/lua/plugins/others.lua | 0 .../neovim/lua/plugins/telescope.lua | 0 .../neovim/lua/plugins/treesitter.lua | 0 users/{common => myuser}/neovim/lua/todo | 0 .../neovim/lua/utils/bootstrap.lua | 0 .../neovim/lua/utils/icons.lua | 0 22 files changed, 23 insertions(+), 40 deletions(-) delete mode 100644 users/common/modules/minimal.nix rename users/common/{neovim/minimal.nix => neovim.nix} (100%) delete mode 100644 users/common/neovim/default.nix create mode 100644 users/myuser/neovim/default.nix rename users/{common => myuser}/neovim/init.lua (100%) rename users/{common => myuser}/neovim/lua/keymaps.lua (100%) rename users/{common => myuser}/neovim/lua/options.lua (100%) rename users/{common => myuser}/neovim/lua/plugins/alpha.lua (100%) rename users/{common => myuser}/neovim/lua/plugins/cmp.lua (100%) rename users/{common => myuser}/neovim/lua/plugins/gitsigns.lua (100%) rename users/{common => myuser}/neovim/lua/plugins/lspconfig.lua (100%) rename users/{common => myuser}/neovim/lua/plugins/neo-tree.lua (100%) rename users/{common => myuser}/neovim/lua/plugins/others.lua (100%) rename users/{common => myuser}/neovim/lua/plugins/telescope.lua (100%) rename users/{common => myuser}/neovim/lua/plugins/treesitter.lua (100%) rename users/{common => myuser}/neovim/lua/todo (100%) rename users/{common => myuser}/neovim/lua/utils/bootstrap.lua (100%) rename users/{common => myuser}/neovim/lua/utils/icons.lua (100%) diff --git a/modules/config/microvms.nix b/modules/config/microvms.nix index df2f957..c71c5e5 100644 --- a/modules/config/microvms.nix +++ b/modules/config/microvms.nix @@ -1,8 +1,7 @@ { # If the host defines microvms, ensure that our modules and - # some boilerplate is imported automatically. + # boilerplate stuff is imported automatically. meta.microvms.commonImports = [ ../. - {home-manager.users.root.home.minimal = true;} ]; } diff --git a/users/common/default.nix b/users/common/default.nix index 908c9cf..5a4f923 100644 --- a/users/common/default.nix +++ b/users/common/default.nix @@ -1,11 +1,10 @@ {pkgs, ...}: { imports = [ ./modules/uid.nix - ./modules/minimal.nix ./git.nix ./htop.nix - ./neovim + ./neovim.nix ./shell ./utils.nix ]; diff --git a/users/common/modules/minimal.nix b/users/common/modules/minimal.nix deleted file mode 100644 index cd19e84..0000000 --- a/users/common/modules/minimal.nix +++ /dev/null @@ -1,5 +0,0 @@ -{lib, ...}: { - options = { - home.minimal = lib.mkEnableOption "minimal setup only (e.g. for virtual machines)"; - }; -} diff --git a/users/common/neovim/minimal.nix b/users/common/neovim.nix similarity index 100% rename from users/common/neovim/minimal.nix rename to users/common/neovim.nix diff --git a/users/common/neovim/default.nix b/users/common/neovim/default.nix deleted file mode 100644 index 39cb353..0000000 --- a/users/common/neovim/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: { - imports = [ - ./minimal.nix - ]; - - config = lib.mkIf (!config.home.minimal) { - programs.neovim = { - withPython3 = true; - extraPython3Packages = pyPkgs: with pyPkgs; [openai]; - withNodeJs = true; - }; - xdg.configFile = { - "nvim/lua".source = ./lua; - "nvim/init.lua".source = ./init.lua; - }; - home.packages = with pkgs; [gcc shellcheck stylua]; - }; -} diff --git a/users/myuser/default.nix b/users/myuser/default.nix index 3eaf145..ac5cd9b 100644 --- a/users/myuser/default.nix +++ b/users/myuser/default.nix @@ -16,9 +16,7 @@ in { inherit (config.repo.secrets.global.myuser) hashedPassword; createHome = true; group = myuser; - extraGroups = - ["wheel" "input" "video"] - ++ lib.optionals config.sound.enable ["audio"]; + extraGroups = ["wheel" "input" "video"]; isNormalUser = true; autoSubUidGidRange = false; shell = pkgs.zsh; @@ -69,6 +67,7 @@ in { imports = [ ../common ./graphical + ./neovim ./dev.nix ./gpg.nix @@ -78,11 +77,6 @@ in { home = { inherit (config.users.users.${myuser}) uid; username = config.users.users.${myuser}.name; - # TODO this shall be moved! - shellAliases = { - p = "cd ~/projects"; - zf = "zathura --fork"; - }; }; }; } diff --git a/users/myuser/graphical/default.nix b/users/myuser/graphical/default.nix index e30a5a9..553df7e 100644 --- a/users/myuser/graphical/default.nix +++ b/users/myuser/graphical/default.nix @@ -44,6 +44,10 @@ # TODO mouse speed # TODO persist tmp malte ddelete. # TODO ncdu + home.shellAliases = { + p = "cd ~/projects"; + zf = "zathura --fork"; + }; # Needed to fix cursors in firefox under wayland, see https://github.com/NixOS/nixpkgs/issues/207339#issuecomment-1374497558 gtk = { diff --git a/users/myuser/neovim/default.nix b/users/myuser/neovim/default.nix new file mode 100644 index 0000000..45472ce --- /dev/null +++ b/users/myuser/neovim/default.nix @@ -0,0 +1,15 @@ +{pkgs, ...}: { + programs.neovim = { + withPython3 = true; + extraPython3Packages = pyPkgs: with pyPkgs; [openai]; + withNodeJs = true; + }; + + xdg.configFile = { + "nvim/lua".source = ./lua; + "nvim/init.lua".source = ./init.lua; + }; + + # TODO NO! NO! all of this goes away + home.packages = with pkgs; [gcc shellcheck stylua]; +} diff --git a/users/common/neovim/init.lua b/users/myuser/neovim/init.lua similarity index 100% rename from users/common/neovim/init.lua rename to users/myuser/neovim/init.lua diff --git a/users/common/neovim/lua/keymaps.lua b/users/myuser/neovim/lua/keymaps.lua similarity index 100% rename from users/common/neovim/lua/keymaps.lua rename to users/myuser/neovim/lua/keymaps.lua diff --git a/users/common/neovim/lua/options.lua b/users/myuser/neovim/lua/options.lua similarity index 100% rename from users/common/neovim/lua/options.lua rename to users/myuser/neovim/lua/options.lua diff --git a/users/common/neovim/lua/plugins/alpha.lua b/users/myuser/neovim/lua/plugins/alpha.lua similarity index 100% rename from users/common/neovim/lua/plugins/alpha.lua rename to users/myuser/neovim/lua/plugins/alpha.lua diff --git a/users/common/neovim/lua/plugins/cmp.lua b/users/myuser/neovim/lua/plugins/cmp.lua similarity index 100% rename from users/common/neovim/lua/plugins/cmp.lua rename to users/myuser/neovim/lua/plugins/cmp.lua diff --git a/users/common/neovim/lua/plugins/gitsigns.lua b/users/myuser/neovim/lua/plugins/gitsigns.lua similarity index 100% rename from users/common/neovim/lua/plugins/gitsigns.lua rename to users/myuser/neovim/lua/plugins/gitsigns.lua diff --git a/users/common/neovim/lua/plugins/lspconfig.lua b/users/myuser/neovim/lua/plugins/lspconfig.lua similarity index 100% rename from users/common/neovim/lua/plugins/lspconfig.lua rename to users/myuser/neovim/lua/plugins/lspconfig.lua diff --git a/users/common/neovim/lua/plugins/neo-tree.lua b/users/myuser/neovim/lua/plugins/neo-tree.lua similarity index 100% rename from users/common/neovim/lua/plugins/neo-tree.lua rename to users/myuser/neovim/lua/plugins/neo-tree.lua diff --git a/users/common/neovim/lua/plugins/others.lua b/users/myuser/neovim/lua/plugins/others.lua similarity index 100% rename from users/common/neovim/lua/plugins/others.lua rename to users/myuser/neovim/lua/plugins/others.lua diff --git a/users/common/neovim/lua/plugins/telescope.lua b/users/myuser/neovim/lua/plugins/telescope.lua similarity index 100% rename from users/common/neovim/lua/plugins/telescope.lua rename to users/myuser/neovim/lua/plugins/telescope.lua diff --git a/users/common/neovim/lua/plugins/treesitter.lua b/users/myuser/neovim/lua/plugins/treesitter.lua similarity index 100% rename from users/common/neovim/lua/plugins/treesitter.lua rename to users/myuser/neovim/lua/plugins/treesitter.lua diff --git a/users/common/neovim/lua/todo b/users/myuser/neovim/lua/todo similarity index 100% rename from users/common/neovim/lua/todo rename to users/myuser/neovim/lua/todo diff --git a/users/common/neovim/lua/utils/bootstrap.lua b/users/myuser/neovim/lua/utils/bootstrap.lua similarity index 100% rename from users/common/neovim/lua/utils/bootstrap.lua rename to users/myuser/neovim/lua/utils/bootstrap.lua diff --git a/users/common/neovim/lua/utils/icons.lua b/users/myuser/neovim/lua/utils/icons.lua similarity index 100% rename from users/common/neovim/lua/utils/icons.lua rename to users/myuser/neovim/lua/utils/icons.lua