From bcdd748e9afa533244ca67e6df5ba29bdac2be20 Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 11 May 2023 23:26:32 +0200 Subject: [PATCH] chore: apply nil suggestions --- flake.nix | 6 +++--- home/apps/kubernetes.nix | 5 ++--- home/apps/neovim/lazy-lock.json | 36 +++++++++++++++---------------- home/apps/neovim/lua/lsp/init.lua | 2 +- home/apps/neovim/lua/lsp/yaml.lua | 0 home/secrets/sops.nix | 6 +----- machines/bento/default.nix | 6 +----- machines/bento/hardware.nix | 1 - machines/common/linux/network.nix | 4 ---- machines/sashimi/default.nix | 5 ----- 10 files changed, 26 insertions(+), 45 deletions(-) delete mode 100644 home/apps/neovim/lua/lsp/yaml.lua diff --git a/flake.nix b/flake.nix index c4ab0ee..a1221c6 100644 --- a/flake.nix +++ b/flake.nix @@ -84,7 +84,7 @@ in { nixosConfigurations = { - "futomaki" = nixpkgs.lib.nixosSystem rec { + "futomaki" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ home-manager.nixosModules.home-manager @@ -96,7 +96,7 @@ }) ]; }; - "bento" = nixpkgs.lib.nixosSystem rec { + "bento" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ home-manager.nixosModules.home-manager @@ -110,7 +110,7 @@ }; }; darwinConfigurations = { - "sashimi" = darwin.lib.darwinSystem rec { + "sashimi" = darwin.lib.darwinSystem { system = "aarch64-darwin"; modules = [ home-manager.darwinModules.home-manager diff --git a/home/apps/kubernetes.nix b/home/apps/kubernetes.nix index 209cb92..710e808 100644 --- a/home/apps/kubernetes.nix +++ b/home/apps/kubernetes.nix @@ -4,6 +4,7 @@ ... }: { home.packages = with pkgs; [ + (wrapHelm kubernetes-helm {plugins = [kubernetes-helmPlugins.helm-diff];}) cmctl dyff gojq @@ -13,9 +14,7 @@ kubectl kubectx kubepug - (wrapHelm kubernetes-helm { - plugins = [kubernetes-helmPlugins.helm-diff]; - }) + kubeseal minikube popeye pv-migrate diff --git a/home/apps/neovim/lazy-lock.json b/home/apps/neovim/lazy-lock.json index 15283fe..79c317b 100644 --- a/home/apps/neovim/lazy-lock.json +++ b/home/apps/neovim/lazy-lock.json @@ -1,10 +1,10 @@ { - "alpha-nvim": { "branch": "main", "commit": "89eaa18a472be680539dee5977e2255f4dbd0738" }, + "alpha-nvim": { "branch": "main", "commit": "1838ae926e8d49fe5330d1498ee8289ae2c340bc" }, "asyncrun.vim": { "branch": "master", "commit": "7191d0c30dd105e5d7f897b9a6ee19cabe734466" }, "asynctasks.vim": { "branch": "master", "commit": "784a4b1f75a913cc6c43dd6c4dbe69d648dbbfa5" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "a02ff9ee4630dd8e81dc097b486b7c7f468b9db7" }, - "bufferline.nvim": { "branch": "main", "commit": "41660189da6951d14436147dff30ed7f0d12ed01" }, - "catppuccin": { "branch": "main", "commit": "af8390217cb0b3b714dfd30ebd09264cf33a37be" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "79a614f12ec21f99123c61a9b85e441238455113" }, + "bufferline.nvim": { "branch": "main", "commit": "018bdf61a97e00caeff05d16977437c63018762e" }, + "catppuccin": { "branch": "main", "commit": "57b421ee5f7380f816791fa451e86f213b625ece" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "5af1bb7d722ef8a96658f01d6eb219c4cf746b32" }, "cmp-git": { "branch": "main", "commit": "a798a25b21e7204597f56029af2e8a17d65e2518" }, @@ -12,39 +12,39 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" }, "comment.nvim": { "branch": "master", "commit": "e1fe53117aab24c378d5e6deaad786789c360123" }, - "copilot.lua": { "branch": "master", "commit": "8b0fd23747ef82154ef9f919c75623156465cc89" }, + "copilot.lua": { "branch": "master", "commit": "653bbdc44cd569a5fd0617e5a9d3df2b1359e230" }, "diffview.nvim": { "branch": "main", "commit": "8c1702470fd5186cb401b21f9bf8bdfad6d5cc87" }, "dressing.nvim": { "branch": "master", "commit": "540d6e7115fb32b5035ddaf0c1a26cbffb855dac" }, "editorconfig.nvim": { "branch": "master", "commit": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, "friendly-snippets": { "branch": "main", "commit": "10f741908e56ce47cf6b3440e3f04b4fdc0da2f2" }, - "gitsigns.nvim": { "branch": "main", "commit": "e5edefd9976039f5352e0c900f35206770b33a2d" }, - "go.nvim": { "branch": "master", "commit": "40684d1ee04baabb0beb8119f4ffd0eea8faf8a0" }, + "gitsigns.nvim": { "branch": "main", "commit": "814158f6c4b1724c039fcefe79b0be72c9131c2d" }, + "go.nvim": { "branch": "master", "commit": "b119217e8324f13a2be12935f5d2d15a1df09b09" }, "guihua.lua": { "branch": "master", "commit": "ab8b1f09603cc268770efd057115035dc6cfa83d" }, "headlines.nvim": { "branch": "master", "commit": "ddef41b2664f0ce25fe76520d708e2dc9dfebd70" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "83a625f5c884a3ceee821ce54a812c8321ecba31" }, + "lazy.nvim": { "branch": "main", "commit": "652b6febf8d5c99eb8cf4a1cec63da6db62e77d2" }, "lightspeed.nvim": { "branch": "main", "commit": "299eefa6a9e2d881f1194587c573dad619fdb96f" }, "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" }, "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, "ltex-extra.nvim": { "branch": "master", "commit": "3ceb2401ab70c132305b3dba4dcb418d97b567ad" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, - "neogit": { "branch": "master", "commit": "d7c66e5e8752e0cc76336a78c4432648cf3102e1" }, - "neorg": { "branch": "main", "commit": "71652b5f4fe2475df34f1bd7a41cba833bf6c5b6" }, - "null-ls.nvim": { "branch": "main", "commit": "71797bb303ac99a4435592e15068f127970513d7" }, + "neogit": { "branch": "master", "commit": "917fb24c9b7e0506ebfa94ccdbeaaea5eff2f916" }, + "neorg": { "branch": "main", "commit": "cc2834ae2beb2d5baa75d15848a94dae022faa2c" }, + "null-ls.nvim": { "branch": "main", "commit": "08bb00c7c2cd58c72e02cf54e4b9cbfe14b03e09" }, "nvim-autopairs": { "branch": "master", "commit": "7747bbae60074acf0b9e3a4c13950be7a2dff444" }, - "nvim-cmp": { "branch": "main", "commit": "1cad30fcffa282c0a9199c524c821eadc24bf939" }, + "nvim-cmp": { "branch": "main", "commit": "935b4069ce73b60ba9075bf05ee6ab50ed3af1a9" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, "nvim-dap": { "branch": "master", "commit": "6cedcb527e264c8f25e86afa8dae74c6692dee51" }, - "nvim-dap-ui": { "branch": "master", "commit": "749bfe12d1447703899fa823c1c075fbe2d42c24" }, + "nvim-dap-ui": { "branch": "master", "commit": "078972d39338a49ec13fc43a44e235cc43189276" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "ab988dbb7d20cdaebf9b3ef7554a89f6895de042" }, - "nvim-lspconfig": { "branch": "master", "commit": "5ba7ab746d814413c84ed98c0214c71cd28f130a" }, - "nvim-navic": { "branch": "master", "commit": "83dc174da915f9dbc9b51169e9b62a2e0d42b527" }, + "nvim-lspconfig": { "branch": "master", "commit": "84717430fb6f51c9e9cc8d63da10cceafc91500c" }, + "nvim-navic": { "branch": "master", "commit": "15704c607569d6c5cfeab486d3ef9459645a70ce" }, "nvim-spectre": { "branch": "master", "commit": "46b9883c0760db6547f152dc97a651611ba6486d" }, "nvim-surround": { "branch": "main", "commit": "219bd66585aa467b1c90fd01b54a2a423aaed4ab" }, "nvim-tree.lua": { "branch": "master", "commit": "270c95556cad96d18ca547d86ae65927334b108b" }, - "nvim-treesitter": { "branch": "master", "commit": "12453e0e3d2e82a4ae813f1540315c7cf2df2363" }, + "nvim-treesitter": { "branch": "master", "commit": "73c7af9cdbce9330eeb9771639c86269f6d7cf9d" }, "nvim-ts-autotag": { "branch": "main", "commit": "40615e96075c743ef47aaf9de966dc348bec6459" }, "nvim-ts-rainbow2": { "branch": "master", "commit": "1ffe68cdd594633dfee0762feebfef81ed6f1fbb" }, "nvim-web-devicons": { "branch": "master", "commit": "986875b7364095d6535e28bd4aac3a9357e91bbe" }, @@ -53,7 +53,7 @@ "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" }, "py_lsp.nvim": { "branch": "main", "commit": "5b2bd6433a2dbab76d54d58ccc1d1e89b220091c" }, "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" }, - "schemastore.nvim": { "branch": "main", "commit": "b8e6c7d966857e8ff14d9b6a23eec9214d99db32" }, + "schemastore.nvim": { "branch": "main", "commit": "301471a8611494ceb7255003bc9d3c6fb8584009" }, "stabilize.nvim": { "branch": "master", "commit": "eeb1873daffaba67246188a5668b366e45ed1de1" }, "telescope-asynctasks.nvim": { "branch": "main", "commit": "065300fb0a8ba6a1c81991da1873c73e136dcdc0" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "4054a5d0ab85475bf75df00cf10754d2e54b5532" }, @@ -72,5 +72,5 @@ "vim-helm": { "branch": "master", "commit": "c2e7b85711d410e1d73e64eb5df7b70b1c4c10eb" }, "vim-table-mode": { "branch": "master", "commit": "9555a3e6e5bcf285ec181b7fc983eea90500feb4" }, "vim-vsnip": { "branch": "master", "commit": "7753ba9c10429c29d25abfd11b4c60b76718c438" }, - "which-key.nvim": { "branch": "main", "commit": "af8f26bfbb61b5f722c9fbc72b296dc9db0bcfdc" } + "which-key.nvim": { "branch": "main", "commit": "015fdf3e3e052d4a9fee997ca0aa387c2dd3731c" } } \ No newline at end of file diff --git a/home/apps/neovim/lua/lsp/init.lua b/home/apps/neovim/lua/lsp/init.lua index ea06db5..9168e6c 100644 --- a/home/apps/neovim/lua/lsp/init.lua +++ b/home/apps/neovim/lua/lsp/init.lua @@ -140,7 +140,7 @@ local on_attach = function(client, bufnr) end, bufopts) vim.keymap.set("n", "D", vim.lsp.buf.type_definition, bufopts) vim.keymap.set("n", "rn", vim.lsp.buf.rename, bufopts) - vim.keymap.set("n", "ca", vim.lsp.buf.code_action, bufopts) + vim.keymap.set({ "n", "v" }, "ca", vim.lsp.buf.code_action, bufopts) vim.keymap.set("n", "gr", vim.lsp.buf.references, bufopts) vim.keymap.set("n", "lr", "LspRestart", bufopts) vim.keymap.set("n", "]d", vim.diagnostic.goto_next, bufopts) diff --git a/home/apps/neovim/lua/lsp/yaml.lua b/home/apps/neovim/lua/lsp/yaml.lua deleted file mode 100644 index e69de29..0000000 diff --git a/home/secrets/sops.nix b/home/secrets/sops.nix index 1364d4a..943530d 100644 --- a/home/secrets/sops.nix +++ b/home/secrets/sops.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{config, ...}: { sops = { gnupg.home = config.programs.gpg.homedir; defaultSopsFile = ./main.yaml; diff --git a/machines/bento/default.nix b/machines/bento/default.nix index ca90053..fc8543f 100644 --- a/machines/bento/default.nix +++ b/machines/bento/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: let +{pkgs, ...}: let mainUser = "w"; in { imports = [ diff --git a/machines/bento/hardware.nix b/machines/bento/hardware.nix index c47f075..ba3a065 100644 --- a/machines/bento/hardware.nix +++ b/machines/bento/hardware.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { diff --git a/machines/common/linux/network.nix b/machines/common/linux/network.nix index caddae9..9cddf78 100644 --- a/machines/common/linux/network.nix +++ b/machines/common/linux/network.nix @@ -1,8 +1,4 @@ { - lib, - pkgs, - ... -}: { services = { dnsmasq = { enable = true; diff --git a/machines/sashimi/default.nix b/machines/sashimi/default.nix index ca0be97..ddc754d 100644 --- a/machines/sashimi/default.nix +++ b/machines/sashimi/default.nix @@ -1,9 +1,4 @@ { - config, - lib, - pkgs, - ... -}: { imports = [ ./brew.nix ];