diff --git a/flake.lock b/flake.lock index a61b038..27967f7 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", "type": "github" }, "original": { @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1729010169, - "narHash": "sha256-AjgIlXcreagCs6ltT8mzI1UYEiYgfhlwe4Tl3taxQSU=", + "lastModified": 1727977578, + "narHash": "sha256-DBORKcmQ7ZjA4qE1MsnF1MmZSokOGrw4W9vTCioOv2U=", "owner": "nix-community", "repo": "disko", - "rev": "9ab6ae4e632016caac1c7e82e15b12b8c672ed76", + "rev": "574400001b3ffe555c7a21e0ff846230759be2ed", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "lastModified": 1727805723, + "narHash": "sha256-b8flytpuc4Ey/g3mcvpS/ICORcD4h56QDZeP5LogevY=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "rev": "2f5ae3fc91db865eff2c5a418da85a0fbe6238a3", "type": "github" }, "original": { @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1728903686, - "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", + "lastModified": 1728041527, + "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", + "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "type": "github" }, "original": { @@ -310,11 +310,11 @@ ] }, "locked": { - "lastModified": 1728903686, - "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", "type": "github" }, "original": { @@ -352,11 +352,11 @@ ] }, "locked": { - "lastModified": 1728901530, - "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", + "lastModified": 1727707210, + "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", + "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1728056216, + "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", "type": "github" }, "original": { @@ -382,11 +382,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728909085, - "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", "type": "github" }, "original": { @@ -443,11 +443,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1729015933, - "narHash": "sha256-raKxsI2SGe/vF2PvzFatd/Sl9eVUCuCUUVg7cINFVbQ=", + "lastModified": 1727871072, + "narHash": "sha256-t+YLQwBB1soQnVjT6d7nQq4Tidaw7tpB8i6Zvpc+Zbs=", "owner": "nix-community", "repo": "nixvim", - "rev": "429f2e8d1aa61181c0ec72bdafe022fbb6a092d6", + "rev": "0ca98d02104f7f0a703787a7a080a570b7f1bedd", "type": "github" }, "original": { @@ -465,11 +465,11 @@ ] }, "locked": { - "lastModified": 1728905062, - "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=", + "lastModified": 1727599661, + "narHash": "sha256-0R+1ih0Rfqrz/lcduvpNSnUw3uthUHiaGh0aWPyIqeQ=", "owner": "NuschtOS", "repo": "search", - "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84", + "rev": "c3c3928b8de7d300c34e9d90fdc19febd1a32062", "type": "github" }, "original": { @@ -507,11 +507,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1728900372, - "narHash": "sha256-hmG/u7qZEm7CTh1XPDi+pg4Oi0nNrv7sL8PgZDRe6wg=", + "lastModified": 1727723275, + "narHash": "sha256-k4HrG8TJQ0RqDS1tlDz71kvWFBNQ7qZI9T5Z0qLR85Y=", "owner": "danth", "repo": "stylix", - "rev": "33a2eff15181e557bb6dd9d2073b90f7d218975d", + "rev": "e7e97059776da7e34b739415a7bc8f80f606b803", "type": "github" }, "original": { @@ -569,17 +569,16 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, @@ -607,11 +606,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1727431250, + "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", "type": "github" }, "original": { diff --git a/users/willifan/common/nixvim/TODO.md b/users/willifan/common/nixvim/TODO.md deleted file mode 100644 index 3b11825..0000000 --- a/users/willifan/common/nixvim/TODO.md +++ /dev/null @@ -1,18 +0,0 @@ -# Settings -add line numbers -change default tab width -KEYBINDS - -# Plugins -add cmp -try out nvimtree -add lualine -make ToggleTerm not terrible -add autopairs -indent blankline?? -todo comments -undo tree -bufferline? -startup? -KEYBINDS - diff --git a/users/willifan/common/nixvim/default.nix b/users/willifan/common/nixvim/default.nix index 77ff57c..ff1ee24 100644 --- a/users/willifan/common/nixvim/default.nix +++ b/users/willifan/common/nixvim/default.nix @@ -7,15 +7,12 @@ }; imports = [ - ./filetype.nix ./gitsigns.nix ./illuminate.nix ./lsp.nix ./navic.nix ./neotree.nix ./toggleterm.nix - ./treesitter.nix - ./whichkey.nix ./yazi.nix ]; diff --git a/users/willifan/common/nixvim/filetype.nix b/users/willifan/common/nixvim/filetype.nix deleted file mode 100644 index 590653e..0000000 --- a/users/willifan/common/nixvim/filetype.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ ... }: -{ - - programs.nixvim.files = { - "ftplugin/nix.lua" = { - opts = { - expandtab = true; - shiftwidth = 2; - tabstop = 2; - }; - }; - }; - -} diff --git a/users/willifan/common/nixvim/lsp.nix b/users/willifan/common/nixvim/lsp.nix index b029b2f..fdbeced 100644 --- a/users/willifan/common/nixvim/lsp.nix +++ b/users/willifan/common/nixvim/lsp.nix @@ -4,19 +4,42 @@ plugins = { lsp-lines = {enable = true;}; lsp-format = {enable = true;}; + helm = {enable = true;}; lsp = { enable = true; inlayHints = true; servers = { - clangd = {enable = true;}; html = {enable = true;}; lua-ls = {enable = true;}; + nil-ls = {enable = true;}; + marksman = {enable = true;}; nixd = {enable = true;}; pyright = {enable = true;}; gopls = {enable = true;}; + terraformls = {enable = true;}; + ansiblels = {enable = true;}; jsonls = {enable = true;}; - rust-analyzer = {enable = true;}; - yamlls = {enable = true;}; + yamlls = { + enable = true; + extraOptions = { + settings = { + yaml = { + schemas = { + kubernetes = "'*.yaml"; + "http://json.schemastore.org/github-workflow" = ".github/workflows/*"; + "http://json.schemastore.org/github-action" = ".github/action.{yml,yaml}"; + "http://json.schemastore.org/ansible-stable-2.9" = "roles/tasks/*.{yml,yaml}"; + "http://json.schemastore.org/kustomization" = "kustomization.{yml,yaml}"; + "http://json.schemastore.org/ansible-playbook" = "*play*.{yml,yaml}"; + "http://json.schemastore.org/chart" = "Chart.{yml,yaml}"; + "https://json.schemastore.org/dependabot-v2" = ".github/dependabot.{yml,yaml}"; + "https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json" = "*docker-compose*.{yml,yaml}"; + "https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json" = "*flow*.{yml,yaml}"; + }; + }; + }; + }; + }; }; keymaps = { diff --git a/users/willifan/common/nixvim/treesitter.nix b/users/willifan/common/nixvim/treesitter.nix deleted file mode 100644 index 6b00293..0000000 --- a/users/willifan/common/nixvim/treesitter.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: -{ - programs.nixvim.plugins = { - treesitter = { - enable = true; - settings = { - indent.enable = true; - highlight.enable = true; - }; - }; - }; - -} diff --git a/users/willifan/common/nixvim/whichkey.nix b/users/willifan/common/nixvim/whichkey.nix deleted file mode 100644 index 0ff9e24..0000000 --- a/users/willifan/common/nixvim/whichkey.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ ... }: -{ - - programs.nixvim.plugins = { - which-key = { - enable = true; - }; - }; - -} diff --git a/users/willifan/common/shell/bash.nix b/users/willifan/common/shell/bash.nix index 753765e..ece7fb5 100644 --- a/users/willifan/common/shell/bash.nix +++ b/users/willifan/common/shell/bash.nix @@ -5,9 +5,6 @@ programs = { bash = { enable = true; - shellAliases = { - ls = "eza"; - }; }; starship = { enableBashIntegration = true; diff --git a/users/willifan/common/theme/stylix.nix b/users/willifan/common/theme/stylix.nix index 5131f9e..57d16da 100644 --- a/users/willifan/common/theme/stylix.nix +++ b/users/willifan/common/theme/stylix.nix @@ -30,7 +30,7 @@ # }; monospace = { package = pkgs.nerdfonts; - name = "JetBrainsMono Nerd Font"; + name = "JetBrainsMonoNerdFont-Regular"; }; # sansSerif = { # package = pkgs.;