chore: nvim should follow nixpkgs

.gitea/workflows/build-flake.yml

@@ -1,8 +1,7 @@
-name: check-flake
+---
+name: build-flake
 on:
-  push:
+  workflow_call:
-    branches:
-      - main
   pull_request:
 
 jobs:
@@ -16,10 +15,17 @@ jobs:
       - name: Setup sudo (required for the next step)
         run: apt-get update && apt-get install -y sudo
       - name: Setup nix
-        uses: cachix/install-nix-action@v27
+        uses: cachix/install-nix-action@v30
         with:
+          extra_nix_config: |
+            experimental-features = nix-command flakes
           github_access_token: ${{ secrets.GH_ACCESS_TOKEN }}
-          nix_path: nixpkgs=channel:nixos-23.11
+          nix_path: nixpkgs=channel:nixos-24.05
+      - uses: cachix/cachix-action@v15
+        with:
+          name: palkx
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+          extraPullNames: nix-community
       - name: Build nix flake
         run: |
           while true; do sleep 1; rm -rf /homeless-shelter; done &

.gitea/workflows/release.yml

@@ -0,0 +1,15 @@
+---
+name: build-flake
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    name: Build flake
+    uses: ./.gitea/workflows/build-flake.yml
+  release:
+    name: Release a new version
+    needs: build
+    uses: xaked/actions/.gitea/workflows/release.yml@main

config/default.nix

@@ -1,4 +1,4 @@
-{pkgs}:
+{ pkgs }:
 pkgs.stdenv.mkDerivation {
   name = "nvim-config";
   src = ./src;

config/src/nvim/lua/config/lazy.lua

@@ -11,7 +11,8 @@ require("lazy").setup({
   spec = {
     -- add LazyVim and import its plugins
     { "LazyVim/LazyVim", import = "lazyvim.plugins" },
-    { import = "lazyvim.plugins.extras.coding.blink" },
+    -- Blink currently not supported by all extras 2024-11-19 11:08
+    -- { import = "lazyvim.plugins.extras.coding.blink" },
     { import = "lazyvim.plugins.extras.editor.illuminate" },
     { import = "lazyvim.plugins.extras.editor.outline" },
     { import = "lazyvim.plugins.extras.editor.telescope" },
@@ -34,8 +35,11 @@ require("lazy").setup({
     { import = "lazyvim.plugins.extras.lang.yaml" },
     { import = "lazyvim.plugins.extras.ui.mini-indentscope" },
     { import = "lazyvim.plugins.extras.ui.treesitter-context" },
-    { import = "plugins.tokyonight" },
+    { import = "plugins.catppuccin" },
+    -- { import = "plugins.tokyonight" },
+    -- { import = "plugins.lang.nix" },
     { import = "plugins.lang.shell" },
+    { import = "plugins.misc.bigfile" },
     { import = "plugins.misc.tmux-navigator" },
   },
   defaults = {
@@ -51,7 +55,7 @@ require("lazy").setup({
     lazyvim = false,
     neovim = false,
   },
-  install = { colorscheme = { "tokyonight", "habamax" } },
+  install = { colorscheme = { "catppuccin-macchiato" } },
   checker = { enabled = true }, -- automatically check for plugin updates
   performance = {
     rtp = {

config/src/nvim/lua/plugins/catppuccin.lua

@@ -0,0 +1,62 @@
+return {
+  "catppuccin/nvim",
+  lazy = true,
+  name = "catppuccin",
+  opts = {
+    flavour = "macchiato",
+    transparent_background = false,
+    integrations = {
+      aerial = true,
+      alpha = true,
+      cmp = true,
+      dashboard = true,
+      flash = true,
+      grug_far = true,
+      gitsigns = true,
+      headlines = true,
+      illuminate = true,
+      indent_blankline = { enabled = true },
+      leap = true,
+      lsp_trouble = true,
+      mason = true,
+      markdown = true,
+      mini = true,
+      native_lsp = {
+        enabled = true,
+        underlines = {
+          errors = { "undercurl" },
+          hints = { "undercurl" },
+          warnings = { "undercurl" },
+          information = { "undercurl" },
+        },
+      },
+      navic = { enabled = true, custom_bg = "lualine" },
+      neotest = true,
+      neotree = true,
+      noice = true,
+      notify = true,
+      semantic_tokens = true,
+      telescope = true,
+      treesitter = true,
+      treesitter_context = true,
+      which_key = true,
+    },
+  },
+  specs = {
+    {
+      "akinsho/bufferline.nvim",
+      optional = true,
+      opts = function(_, opts)
+        if (vim.g.colors_name or ""):find("catppuccin") then
+          opts.highlights = require("catppuccin.groups.integrations.bufferline").get()
+        end
+      end,
+    },
+  },
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "catppuccin-macchiato",
+    },
+  },
+}

config/src/nvim/lua/plugins/misc/bigfile.lua

@@ -0,0 +1,9 @@
+return {
+  -- Disable certain features if file is big
+  {
+    "LunarVim/bigfile.nvim",
+    opts = {
+      filesize = 0.5,
+    },
+  },
+}

config/src/nvim/lua/plugins/tokyonight.lua

@@ -1,10 +1,10 @@
 return {
-	"folke/tokyonight.nvim",
+  "folke/tokyonight.nvim",
-	opts = {
+  opts = {
-		transparent = true,
+    transparent = true,
-		styles = {
+    styles = {
-			sidebars = "transparent",
+      sidebars = "transparent",
-			floats = "transparent",
+      floats = "transparent",
-		},
+    },
-	},
+  },
 }

flake.lock

@@ -79,11 +79,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1726560853,
+        "lastModified": 1731533236,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -106,11 +106,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730814269,
+        "lastModified": 1732021966,
-        "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
+        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
+        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
         "type": "github"
       },
       "original": {
@@ -170,14 +170,16 @@
         "git-hooks": "git-hooks",
         "hercules-ci-effects": "hercules-ci-effects",
         "neovim-src": "neovim-src",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1730914682,
+        "lastModified": 1732173780,
-        "narHash": "sha256-UHFvVeJY64rA5HKoeKCLuJET224GEDGdj7/m1PuShgw=",
+        "narHash": "sha256-pszcETwWdItBmb/Z2CqIiTfEiVl3K5TPpgFSwyQrghY=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "59630b2edb91b71ac0a60b865aaa91cd39946577",
+        "rev": "151fab1aa35e1cbc6f5caad1e175e3d621d67951",
         "type": "github"
       },
       "original": {
@@ -189,11 +191,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1730893053,
+        "lastModified": 1732143030,
-        "narHash": "sha256-ifiJfPkhyg/9I9aJSbtcHy3jRV4CLig7iF9ACQUycPU=",
+        "narHash": "sha256-XKPsbjqHmwbiyzZdqNtw0tKxWLGFCkVB1+Awbi8tjQU=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "f7e32fb6e626ab198bf401765236783890f3a0d6",
+        "rev": "07db909eb5ae2a559771068be64439eba394cd61",
         "type": "github"
       },
       "original": {
@@ -204,37 +206,25 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730831018,
+        "lastModified": 1731755305,
-        "narHash": "sha256-2S0HwIFRxYp+afuoFORcZA9TjryAf512GmE0MTfEOPU=",
+        "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8c4dc69b9732f6bbe826b5fbb32184987520ff26",
+        "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
-        "path": "/nix/store/pq1m6x5ilkm3s841g0z0vyrqvmbxc21v-source",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     },
     "systems": {

flake.nix

@@ -1,53 +1,59 @@
 {
   description = "NVIM Configuration";
   inputs = {
-    # nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     flake-utils.url = "github:numtide/flake-utils";
     neovim-nightly-overlay = {
       url = "github:nix-community/neovim-nightly-overlay";
-      # inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
   nixConfig = {
     trusted-substituters = [
       "https://nix-community.cachix.org"
+      "https://palkx.cachix.org"
     ];
     extra-trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "palkx.cachix.org-1:qaQoL5CXpGzUbqsIvxUEL7wUhoIrjV0Q8M4HbJ8/8S4="
     ];
   };
 
-  outputs = inputs @ {
+  outputs =
-    nixpkgs,
+    inputs@{
-    flake-utils,
+      nixpkgs,
-    neovim-nightly-overlay,
+      flake-utils,
-    ...
+      neovim-nightly-overlay,
-  }:
+      ...
-    flake-utils.lib.eachDefaultSystem (system: let
+    }:
-      overlayFlakeInputs = prev: final: {
+    flake-utils.lib.eachDefaultSystem (
-        neovim = neovim-nightly-overlay.packages.${system}.default.overrideAttrs (oa: {
+      system:
-          nativeBuildInputs = oa.nativeBuildInputs ++ [final.libtermkey];
+      let
-        });
+        overlayFlakeInputs = prev: final: {
-      };
+          neovim = neovim-nightly-overlay.packages.${system}.default.overrideAttrs (oa: {
-
+            nativeBuildInputs = oa.nativeBuildInputs ++ [ final.libtermkey ];
-      overlayLazyVim = prev: final: {
+          });
-        lazyVim = import ./packages/lazyVim.nix {
-          pkgs = final;
         };
-      };
 
-      pkgs = import nixpkgs {
+        overlayLazyVim = prev: final: { lazyVim = import ./packages/lazyVim.nix { pkgs = final; }; };
-        inherit system;
+
-        overlays = [overlayFlakeInputs overlayLazyVim];
+        pkgs = import nixpkgs {
-      };
+          inherit system;
-    in rec {
+          overlays = [
-      packages.lazyVim = pkgs.lazyVim;
+            overlayFlakeInputs
-      apps.lazyVim = {
+            overlayLazyVim
-        type = "app";
+          ];
-        program = "${packages.default}/bin/nvim";
+        };
-      };
+      in
-      packages.default = packages.lazyVim;
+      rec {
-      apps.default = apps.lazyVim;
+        packages.lazyVim = pkgs.lazyVim;
-    });
+        apps.lazyVim = {
+          type = "app";
+          program = "${packages.default}/bin/nvim";
+        };
+        packages.default = packages.lazyVim;
+        apps.default = apps.lazyVim;
+      }
+    );
 }

packages/lazyVim.nix

@@ -1,12 +1,13 @@
-{pkgs}: let
+{ pkgs }:
-  config = import ../config {inherit pkgs;};
+let
-  runtimeDeps = import ../runtimeDeps.nix {inherit pkgs;};
+  config = import ../config { inherit pkgs; };
+  runtimeDeps = import ../runtimeDeps.nix { inherit pkgs; };
 in
-  pkgs.wrapNeovim pkgs.neovim {
+pkgs.wrapNeovim pkgs.neovim {
-    viAlias = true;
+  viAlias = true;
-    vimAlias = true;
+  vimAlias = true;
-    withNodeJs = true;
+  withNodeJs = true;
-    withPython3 = true;
+  withPython3 = true;
-    withRuby = false;
+  withRuby = false;
-    extraMakeWrapperArgs = ''--prefix PATH : "${pkgs.lib.makeBinPath runtimeDeps.dependencies}" --set XDG_CONFIG_HOME "${config}"'';
+  extraMakeWrapperArgs = ''--prefix PATH : "${pkgs.lib.makeBinPath runtimeDeps.dependencies}" --set XDG_CONFIG_HOME "${config}"'';
-  }
+}

runtimeDeps.nix

@@ -1,28 +1,34 @@
-{pkgs}: {
+{ pkgs }:
-  dependencies = with pkgs; [
+{
-    nixd # nix lsp
+  dependencies =
-    alejandra # nix formatter
+    with pkgs;
-    statix # linter for nix
+    [
-    ripgrep
+      nixfmt-rfc-style # nix formatter
-    fd
+      (terraform.overrideAttrs (oldAttrs: {
-    git
+        meta.license = lib.licenses.mpl20;
-    curl # needed to fetch titles from urls
+      })) # terraform fmt
-    wget
+      ripgrep
-    cargo
+      fd
-    php82
+      git
-    php82Packages.composer
+      curl # needed to fetch titles from urls
-    go
+      wget
-    ruby
+      cargo
-    luarocks
+      php82
-    zulu #java11
+      php82Packages.composer
-    fish
+      go
-    fzf
+      ruby
-    perl536
+      luarocks
-    perl536Packages.CPAN
+      zulu # java11
-    unzip
+      fish
-    tree-sitter
+      fzf
-    gcc
+      perl540
-    gnumake
+      perl540Packages.CPAN
-    lazygit
+      unzip
-  ];
+      tree-sitter
+      gnumake
+      lazygit
+      python312
+      python312Packages.pip
+    ]
+    ++ (if pkgs.stdenv.hostPlatform.isDarwin then [ ] else [ gcc ]);
 }