diff options
| author | Mike Vink <mike1994vink@gmail.com> | 2023-10-13 19:23:05 +0000 |
|---|---|---|
| committer | Mike Vink <mike1994vink@gmail.com> | 2023-10-13 19:24:15 +0000 |
| commit | 4396dcc62119ea96e648bdf637ed785c224d3f03 (patch) | |
| tree | 26ebfbc3e778d4d69a6372705066e0eecf67cc33 | |
| parent | 36bec51e58c092a7bacb26ce4a0105f1470805bc (diff) | |
switch to nixosModules
| -rw-r--r-- | flake.nix | 19 | ||||
| -rw-r--r-- | mut/neovim/fnl/conf/init.fnl | 4 | ||||
| -rw-r--r-- | profiles/core/configuration.nix | 1 |
3 files changed, 10 insertions, 14 deletions
@@ -42,17 +42,14 @@ ]))); }; - nixosConfigurations.core = extraModules: nixpkgs.lib.nixosSystem { - inherit lib system; - specialArgs = {inherit inputs;}; - modules = extraModules ++ [ - ({config, ... }: { - nixpkgs.overlays = with lib; [(composeManyExtensions [ - (import ./overlays/vimPlugins.nix {inherit pkgs;}) - ])]; - }) - ./profiles/station/k8s.nix - ] ++ (attrValues + nixosModules.core = { ... }: { + imports = [ + ({config, ... }: { + nixpkgs.overlays = with lib; [(composeManyExtensions [ + (import ./overlays/vimPlugins.nix {inherit pkgs;}) + ])]; + }) + ] ++ (attrValues (attrsets.mergeAttrsList (map modulesIn [ ./profiles/core ]))); diff --git a/mut/neovim/fnl/conf/init.fnl b/mut/neovim/fnl/conf/init.fnl index bea2f4d..80393c5 100644 --- a/mut/neovim/fnl/conf/init.fnl +++ b/mut/neovim/fnl/conf/init.fnl @@ -86,8 +86,8 @@ (local is-qf (= (vim.opt_local.buftype:get) "quickfix")) (vim.fn.setqflist [] :a {: id : title : lines}) (if (or - (not is-qf?) - (and is-at-last-line is-qf?)) + (not is-qf) + (and is-at-last-line is-qf)) (vim.cmd ":cbottom"))))) (var last_job nil) diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix index 55ce7cb..5c3c270 100644 --- a/profiles/core/configuration.nix +++ b/profiles/core/configuration.nix @@ -28,7 +28,6 @@ curl pinentry-curses gnused - gnugrep htop dnsutils iputils |