From 227a6dfd1f4c5d5ad3f30e44d60d07cf35540200 Mon Sep 17 00:00:00 2001 From: harry123 Date: Sun, 9 Mar 2025 10:29:45 +0100 Subject: [PATCH] moved nixvim to a new repo --- features/neovim/default.nix | 11 -- features/neovim/keys.nix | 14 --- features/neovim/plugins.nix | 78 ------------- flake.lock | 173 +++++++++++++++++++--------- flake.nix | 8 +- home-manager/dotfiles/foot/foot.ini | 63 +++++----- home-manager/home.nix | 5 +- 7 files changed, 159 insertions(+), 193 deletions(-) delete mode 100644 features/neovim/default.nix delete mode 100644 features/neovim/keys.nix delete mode 100644 features/neovim/plugins.nix diff --git a/features/neovim/default.nix b/features/neovim/default.nix deleted file mode 100644 index 2b98f29..0000000 --- a/features/neovim/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ self, ... }: -{ - programs.nixvim = { - enable = true; - - colorschemes.catppuccin = { - enable = true; - settings.flavour = "latte"; - }; - }; -} diff --git a/features/neovim/keys.nix b/features/neovim/keys.nix deleted file mode 100644 index 36af769..0000000 --- a/features/neovim/keys.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: -{ - programs.nixvim = { - enable = true; - keymaps = { - - }; - }; -} diff --git a/features/neovim/plugins.nix b/features/neovim/plugins.nix deleted file mode 100644 index dc1a635..0000000 --- a/features/neovim/plugins.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: -{ - programs.nixvim = { - plugins = { - lsp = { - enable = true; - servers = { - asm_lsp.enable = true; - gopls.enable = true; - java_language_server.enable = true; - rust-analyzer.enable = true; - }; - }; - - nvim-cmp = { - enable = true; - autoEnableSources = true; - sources = [ - { name = "nvim_lsp"; } - { name = "path"; } - { name = "buffer"; } - - ]; - }; - barbar.enable = true; - gitsigns.enable = true; - - comment = { - enable = true; - }; - - treesitter = { - enable = true; - }; - - web-devicons = { - enable = true; - }; - - emmet = { - enable = true; - }; - - nvim-autopairs = { - enable = true; - }; - - presence-nvim = { - enable = true; - }; - - chadtree = { - enable = true; - }; - - fzf-lua = { - enable = true; - }; - - notify = true; - - neotest = { - enable = true; - adapters = { - rust.enable = true; - python.enable = true; - java.enable = true; - go.enable = true; - }; - }; - }; - }; -} diff --git a/flake.lock b/flake.lock index 2bd390c..6d19645 100644 --- a/flake.lock +++ b/flake.lock @@ -23,28 +23,6 @@ "type": "github" } }, - "anyrun": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1735301051, - "narHash": "sha256-jU88Q9tP4vuvWYGQcmOdFwI9e2uMPVYJHbXdiklIH9o=", - "owner": "anyrun-org", - "repo": "anyrun", - "rev": "06017e753c8886d5296768dca80745ee09402a2d", - "type": "github" - }, - "original": { - "owner": "anyrun-org", - "repo": "anyrun", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -100,27 +78,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "anyrun", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "neovim-nightly-overlay", @@ -141,7 +98,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "neovim-nightly-overlay", @@ -162,6 +119,45 @@ "type": "indirect" } }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flakeCompat": { "flake": false, "locked": { @@ -225,7 +221,7 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -265,10 +261,38 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", @@ -473,10 +497,54 @@ "type": "github" } }, + "nixvim": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": [ + "nixpkgs" + ], + "nuschtosSearch": "nuschtosSearch" + }, + "locked": { + "lastModified": 1741098523, + "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1738508923, + "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", + "owner": "NuschtOS", + "repo": "search", + "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "root": { "inputs": { "alejandra": "alejandra", - "anyrun": "anyrun", "home-manager": "home-manager", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-darwin": "nix-darwin", @@ -486,6 +554,7 @@ "nixpkgs": "nixpkgs_2", "nixpkgsSmall": "nixpkgsSmall", "nixpkgsUnstable": "nixpkgsUnstable", + "nixvim": "nixvim", "sops-nix": "sops-nix" } }, @@ -526,16 +595,16 @@ }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, diff --git a/flake.nix b/flake.nix index a5822cc..32b9108 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - inputs.nixvim = { + nixvim = { url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -92,11 +92,11 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.${username} = import ./home-manager/home.nix; - home-manager.extraSpecialArgs = { inherit inputs; }; + home-manager.sharedModules = [ + nixvim.homeManagerModules.nixvim + ]; } - - nixvim.homeManagerModules.nixvim ]; }; diff --git a/home-manager/dotfiles/foot/foot.ini b/home-manager/dotfiles/foot/foot.ini index ad2c492..d4e5b8f 100644 --- a/home-manager/dotfiles/foot/foot.ini +++ b/home-manager/dotfiles/foot/foot.ini @@ -68,11 +68,11 @@ urgent=yes # protocols=http, https, ftp, ftps, file, gemini, gopher # uri-characters=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[] -[cursor] +#[cursor] # style=block # color= -color=232634 f2d5cf -blink=yes +#color=232634 f2d5cf +#blink=yes # blink-rate=500 # beam-thickness=1.5 # underline-thickness= @@ -84,7 +84,7 @@ blink=yes [touch] # long-press-delay=400 -[colors] +#[colors] # alpha=1.0 # background=20111b # foreground=ffffff @@ -130,39 +130,42 @@ blink=yes # search-box-match= # black-on-yellow # urls= +[cursor] +color=eff1f5 dc8a78 + [colors] -foreground=c6d0f5 -background=303446 +foreground=4c4f69 +background=eff1f5 -regular0=51576d -regular1=e78284 -regular2=a6d189 -regular3=e5c890 -regular4=8caaee -regular5=f4b8e4 -regular6=81c8be -regular7=b5bfe2 +regular0=5c5f77 +regular1=d20f39 +regular2=40a02b +regular3=df8e1d +regular4=1e66f5 +regular5=ea76cb +regular6=179299 +regular7=acb0be -bright0=626880 -bright1=e78284 -bright2=a6d189 -bright3=e5c890 -bright4=8caaee -bright5=f4b8e4 -bright6=81c8be -bright7=a5adce +bright0=6c6f85 +bright1=d20f39 +bright2=40a02b +bright3=df8e1d +bright4=1e66f5 +bright5=ea76cb +bright6=179299 +bright7=bcc0cc -16=ef9f76 -17=f2d5cf +16=fe640b +17=dc8a78 -selection-foreground=c6d0f5 -selection-background=4f5369 +selection-foreground=4c4f69 +selection-background=ccced7 -search-box-no-match=232634 e78284 -search-box-match=c6d0f5 414559 +search-box-no-match=dce0e8 d20f39 +search-box-match=4c4f69 ccd0da -jump-labels=232634 ef9f76 -urls=8caaee +jump-labels=dce0e8 fe640b +urls=1e66f5 [csd] # preferred=server # size=26 diff --git a/home-manager/home.nix b/home-manager/home.nix index 89785d0..fbaefe3 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -4,6 +4,7 @@ lib, osConfig, inputs, + nixvim, ... }: @@ -124,10 +125,6 @@ # ''; }; - imports = [ - inputs.anyrun.homeManagerModules.default - ]; - programs.direnv = { enable = true; enableBashIntegration = true; # see note on other shells below