From 9f587b692460a14e5a3f3f1a289110dd2a1795b7 Mon Sep 17 00:00:00 2001 From: Mike Vink Date: Mon, 9 Oct 2023 16:10:56 +0000 Subject: fixup --- flake.lock | 102 ++++++++++++++++++++++++++++++++++++++++---- flake.nix | 1 - profiles/core/meta.nix | 8 ++++ profiles/core/neovim.nix | 89 ++++++++++++++++++++++++++++++++++++++ profiles/station/meta.nix | 8 ---- profiles/station/neovim.nix | 89 -------------------------------------- 6 files changed, 191 insertions(+), 106 deletions(-) create mode 100644 profiles/core/meta.nix create mode 100644 profiles/core/neovim.nix delete mode 100644 profiles/station/meta.nix delete mode 100644 profiles/station/neovim.nix diff --git a/flake.lock b/flake.lock index 6346544..4f4b540 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,39 @@ { "nodes": { + "flake-compat": { + "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-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -20,18 +54,38 @@ "type": "github" } }, + "nixos-wsl": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1696867472, + "narHash": "sha256-L/PRTyWz5rZ1V6v1MPh3xWndlna9qNHLmNu8x3Y5+xg=", + "owner": "ivi-vink", + "repo": "NixOS-WSL", + "rev": "5939bc5ae845f629d74985668aede2055a9bc08b", + "type": "github" + }, + "original": { + "owner": "ivi-vink", + "repo": "NixOS-WSL", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1695644571, - "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", - "owner": "nixos", + "lastModified": 1696697597, + "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", + "rev": "5a237aecb57296f67276ac9ab296a41c23981f56", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -53,6 +107,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1695644571, + "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1694760568, "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=", @@ -71,13 +141,14 @@ "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nixos-wsl": "nixos-wsl", + "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -93,6 +164,21 @@ "repo": "sops-nix", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c5611fa..dead2a0 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,6 @@ ] ++ (attrValues (attrsets.mergeAttrsList (map modulesIn [ ./profiles/core - ./profiles/station ]))); }; diff --git a/profiles/core/meta.nix b/profiles/core/meta.nix new file mode 100644 index 0000000..3f1d334 --- /dev/null +++ b/profiles/core/meta.nix @@ -0,0 +1,8 @@ +{inputs,lib,config, ...}: with lib; { + lib.meta = { + configPath = "${config.users.users.mike.home}/flake"; + mkMutableSymlink = path: + config.hm.lib.file.mkOutOfStoreSymlink + (config.lib.meta.configPath + removePrefix (toString inputs.self) (toString path)); + }; +} diff --git a/profiles/core/neovim.nix b/profiles/core/neovim.nix new file mode 100644 index 0000000..5cca7f0 --- /dev/null +++ b/profiles/core/neovim.nix @@ -0,0 +1,89 @@ +{ + inputs, + config, + pkgs, + ... +}: { + hm = { + xdg = { + configFile = with config.lib.meta; { + "nvim".source = mkMutableSymlink /mut/neovim; + }; + }; + + editorconfig = { + enable = true; + settings = { + "*" = { + trim_trailing_whitespace = true; + insert_final_newline = true; + }; + "*.yaml" = { + indent_style = "space"; + indent_size = 2; + }; + }; + }; + + programs.neovim = { + enable = true; + package = pkgs.neovim-unwrapped; + viAlias = true; + vimAlias = true; + extraPackages = with pkgs; [ + bashInteractive + sumneko-lua-language-server + pyright + gopls + fennel + fnlfmt + alejandra + statix + ]; + plugins = with pkgs.vimPlugins; [ + # highlighting + nvim-treesitter.withAllGrammars + nvim-treesitter-context + playground + gruvbox-material + kanagawa-nvim + lsp_lines-nvim + gitsigns-nvim + vim-helm + + # external + vim-dirvish + vim-fugitive + vim-oscyank + venn-nvim + gv-vim + + # Coding + plenary-nvim + telescope-nvim + nvim-lspconfig + null-ls-nvim + lsp_signature-nvim + nvim-dap + nvim-dap-ui + luasnip + vim-test + vim-rest-console + + # cmp + nvim-cmp + cmp-cmdline + cmp-nvim-lsp + cmp-buffer + cmp-path + cmp_luasnip + + # trying out lisp + conjure + vim-racket + nvim-parinfer + hotpot-nvim + ]; + }; + }; +} diff --git a/profiles/station/meta.nix b/profiles/station/meta.nix deleted file mode 100644 index 3f1d334..0000000 --- a/profiles/station/meta.nix +++ /dev/null @@ -1,8 +0,0 @@ -{inputs,lib,config, ...}: with lib; { - lib.meta = { - configPath = "${config.users.users.mike.home}/flake"; - mkMutableSymlink = path: - config.hm.lib.file.mkOutOfStoreSymlink - (config.lib.meta.configPath + removePrefix (toString inputs.self) (toString path)); - }; -} diff --git a/profiles/station/neovim.nix b/profiles/station/neovim.nix deleted file mode 100644 index 5cca7f0..0000000 --- a/profiles/station/neovim.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - inputs, - config, - pkgs, - ... -}: { - hm = { - xdg = { - configFile = with config.lib.meta; { - "nvim".source = mkMutableSymlink /mut/neovim; - }; - }; - - editorconfig = { - enable = true; - settings = { - "*" = { - trim_trailing_whitespace = true; - insert_final_newline = true; - }; - "*.yaml" = { - indent_style = "space"; - indent_size = 2; - }; - }; - }; - - programs.neovim = { - enable = true; - package = pkgs.neovim-unwrapped; - viAlias = true; - vimAlias = true; - extraPackages = with pkgs; [ - bashInteractive - sumneko-lua-language-server - pyright - gopls - fennel - fnlfmt - alejandra - statix - ]; - plugins = with pkgs.vimPlugins; [ - # highlighting - nvim-treesitter.withAllGrammars - nvim-treesitter-context - playground - gruvbox-material - kanagawa-nvim - lsp_lines-nvim - gitsigns-nvim - vim-helm - - # external - vim-dirvish - vim-fugitive - vim-oscyank - venn-nvim - gv-vim - - # Coding - plenary-nvim - telescope-nvim - nvim-lspconfig - null-ls-nvim - lsp_signature-nvim - nvim-dap - nvim-dap-ui - luasnip - vim-test - vim-rest-console - - # cmp - nvim-cmp - cmp-cmdline - cmp-nvim-lsp - cmp-buffer - cmp-path - cmp_luasnip - - # trying out lisp - conjure - vim-racket - nvim-parinfer - hotpot-nvim - ]; - }; - }; -} -- cgit v1.2.3