From d5bbb09e780526803183ab06103b4b8797a5fb72 Mon Sep 17 00:00:00 2001 From: Patrick Neff Date: Wed, 10 Jul 2024 06:53:49 +0200 Subject: [PATCH] simplify nixvim --- flake.nix | 11 +++++++++-- lib/default.nix | 5 ----- lib/mkHomeConfiguration.nix | 11 ++++++++--- lib/mkHomeManagerDefaults.nix | 14 -------------- lib/mkNixVim.nix | 10 ---------- lib/mkNixVimLib.nix | 11 ----------- lib/mkNixVimModule.nix | 8 -------- lib/mkNixosHomeConfiguration.nix | 10 ---------- modules/nixos/home-manager/default.nix | 24 +++++++++++++++++++++--- modules/nixvim/plugins/lsp/cmp.nix | 2 +- modules/nixvim/plugins/neorg.nix | 24 +++++++++++++++++++----- modules/nixvim/plugins/trouble.nix | 18 ++---------------- pkgs/nixvim/default.nix | 13 ++++++------- profiles/nixos/wsl-dev/configuration.nix | 9 --------- 14 files changed, 66 insertions(+), 104 deletions(-) delete mode 100644 lib/mkHomeManagerDefaults.nix delete mode 100644 lib/mkNixVim.nix delete mode 100644 lib/mkNixVimLib.nix delete mode 100644 lib/mkNixVimModule.nix delete mode 100644 lib/mkNixosHomeConfiguration.nix diff --git a/flake.nix b/flake.nix index 757f697..16d728d 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,13 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINs89u4Kvwlmq67eV+H/n+x9M8gsKDxQU+dCPSEb2vJe odie" ]; domain = "odie.home.arpa"; + notes = rec { + root = "${homeDirectory}/Notes/"; + workspaces = { + general = "${root}/general"; + games = "${root}/games"; + }; + }; }; overlays = [ inputs.nixvim.overlays.default @@ -107,14 +114,14 @@ vars // { hostName = "odie-dev"; - domain = "niederkasse.neff-steindesign.de"; + domain = "niederkassel.neff-steindesign.de"; }; system = "x86_64-linux"; }; } // flake-utils.lib.eachDefaultSystem (system: { packages = { - neovim-ide = import ./pkgs/nixvim {inherit inputs system flakeLib nixpkgs;}; + neovim-ide = import ./pkgs/nixvim {inherit inputs system flakeLib nixpkgs vars;}; }; }); diff --git a/lib/default.nix b/lib/default.nix index 6a9de84..2f47775 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,10 +1,5 @@ { mkPkgs = import ./mkPkgs.nix; - mkNixVim = import ./mkNixVim.nix; - mkNixVimLib = import ./mkNixVimLib.nix; - mkNixVimModule = import ./mkNixVimModule.nix; mkNixosConfiguration = import ./mkNixosConfiguration.nix; mkHomeConfiguration = import ./mkHomeConfiguration.nix; - mkHomeManagerDefaults = import ./mkHomeManagerDefaults.nix; - mkNixosHomeConfiguration = import ./mkNixosHomeConfiguration.nix; } diff --git a/lib/mkHomeConfiguration.nix b/lib/mkHomeConfiguration.nix index b237e0a..554f4a4 100644 --- a/lib/mkHomeConfiguration.nix +++ b/lib/mkHomeConfiguration.nix @@ -1,6 +1,7 @@ -moduleInputs @ { +{ nixpkgs, inputs, + outputs, flakeLib, system, vars, @@ -11,14 +12,18 @@ moduleInputs @ { profile = "${username}@${hostName}"; in { ${profile} = let - config = flakeLib.mkHomeManagerDefaults moduleInputs; pkgs = flakeLib.mkPkgs { inherit nixpkgs system overlays; }; in inputs.home-manager.lib.homeManagerConfiguration { inherit pkgs; - inherit (config) extraSpecialArgs; + extraSpecialArgs = { + inherit inputs outputs vars flakeLib; + inherit (inputs) nix-colors; + }; + useGlobalPkgs = true; + useUserPackages = true; modules = [ ../profiles/home-manager/${profile}/home.nix diff --git a/lib/mkHomeManagerDefaults.nix b/lib/mkHomeManagerDefaults.nix deleted file mode 100644 index 12d2aaa..0000000 --- a/lib/mkHomeManagerDefaults.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - inputs, - outputs, - vars, - flakeLib, - ... -}: { - extraSpecialArgs = { - inherit inputs outputs vars flakeLib; - inherit (inputs) nix-colors; - }; - useGlobalPkgs = true; - useUserPackages = true; -} diff --git a/lib/mkNixVim.nix b/lib/mkNixVim.nix deleted file mode 100644 index aa532c9..0000000 --- a/lib/mkNixVim.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - pkgs, - module, - inputs, - ... -}: let - nixvim' = inputs.nixvim.legacyPackages.${pkgs.system}; - nvim = nixvim'.makeNixvimWithModule module; -in - nvim diff --git a/lib/mkNixVimLib.nix b/lib/mkNixVimLib.nix deleted file mode 100644 index 1c79704..0000000 --- a/lib/mkNixVimLib.nix +++ /dev/null @@ -1,11 +0,0 @@ -let - mkNixVimLib = { - inputs, - system, - ... - }: let - nixvimLib = inputs.nixvim.lib.${system}; - in - nixvimLib; -in - mkNixVimLib diff --git a/lib/mkNixVimModule.nix b/lib/mkNixVimModule.nix deleted file mode 100644 index 897e923..0000000 --- a/lib/mkNixVimModule.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pkgs, - module, - extraSpecialArgs ? {}, - ... -}: { - inherit pkgs module extraSpecialArgs; -} diff --git a/lib/mkNixosHomeConfiguration.nix b/lib/mkNixosHomeConfiguration.nix deleted file mode 100644 index 15fdeb0..0000000 --- a/lib/mkNixosHomeConfiguration.nix +++ /dev/null @@ -1,10 +0,0 @@ -{vars, ...}: let - inherit (vars) username hostName; - profile = "${username}@${hostName}"; -in { - ${username} = { - imports = [ - ../profiles/home-manager/${profile}/home.nix - ]; - }; -} diff --git a/modules/nixos/home-manager/default.nix b/modules/nixos/home-manager/default.nix index de40e67..721e661 100644 --- a/modules/nixos/home-manager/default.nix +++ b/modules/nixos/home-manager/default.nix @@ -1,10 +1,28 @@ -moduleInputs @ {flakeLib, inputs, ...}: let - config = flakeLib.mkHomeManagerDefaults moduleInputs; +{ + flakeLib, + inputs, + outputs, + vars, + ... +}: let + inherit (vars) username hostName; + profile = "${username}@${hostName}"; in { imports = [ inputs.home-manager.nixosModules.home-manager ]; home-manager = { - inherit (config) extraSpecialArgs useGlobalPkgs useUserPackages; + extraSpecialArgs = { + inherit inputs outputs vars flakeLib; + inherit (inputs) nix-colors; + }; + useGlobalPkgs = true; + useUserPackages = true; + + users.${username} = { + imports = [ + ../../../profiles/home-manager/${profile}/home.nix + ]; + }; }; } diff --git a/modules/nixvim/plugins/lsp/cmp.nix b/modules/nixvim/plugins/lsp/cmp.nix index 96e1d5e..d733223 100644 --- a/modules/nixvim/plugins/lsp/cmp.nix +++ b/modules/nixvim/plugins/lsp/cmp.nix @@ -69,11 +69,11 @@ ''; completion.completeopt = "menu,preview"; sources = [ + {name = "luasnip";} {name = "nvim_lsp";} {name = "nvim_lsp_signature_help";} {name = "nvim_lsp_document_symbol";} {name = "codeium";} - {name = "luasnip";} {name = "path";} {name = "buffer";} {name = "treesitter";} diff --git a/modules/nixvim/plugins/neorg.nix b/modules/nixvim/plugins/neorg.nix index 0e70720..24e342c 100644 --- a/modules/nixvim/plugins/neorg.nix +++ b/modules/nixvim/plugins/neorg.nix @@ -1,4 +1,4 @@ -_: { +{vars, ...}: { plugins.neorg = { enable = true; modules = { @@ -12,10 +12,8 @@ _: { }; "core.dirman" = { config = { - workspaces = { - notes = "~/Sync/norg/notes"; - }; - default_workspace = "notes"; + inherit (vars.notes) workspaces; + default_workspace = "general"; }; }; "core.completion" = { @@ -40,11 +38,15 @@ _: { "core.esupports.metagen" = { config = { type = "auto"; + author = vars.name; }; }; "core.integrations.telescope" = { __empty = null; }; + "core.ui.calendar" = { + __empty = null; + }; }; }; keymaps = [ @@ -52,5 +54,17 @@ _: { key = "ni"; action = ":Neorg index"; } + { + key = "nt"; + action = ":Neorg toc"; + } + { + key = "nw"; + action = ":Telescope neorg switch-workspace"; + } + { + key = "nc"; + action = ":Neorg toggle-concealer"; + } ]; } diff --git a/modules/nixvim/plugins/trouble.nix b/modules/nixvim/plugins/trouble.nix index b92e519..93f01dd 100644 --- a/modules/nixvim/plugins/trouble.nix +++ b/modules/nixvim/plugins/trouble.nix @@ -3,28 +3,14 @@ keymaps = [ { key = "xx"; - action = "TroubleToggle"; - options = { - silent = true; - }; - } - { - key = "xd"; - action = "TroubleToggle document_diagnostics"; - options = { - silent = true; - }; - } - { - key = "xw"; - action = "TroubleToggle workspace_diagnostics"; + action = "Trouble diagnostics toggle"; options = { silent = true; }; } { key = "xq"; - action = "TroubleToggle quickfix"; + action = "TroubleToggle quickfix toggle"; options = { silent = true; }; diff --git a/pkgs/nixvim/default.nix b/pkgs/nixvim/default.nix index b10b74e..543aad5 100644 --- a/pkgs/nixvim/default.nix +++ b/pkgs/nixvim/default.nix @@ -3,8 +3,10 @@ system, inputs, flakeLib, + vars, ... }: let + nixvim' = inputs.nixvim.legacyPackages.${system}; pkgs = flakeLib.mkPkgs { inherit system nixpkgs; overlays = [ @@ -12,15 +14,12 @@ inputs.neorg-overlay.overlays.default ]; }; - module = flakeLib.mkNixVimModule { + module = { inherit pkgs; extraSpecialArgs = { - inherit inputs; - }; + inherit inputs vars; + }; module = import ../../modules/nixvim; }; - nvim = flakeLib.mkNixVim { - inherit pkgs inputs module; - }; in - nvim + nixvim'.makeNixvimWithModule module diff --git a/profiles/nixos/wsl-dev/configuration.nix b/profiles/nixos/wsl-dev/configuration.nix index 168c44d..dde5f6d 100644 --- a/profiles/nixos/wsl-dev/configuration.nix +++ b/profiles/nixos/wsl-dev/configuration.nix @@ -1,12 +1,9 @@ { - inputs, outputs, vars, - flakeLib, ... }: { imports = [ - #inputs.home-manager.nixosModules.home-manager outputs.nixosModules.home-manager outputs.nixosModules.base outputs.nixosModules.wsl @@ -19,11 +16,5 @@ inherit (vars) hostName domain; }; - home-manager.extraSpecialArgs = { - inherit inputs outputs vars; - }; - home-manager.users = flakeLib.mkNixosHomeConfiguration {inherit vars;}; - - system.stateVersion = "23.11"; }