From ede1e5f9de1bd4bc9786c398d6ef9813b23bb3ee Mon Sep 17 00:00:00 2001 From: willifan Date: Sun, 13 Oct 2024 16:32:44 +0200 Subject: [PATCH 1/8] configured bash to alias ls to eza --- users/willifan/common/shell/bash.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/users/willifan/common/shell/bash.nix b/users/willifan/common/shell/bash.nix index ece7fb5..753765e 100644 --- a/users/willifan/common/shell/bash.nix +++ b/users/willifan/common/shell/bash.nix @@ -5,6 +5,9 @@ programs = { bash = { enable = true; + shellAliases = { + ls = "eza"; + }; }; starship = { enableBashIntegration = true; From f793853c279ef410b7628ab2d535900de9648635 Mon Sep 17 00:00:00 2001 From: willifan Date: Sun, 13 Oct 2024 17:01:54 +0200 Subject: [PATCH 2/8] added nvim treesitter --- users/willifan/common/nixvim/default.nix | 1 + users/willifan/common/nixvim/treesitter.nix | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 users/willifan/common/nixvim/treesitter.nix diff --git a/users/willifan/common/nixvim/default.nix b/users/willifan/common/nixvim/default.nix index ff1ee24..dde131c 100644 --- a/users/willifan/common/nixvim/default.nix +++ b/users/willifan/common/nixvim/default.nix @@ -13,6 +13,7 @@ ./navic.nix ./neotree.nix ./toggleterm.nix + ./treesitter.nix ./yazi.nix ]; diff --git a/users/willifan/common/nixvim/treesitter.nix b/users/willifan/common/nixvim/treesitter.nix new file mode 100644 index 0000000..6b00293 --- /dev/null +++ b/users/willifan/common/nixvim/treesitter.nix @@ -0,0 +1,13 @@ +{ ... }: +{ + programs.nixvim.plugins = { + treesitter = { + enable = true; + settings = { + indent.enable = true; + highlight.enable = true; + }; + }; + }; + +} From 489d2fc47e8225041a88bfb4ee5b5fdf99d9c40e Mon Sep 17 00:00:00 2001 From: willifan Date: Sun, 13 Oct 2024 17:50:59 +0200 Subject: [PATCH 3/8] cleaned up and improved lsp config --- users/willifan/common/nixvim/lsp.nix | 29 +++------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/users/willifan/common/nixvim/lsp.nix b/users/willifan/common/nixvim/lsp.nix index fdbeced..b029b2f 100644 --- a/users/willifan/common/nixvim/lsp.nix +++ b/users/willifan/common/nixvim/lsp.nix @@ -4,42 +4,19 @@ 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;}; - 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}"; - }; - }; - }; - }; - }; + rust-analyzer = {enable = true;}; + yamlls = {enable = true;}; }; keymaps = { From f74eba64e27c7f4e54971bd84760fb185742c71e Mon Sep 17 00:00:00 2001 From: willifan Date: Sun, 13 Oct 2024 18:49:48 +0200 Subject: [PATCH 4/8] added which-key --- users/willifan/common/nixvim/default.nix | 1 + users/willifan/common/nixvim/whichkey.nix | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 users/willifan/common/nixvim/whichkey.nix diff --git a/users/willifan/common/nixvim/default.nix b/users/willifan/common/nixvim/default.nix index dde131c..7ae14a5 100644 --- a/users/willifan/common/nixvim/default.nix +++ b/users/willifan/common/nixvim/default.nix @@ -14,6 +14,7 @@ ./neotree.nix ./toggleterm.nix ./treesitter.nix + ./whichkey.nix ./yazi.nix ]; diff --git a/users/willifan/common/nixvim/whichkey.nix b/users/willifan/common/nixvim/whichkey.nix new file mode 100644 index 0000000..0ff9e24 --- /dev/null +++ b/users/willifan/common/nixvim/whichkey.nix @@ -0,0 +1,10 @@ +{ ... }: +{ + + programs.nixvim.plugins = { + which-key = { + enable = true; + }; + }; + +} From d72dfd8881778b098e995e86a4818736b70767ce Mon Sep 17 00:00:00 2001 From: willifan Date: Sun, 13 Oct 2024 23:30:07 +0200 Subject: [PATCH 5/8] fix stylix monospace font --- users/willifan/common/theme/stylix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/willifan/common/theme/stylix.nix b/users/willifan/common/theme/stylix.nix index 57d16da..5131f9e 100644 --- a/users/willifan/common/theme/stylix.nix +++ b/users/willifan/common/theme/stylix.nix @@ -30,7 +30,7 @@ # }; monospace = { package = pkgs.nerdfonts; - name = "JetBrainsMonoNerdFont-Regular"; + name = "JetBrainsMono Nerd Font"; }; # sansSerif = { # package = pkgs.; From fdef44481d722806be4fd7e828a88683feaed65d Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 15 Oct 2024 16:15:48 +0200 Subject: [PATCH 6/8] added filetype config to nixvim --- users/willifan/common/nixvim/default.nix | 1 + users/willifan/common/nixvim/filetype.nix | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 users/willifan/common/nixvim/filetype.nix diff --git a/users/willifan/common/nixvim/default.nix b/users/willifan/common/nixvim/default.nix index 7ae14a5..77ff57c 100644 --- a/users/willifan/common/nixvim/default.nix +++ b/users/willifan/common/nixvim/default.nix @@ -7,6 +7,7 @@ }; imports = [ + ./filetype.nix ./gitsigns.nix ./illuminate.nix ./lsp.nix diff --git a/users/willifan/common/nixvim/filetype.nix b/users/willifan/common/nixvim/filetype.nix new file mode 100644 index 0000000..590653e --- /dev/null +++ b/users/willifan/common/nixvim/filetype.nix @@ -0,0 +1,14 @@ +{ ... }: +{ + + programs.nixvim.files = { + "ftplugin/nix.lua" = { + opts = { + expandtab = true; + shiftwidth = 2; + tabstop = 2; + }; + }; + }; + +} From db968e12e1b99329c734c0b2bb18aeb2482645d2 Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 15 Oct 2024 16:50:42 +0200 Subject: [PATCH 7/8] added nixvim TODO --- users/willifan/common/nixvim/TODO.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 users/willifan/common/nixvim/TODO.md diff --git a/users/willifan/common/nixvim/TODO.md b/users/willifan/common/nixvim/TODO.md new file mode 100644 index 0000000..3b11825 --- /dev/null +++ b/users/willifan/common/nixvim/TODO.md @@ -0,0 +1,18 @@ +# 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 + From c51fb4c1960f8fb1960d8a6bee2c8ca593720716 Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 15 Oct 2024 23:35:05 +0200 Subject: [PATCH 8/8] update flake --- flake.lock | 85 +++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index 27967f7..a61b038 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1727977578, - "narHash": "sha256-DBORKcmQ7ZjA4qE1MsnF1MmZSokOGrw4W9vTCioOv2U=", + "lastModified": 1729010169, + "narHash": "sha256-AjgIlXcreagCs6ltT8mzI1UYEiYgfhlwe4Tl3taxQSU=", "owner": "nix-community", "repo": "disko", - "rev": "574400001b3ffe555c7a21e0ff846230759be2ed", + "rev": "9ab6ae4e632016caac1c7e82e15b12b8c672ed76", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1727805723, - "narHash": "sha256-b8flytpuc4Ey/g3mcvpS/ICORcD4h56QDZeP5LogevY=", + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "2f5ae3fc91db865eff2c5a418da85a0fbe6238a3", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "type": "github" }, "original": { @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1728903686, + "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", "type": "github" }, "original": { @@ -310,11 +310,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1728903686, + "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", "type": "github" }, "original": { @@ -352,11 +352,11 @@ ] }, "locked": { - "lastModified": 1727707210, - "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=", + "lastModified": 1728901530, + "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3", + "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728056216, - "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", + "lastModified": 1728729581, + "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", + "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "type": "github" }, "original": { @@ -382,11 +382,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727907660, - "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", + "lastModified": 1728909085, + "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", + "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", "type": "github" }, "original": { @@ -443,11 +443,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727871072, - "narHash": "sha256-t+YLQwBB1soQnVjT6d7nQq4Tidaw7tpB8i6Zvpc+Zbs=", + "lastModified": 1729015933, + "narHash": "sha256-raKxsI2SGe/vF2PvzFatd/Sl9eVUCuCUUVg7cINFVbQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "0ca98d02104f7f0a703787a7a080a570b7f1bedd", + "rev": "429f2e8d1aa61181c0ec72bdafe022fbb6a092d6", "type": "github" }, "original": { @@ -465,11 +465,11 @@ ] }, "locked": { - "lastModified": 1727599661, - "narHash": "sha256-0R+1ih0Rfqrz/lcduvpNSnUw3uthUHiaGh0aWPyIqeQ=", + "lastModified": 1728905062, + "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=", "owner": "NuschtOS", "repo": "search", - "rev": "c3c3928b8de7d300c34e9d90fdc19febd1a32062", + "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84", "type": "github" }, "original": { @@ -507,11 +507,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1727723275, - "narHash": "sha256-k4HrG8TJQ0RqDS1tlDz71kvWFBNQ7qZI9T5Z0qLR85Y=", + "lastModified": 1728900372, + "narHash": "sha256-hmG/u7qZEm7CTh1XPDi+pg4Oi0nNrv7sL8PgZDRe6wg=", "owner": "danth", "repo": "stylix", - "rev": "e7e97059776da7e34b739415a7bc8f80f606b803", + "rev": "33a2eff15181e557bb6dd9d2073b90f7d218975d", "type": "github" }, "original": { @@ -569,16 +569,17 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, @@ -606,11 +607,11 @@ ] }, "locked": { - "lastModified": 1727431250, - "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": {