flake.lock

@@ -158,6 +158,22 @@
         "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
       }
     },
+    "flake-compat_7": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -354,11 +370,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720450253,
+        "lastModified": 1719259945,
-        "narHash": "sha256-1in42htN3g3MnE3/AO5Qgs6pMWUzmtPQ7s675brO8uw=",
+        "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "2b6bd3c87d3a66fb0b8f2f06c985995e04b4fb96",
+        "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
         "type": "github"
       },
       "original": {
@@ -369,10 +385,7 @@
     },
     "git-hooks_2": {
       "inputs": {
-        "flake-compat": [
+        "flake-compat": "flake-compat_7",
-          "nixvim",
-          "flake-compat"
-        ],
         "gitignore": "gitignore_2",
         "nixpkgs": [
           "nixvim",
@@ -470,11 +483,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720470846,
+        "lastModified": 1720188602,
-        "narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=",
+        "narHash": "sha256-lC3byBmhVZFzWl/dCic8+cKUEEAXAswWOYjq4paFmbo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192",
+        "rev": "e3582e5151498bc4d757e8361431ace8529e7bb7",
         "type": "github"
       },
       "original": {
@@ -507,11 +520,11 @@
     "neorg": {
       "flake": false,
       "locked": {
-        "lastModified": 1720531316,
+        "lastModified": 1720213524,
-        "narHash": "sha256-vtpra0ub46Y9nIvUQAWJ1sePfPyxBFcFBneAGHDYQok=",
+        "narHash": "sha256-qJTjLp5bCKhoZSUXb8J7cTKLbB7pztQTBeP4MaaujMo=",
         "owner": "nvim-neorg",
         "repo": "neorg",
-        "rev": "db75bb60ba5e565051cf7bb18c8b1a519ed58d3a",
+        "rev": "0255c2de18dc558e320b7424dc3daed6cbe94260",
         "type": "github"
       },
       "original": {
@@ -534,11 +547,11 @@
         "norg-meta": "norg-meta"
       },
       "locked": {
-        "lastModified": 1720578710,
+        "lastModified": 1720217665,
-        "narHash": "sha256-fWyaDs/FIQHFh4j2a9e7OODRa78ovAK7V0UnNWlA4kY=",
+        "narHash": "sha256-o8NvIK0+YZcq/TrK3f0+vxrlOg/kDxan7kgKIWwpBls=",
         "owner": "nvim-neorg",
         "repo": "nixpkgs-neorg-overlay",
-        "rev": "8f13f649b9ce4f5bcdebd14f0a0248ac4e3dba2d",
+        "rev": "f887ecf74846e8b3a47ac5c27d6a20121c6694ab",
         "type": "github"
       },
       "original": {
@@ -575,11 +588,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720483510,
+        "lastModified": 1720161606,
-        "narHash": "sha256-IG/g4l/W0R2M/jxEyu/Sl3BmR/OK5D1jiahpc0wlpvE=",
+        "narHash": "sha256-B0n9ZIrXGPN0oS1DKBYZu2P1fTsnYMmXQkFtj/6mEQ8=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "b6b51915180e6d2eac488d6f882e4ba36bad380d",
+        "rev": "9e1740926b3910db38a8864e0220d012e14f7e8e",
         "type": "github"
       },
       "original": {
@@ -591,11 +604,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1720478486,
+        "lastModified": 1720137094,
-        "narHash": "sha256-66u+yzjk6NrFr2jj2svD3jwNX8P2B8/DNH9A51V4kh8=",
+        "narHash": "sha256-K3iDLJy3K/ivR0uTlu2EXT+zrwMYNRn+CBGo+0kxxoc=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "fb6c059dc55c8d594102937be4dd70f5ff51614a",
+        "rev": "3e6cec0befd41d37ee36cb4f602e84c58c5f0d27",
         "type": "github"
       },
       "original": {
@@ -668,11 +681,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1720515935,
+        "lastModified": 1719895800,
-        "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=",
+        "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "a111ce6b537df12a39874aa9672caa87f8677eda",
+        "rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
         "type": "github"
       },
       "original": {
@@ -690,11 +703,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720428387,
+        "lastModified": 1720188460,
-        "narHash": "sha256-0vHxVNWTql555MZLb2kngrcjfNtsJKoYdyUivTibgnc=",
+        "narHash": "sha256-ydD3UPIPlOkEDStwNxzGwFhAi5vGcobn2EofOmUvKDA=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "30ebd0beb2ed26e09bcd245d757504029f807cce",
+        "rev": "7051b909b9b5e74f19791795bd769de12c5acb3d",
         "type": "github"
       },
       "original": {
@@ -764,11 +777,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1720418205,
+        "lastModified": 1720031269,
-        "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=",
+        "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "655a58a72a6601292512670343087c2d75d859c1",
+        "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
         "type": "github"
       },
       "original": {
@@ -792,11 +805,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1720530938,
+        "lastModified": 1720210105,
-        "narHash": "sha256-kUmpiyPfVFKPPLKfq3p50ddi6MdwcW7g4IqM8b7bRxg=",
+        "narHash": "sha256-AjcTv44xEAOxGqpoMxbfYcUwhCWLHESQIOIMcBFUCKk=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "a5e9dbdef1530a76056db12387d489a68eea6f80",
+        "rev": "367380bd8462419f0199d262b058fadfb43823ff",
         "type": "github"
       },
       "original": {
@@ -848,11 +861,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1720585878,
+        "lastModified": 1720240924,
-        "narHash": "sha256-Ioa3bxQY2Ll7CuT7u0xDNYiCYgJ1OQxsC9AzE2sJXZ8=",
+        "narHash": "sha256-XO61O4liEecHHB85c0K4Iy8iit5WK8OWh9QMgS9CtZA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "ff62716f986058f217f411504e7a63bfb11f243b",
+        "rev": "c33342012b6ef239d05729c8b473c2a83575a9ca",
         "type": "github"
       },
       "original": {

flake.nix

@@ -24,13 +24,6 @@
         "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
@@ -114,14 +107,14 @@
             vars
             // {
               hostName = "odie-dev";
-              domain = "niederkassel.neff-steindesign.de";
+              domain = "niederkasse.neff-steindesign.de";
             };
           system = "x86_64-linux";
         };
     }
     // flake-utils.lib.eachDefaultSystem (system: {
       packages = {
-        neovim-ide = import ./pkgs/nixvim {inherit inputs system flakeLib nixpkgs vars;};
+        neovim-ide = import ./pkgs/nixvim {inherit inputs system flakeLib nixpkgs;};
       };
     });
 

lib/default.nix

@@ -1,5 +1,10 @@
 {
   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;
 }

lib/mkHomeConfiguration.nix

@@ -1,7 +1,6 @@
-{
+moduleInputs @ {
   nixpkgs,
   inputs,
-  outputs,
   flakeLib,
   system,
   vars,
@@ -12,18 +11,14 @@
   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;
-      extraSpecialArgs = {
+      inherit (config) extraSpecialArgs;
-        inherit inputs outputs vars flakeLib;
-        inherit (inputs) nix-colors;
-      };
-      useGlobalPkgs = true;
-      useUserPackages = true;
 
       modules = [
         ../profiles/home-manager/${profile}/home.nix

lib/mkHomeManagerDefaults.nix

@@ -0,0 +1,14 @@
+{
+  inputs,
+  outputs,
+  vars,
+  flakeLib,
+  ...
+}: {
+  extraSpecialArgs = {
+    inherit inputs outputs vars flakeLib;
+    inherit (inputs) nix-colors;
+  };
+  useGlobalPkgs = true;
+  useUserPackages = true;
+}

lib/mkNixVim.nix

@@ -0,0 +1,10 @@
+{
+  pkgs,
+  module,
+  inputs,
+  ...
+}: let
+  nixvim' = inputs.nixvim.legacyPackages.${pkgs.system};
+  nvim = nixvim'.makeNixvimWithModule module;
+in
+  nvim

lib/mkNixVimLib.nix

@@ -0,0 +1,11 @@
+let
+  mkNixVimLib = {
+    inputs,
+    system,
+    ...
+  }: let
+    nixvimLib = inputs.nixvim.lib.${system};
+  in
+    nixvimLib;
+in
+  mkNixVimLib

lib/mkNixVimModule.nix

@@ -0,0 +1,8 @@
+{
+  pkgs,
+  module,
+  extraSpecialArgs ? {},
+  ...
+}: {
+  inherit pkgs module extraSpecialArgs;
+}

lib/mkNixosHomeConfiguration.nix

@@ -0,0 +1,10 @@
+{vars, ...}: let
+  inherit (vars) username hostName;
+  profile = "${username}@${hostName}";
+in {
+  ${username} = {
+    imports = [
+      ../profiles/home-manager/${profile}/home.nix
+    ];
+  };
+}

modules/home-manager/shell/lf/default.nix

@@ -2,7 +2,7 @@
   home = {
     packages = with pkgs; [
       chafa
-      #ctpv
+      ctpv
     ];
     file = {
       ".config/lf/icons" = {

modules/nixos/home-manager/default.nix

@@ -1,28 +1,10 @@
-{
+moduleInputs @ {flakeLib, inputs, ...}: let
-  flakeLib,
+  config = flakeLib.mkHomeManagerDefaults moduleInputs;
-  inputs,
-  outputs,
-  vars,
-  ...
-}: let
-  inherit (vars) username hostName;
-  profile = "${username}@${hostName}";
 in {
   imports = [
     inputs.home-manager.nixosModules.home-manager
   ];
   home-manager = {
-    extraSpecialArgs = {
+    inherit (config) extraSpecialArgs useGlobalPkgs useUserPackages;
-      inherit inputs outputs vars flakeLib;
-      inherit (inputs) nix-colors;
-    };
-    useGlobalPkgs = true;
-    useUserPackages = true;
-
-    users.${username} = {
-      imports = [
-        ../../../profiles/home-manager/${profile}/home.nix
-      ];
-    };
   };
 }

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";}

modules/nixvim/plugins/lsp/languages/php.nix

@@ -1,7 +1,7 @@
 {
   plugins.lsp = {
     servers = {
-      #phpactor.enable = true;
+      phpactor.enable = true;
     };
   };
 }

modules/nixvim/plugins/neorg.nix

@@ -1,4 +1,4 @@
-{vars, ...}: {
+_: {
   plugins.neorg = {
     enable = true;
     modules = {
@@ -12,8 +12,10 @@
       };
       "core.dirman" = {
         config = {
-          inherit (vars.notes) workspaces;
+          workspaces = {
-          default_workspace = "general";
+            notes = "~/Sync/norg/notes";
+          };
+          default_workspace = "notes";
         };
       };
       "core.completion" = {
@@ -38,15 +40,11 @@
       "core.esupports.metagen" = {
         config = {
           type = "auto";
-          author = vars.name;
         };
       };
       "core.integrations.telescope" = {
         __empty = null;
       };
-      "core.ui.calendar" = {
-        __empty = null;
-      };
     };
   };
   keymaps = [
@@ -54,17 +52,5 @@
       key = "<leader>ni";
       action = ":Neorg index<CR>";
     }
-    {
-      key = "<leader>nt";
-      action = ":Neorg toc<CR>";
-    }
-    {
-      key = "<leader>nw";
-      action = ":Telescope neorg switch-workspace<CR>";
-    }
-    {
-      key = "<leader>nc";
-      action = ":Neorg toggle-concealer<CR>";
-    }
   ];
 }

modules/nixvim/plugins/treesitter.nix

@@ -1,9 +1,7 @@
 {
   plugins.treesitter = {
     enable = true;
-    settings = {
+    indent = true;
-      indent.enable = true;
-    };
     folding = true;
   };
 }

modules/nixvim/plugins/trouble.nix

@@ -3,14 +3,28 @@
   keymaps = [
     {
       key = "<leader>xx";
-      action = "<cmd>Trouble diagnostics toggle<CR>";
+      action = "<cmd>TroubleToggle<CR>";
+      options = {
+        silent = true;
+      };
+    }
+    {
+      key = "<leader>xd";
+      action = "<cmd>TroubleToggle document_diagnostics<CR>";
+      options = {
+        silent = true;
+      };
+    }
+    {
+      key = "<leader>xw";
+      action = "<cmd>TroubleToggle workspace_diagnostics<CR>";
       options = {
         silent = true;
       };
     }
     {
       key = "<leader>xq";
-      action = "<cmd>TroubleToggle quickfix toggle<CR>";
+      action = "<cmd>TroubleToggle quickfix<CR>";
       options = {
         silent = true;
       };

pkgs/nixvim/default.nix

@@ -3,10 +3,8 @@
   system,
   inputs,
   flakeLib,
-  vars,
   ...
 }: let
-  nixvim' = inputs.nixvim.legacyPackages.${system};
   pkgs = flakeLib.mkPkgs {
     inherit system nixpkgs;
     overlays = [
@@ -14,12 +12,15 @@
       inputs.neorg-overlay.overlays.default
     ];
   };
-  module = {
+  module = flakeLib.mkNixVimModule {
     inherit pkgs;
     extraSpecialArgs = {
-      inherit inputs vars;
+      inherit inputs;
-    };
+      };
     module = import ../../modules/nixvim;
   };
+  nvim = flakeLib.mkNixVim {
+    inherit pkgs inputs module;
+  };
 in
-  nixvim'.makeNixvimWithModule module
+  nvim

profiles/nixos/wsl-dev/configuration.nix

@@ -1,9 +1,12 @@
 {
+  inputs,
   outputs,
   vars,
+  flakeLib,
   ...
 }: {
   imports = [
+    #inputs.home-manager.nixosModules.home-manager
     outputs.nixosModules.home-manager
     outputs.nixosModules.base
     outputs.nixosModules.wsl
@@ -16,5 +19,11 @@
     inherit (vars) hostName domain;
   };
 
+  home-manager.extraSpecialArgs = {
+    inherit inputs outputs vars;
+  };
+  home-manager.users = flakeLib.mkNixosHomeConfiguration {inherit vars;};
+
+
   system.stateVersion = "23.11";
 }