From 985a71d90167a5d3ed895870fca4a69e2bb63d99 Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Sat, 19 Apr 2025 17:54:35 +0200 Subject: [PATCH] :sparkles: [shared] Replace Neovim with Helix Moved Helix editor to shared. Removed Nixvim flake and it's config --- flake.lock | 287 +----------------- flake.nix | 9 +- hosts/pi4/home-manager/default.nix | 2 +- hosts/pi4/home-manager/helix.nix | 30 -- shared/home-manager/development/default.nix | 2 +- shared/home-manager/development/helix.nix | 33 ++ .../development/nixvim/default.nix | 77 ----- 7 files changed, 38 insertions(+), 402 deletions(-) delete mode 100644 hosts/pi4/home-manager/helix.nix create mode 100644 shared/home-manager/development/helix.nix delete mode 100644 shared/home-manager/development/nixvim/default.nix diff --git a/flake.lock b/flake.lock index 0e1306d..e569a15 100644 --- a/flake.lock +++ b/flake.lock @@ -62,128 +62,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741473158, - "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", - "owner": "numtide", - "repo": "devshell", - "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "flake-compat": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "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" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "grayjay": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -224,28 +102,6 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744117652, - "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "zen-browser", @@ -285,56 +141,6 @@ "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" - } - }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743127615, - "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "nix-darwin-24.11", - "repo": "nix-darwin", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1744098102, @@ -447,58 +253,6 @@ "type": "github" } }, - "nixvim": { - "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixpkgs" - ], - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1744461753, - "narHash": "sha256-3oO3CwYmZE5P4Hp5XR5WCZbF/rj5+kF0m5sTNTMDYss=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "a22fbed4c4784e6a9761f9a896d31da98c3117b2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "nixos-24.11", - "repo": "nixvim", - "type": "github" - } - }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744375525, - "narHash": "sha256-/Wf5Ca0DmV+y+qVBDXX8HAfAvSQI6y5oE27dv6t1jXk=", - "owner": "NuschtOS", - "repo": "search", - "rev": "c0e7d3bda11e2cfad692d205d82757078475957a", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "root": { "inputs": { "catppuccin": "catppuccin", @@ -508,7 +262,6 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", - "nixvim": "nixvim", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", "zen-browser": "zen-browser" @@ -539,7 +292,7 @@ "nixpkgs": [ "nixpkgs-unstable" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1744682091, @@ -570,45 +323,9 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743748085, - "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "zen-browser": { "inputs": { - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_5" }, "locked": { diff --git a/flake.nix b/flake.nix index d9224c5..9dc1423 100644 --- a/flake.nix +++ b/flake.nix @@ -28,14 +28,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; # Catppuccin theming - catppuccin = { - url = "github:catppuccin/nix"; - }; - # vim - nixvim = { - url = "github:nix-community/nixvim/nixos-24.11"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + catppuccin.url = "github:catppuccin/nix"; # Bar hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; # Spotify diff --git a/hosts/pi4/home-manager/default.nix b/hosts/pi4/home-manager/default.nix index a544828..cabb995 100644 --- a/hosts/pi4/home-manager/default.nix +++ b/hosts/pi4/home-manager/default.nix @@ -10,13 +10,13 @@ imports = [ inputs.catppuccin.homeModules.catppuccin (lib.custom.relativeToRoot "shared/home-manager/development/git.nix") + (lib.custom.relativeToRoot "shared/home-manager/development/helix.nix") (lib.custom.relativeToRoot "shared/home-manager/shell/btop.nix") (lib.custom.relativeToRoot "shared/home-manager/shell/eza.nix") (lib.custom.relativeToRoot "shared/home-manager/shell/fastfetch.nix") (lib.custom.relativeToRoot "shared/home-manager/shell/fish.nix") (lib.custom.relativeToRoot "shared/home-manager/shell/zoxide.nix") (lib.custom.relativeToRoot "shared/home-manager/gpg.nix") - ./helix.nix ]; home.stateVersion = systemConfig.version; diff --git a/hosts/pi4/home-manager/helix.nix b/hosts/pi4/home-manager/helix.nix deleted file mode 100644 index e64c8c4..0000000 --- a/hosts/pi4/home-manager/helix.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ pkgs, theme, ... }: - -{ - catppuccin.helix = { - enable = true; - flavor = theme.flavor; - }; - - programs.helix = { - enable = true; - defaultEditor = true; - settings = { - editor = { - cursor-shape = { - normal = "block"; - insert = "bar"; - select = "underline"; - }; - lsp.display-messages = true; - }; - }; - languages.language = [ - { - name = "nix"; - auto-format = true; - formatter.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt"; - } - ]; - }; -} diff --git a/shared/home-manager/development/default.nix b/shared/home-manager/development/default.nix index ed66da1..9481377 100644 --- a/shared/home-manager/development/default.nix +++ b/shared/home-manager/development/default.nix @@ -1,7 +1,7 @@ { imports = [ ./git.nix - ./nixvim + ./helix.nix ./zed.nix ]; # TODO set Wayland vmOptions in Jetbrains products, Requires current installed version in path diff --git a/shared/home-manager/development/helix.nix b/shared/home-manager/development/helix.nix new file mode 100644 index 0000000..4eaf468 --- /dev/null +++ b/shared/home-manager/development/helix.nix @@ -0,0 +1,33 @@ +{ pkgs, theme, ... }: + +{ + catppuccin.helix = { + enable = true; + flavor = theme.flavor; + }; + + programs = { + fish.shellAliases.edit = "hx"; + helix = { + enable = true; + defaultEditor = true; + settings = { + editor = { + cursor-shape = { + normal = "block"; + insert = "bar"; + select = "underline"; + }; + lsp.display-messages = true; + }; + }; + languages.language = [ + { + name = "nix"; + auto-format = true; + formatter.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt"; + } + ]; + }; + }; +} diff --git a/shared/home-manager/development/nixvim/default.nix b/shared/home-manager/development/nixvim/default.nix deleted file mode 100644 index 1bccf09..0000000 --- a/shared/home-manager/development/nixvim/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -# Neovim configuration for Nix -{ inputs, ... }: - -{ - imports = [ - inputs.nixvim.homeManagerModules.nixvim - ]; - - catppuccin.nvim.enable = true; - - home.sessionVariables.EDITOR = "nvim"; - - programs.nixvim = { - enable = true; - clipboard.providers.wl-copy.enable = true; - colorschemes.catppuccin.enable = true; - defaultEditor = true; - vimdiffAlias = true; # Alias vimdiff to nvim -d - - opts = { - number = true; # Show line numbers - relativenumber = true; # Show relative line numbers - - shiftwidth = 2; # Tab width should be 2 - }; - - plugins = { - bufferline.enable = false; - - # Formatters - conform-nvim = { - enable = true; - # TODO use nix fmt on save - settings = { }; - }; - - lsp = { - enable = true; - servers = { - nixd.enable = true; - }; - }; - - lualine.enable = true; - luasnip.enable = true; - - # Completions - cmp = { - enable = true; - - autoEnableSources = true; - - # TODO complete on - settings = { - sources = [ - { name = "nvim-lsp"; } - { name = "path"; } - { name = "buffer"; } - ]; - }; - }; - - treesitter.enable = true; - web-devicons.enable = true; - }; - - extraConfigLua = '' - -- Translucent background - vim.cmd [[ - highlight Normal guibg=none - highlight NonText guibg=none - highlight Normal ctermbg=none - highlight NonText ctermbg=none - ]] - ''; - }; -}