Update lazyvim

nix/flake.lock

@@ -653,11 +653,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1720453602,
+        "lastModified": 1720731503,
-        "narHash": "sha256-7+PjJZn/jpqNkVKJ3AGVT9G601rVj/R8KkT+WWjhwyk=",
+        "narHash": "sha256-Qlm0IRnOrI64RW/SEvW9rA1ytVvPS1CsVvRataNvStI=",
         "ref": "refs/heads/main",
-        "rev": "b03f41efec14273cf25c42d4cef326acc36cb319",
+        "rev": "e728e56cbc6af0a9be1276b2cf8e019a894016e7",
-        "revCount": 4913,
+        "revCount": 4917,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -736,11 +736,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720203444,
+        "lastModified": 1720545076,
-        "narHash": "sha256-lq2dPPPcwMHTLsFrQ2pRp4c2LwDZWoqzSyjuPdeJCP4=",
+        "narHash": "sha256-Pxacc2uoxI00koXp5+CyNqHOTQlqNlK0rlRHDBHX4+g=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "a8c3a135701a7b64db0a88ec353a392f402d2a87",
+        "rev": "6174a2a25f4e216c0f1d0c4278adc23c476b1d09",
         "type": "github"
       },
       "original": {
@@ -1070,11 +1070,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1720031269,
+        "lastModified": 1720542800,
-        "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
+        "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
+        "rev": "feb2849fdeb70028c70d73b848214b00d324a497",
         "type": "github"
       },
       "original": {

nix/flake.nix

@@ -49,6 +49,9 @@
         system = "x86_64-linux";
         overlays = [
           inputs.nur.overlay
+          (_: prev: {
+            python312 = prev.python312.override { packageOverrides = _: pysuper: { nose = pysuper.pynose; }; };
+          })
         ];
         config = {
           allowUnfree = true;

nix/hardware/spaceship/configuration.nix

@@ -58,5 +58,6 @@ in
       '';
       extra_autostart = [ "streamdeck -n" ];
     };
+    colorscheme = "catppuccin-mocha";
   };
 }

nix/hardware/spaceship/spaceship.nix

@@ -1,7 +1,8 @@
 { pkgs, lib, ... }:
 {
-# TODO: needed?
+  # TODO: needed?
   boot.kernelModules = [ "kvm-amd" ];
+  boot.initrd.kernelModules = [ "amdgpu" ];
 
   fileSystems."/drive2" =
     {

nix/programs/coding.nix

@@ -1,9 +1,11 @@
 { pkgs
+, lib
+, config
 , ...
 }:
 {
   imports = [
-    ./nvim/default.nix
+    (import ./nvim/default.nix { inherit lib pkgs; colorscheme = config.conf.colorscheme; })
   ];
 
   home.packages = with pkgs; [

nix/programs/individual_configs/kitty.nix

@@ -16,7 +16,7 @@
       italic_font = "JetBrainsMono Nerd Font Mono Extra Italic";
       bold_italic_font = "JetBrainsMono Nerd Font Mono Extra Bold Italic";
 
-      background = lib.mkForce "#1a1b25";
+      # background = lib.mkForce "#1a1b25";
       # foreground = "#c5c8c6";
       #
       # selection_background = "#b2ceee";

nix/programs/nvim/default.nix

@@ -1,4 +1,5 @@
-{ lib, pkgs, ... }:
+# please nixvim enable lazyloading
+{ lib, pkgs, colorscheme, ... }:
 {
   programs.neovim = {
     enable = true;
@@ -164,15 +165,17 @@
             fallback = true,
           },
           spec = {
-            { "LazyVim/LazyVim", import = "lazyvim.plugins" },
+            { "LazyVim/LazyVim",
+            opts = {
+              ${if colorscheme != "" then "colorscheme = '${colorscheme}'," else ""}
+            },
+            import = "lazyvim.plugins" },
             { import = "lazyvim.plugins.extras.ui.alpha" },
             { import = "lazyvim.plugins.extras.lang.rust" },
             { import = "lazyvim.plugins.extras.lang.tailwind" },
             { import = "lazyvim.plugins.extras.lang.java" },
             { import = "lazyvim.plugins.extras.lang.go" },
             { import = "lazyvim.plugins.extras.lang.clangd" },
-            -- { import = "lazyvim.plugins.extras.lang.typescript" },
-            -- { import = "lazyvim.plugins.extras.lang.python" },
             { import = "lazyvim.plugins.extras.lang.markdown" },
             { import = "lazyvim.plugins.extras.lang.cmake" },
             { import = "lazyvim.plugins.extras.lang.omnisharp" },
@@ -181,15 +184,12 @@
             { import = "lazyvim.plugins.extras.dap.core" },
             { import = "lazyvim.plugins.extras.test.core" },
             { "nvim-telescope/telescope-fzf-native.nvim", enabled = true },
-            -- disable mason.nvim, use programs.neovim.extraPackages
             { "williamboman/mason-lspconfig.nvim", enabled = false },
-            --{ "williamboman/mason.nvim", enabled = false },
-            -- treesitter handled by xdg.configFile."nvim/parser", put this line at the end of spec to clear ensure_installed
-            --{ "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
             { import = "plugins" },
             { import = "plugins.plugins" },
           },
-          install = { colorscheme = { "tokyonight" } },
+
+          ${if colorscheme != "" then "install = { colorscheme = { '${colorscheme}' } }," else ""}
           checker = { enabled = true, notify = false },
           change_detection = { enabled = true, notify = false },
         })

nix/programs/nvim/flake.lock

@@ -2,16 +2,14 @@
   "nodes": {
     "flake-parts": {
       "inputs": {
-        "nixpkgs-lib": [
+        "nixpkgs-lib": "nixpkgs-lib"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1717285511,
+        "lastModified": 1719994518,
-        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
+        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
         "type": "github"
       },
       "original": {
@@ -20,46 +18,37 @@
         "type": "github"
       }
     },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1717316182,
-        "narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717196966,
+        "lastModified": 1720542800,
-        "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
+        "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
+        "rev": "feb2849fdeb70028c70d73b848214b00d324a497",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1719876945,
+        "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
+      }
+    },
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "home-manager": "home-manager",
         "nixpkgs": "nixpkgs"
       }
     }

nix/programs/nvim/flake.nix

@@ -1,31 +1,35 @@
 {
-  description = "Dashies neovim config";
+  description = "A lazyvim configuration";
+
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    home-manager = {
+    flake-parts.url = "github:hercules-ci/flake-parts";
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    flake-parts = {
-      url = "github:hercules-ci/flake-parts";
-      inputs.nixpkgs-lib.follows = "nixpkgs";
-    };
   };
+
   outputs =
-    { ...
+    { flake-parts, ... }@inputs:
-    }@inputs:
+    flake-parts.lib.mkFlake { inherit inputs; } {
-    let
+      systems = [
-      pkgs = import inputs.nixpkgs {
+        "x86_64-linux"
-        system = "x86_64-linux";
+        "aarch64-linux"
-        overlays = [
+        "x86_64-darwin"
-          inputs.nur.overlay
+        "aarch64-darwin"
-        ];
+      ];
-        config = {
+
-          allowUnfree = true;
+      perSystem =
+        { pkgs, ... }:
+        let
+          colorscheme = "catppuccin-mocha";
+          dashieVimModule = {
+            inherit pkgs colorscheme;
+            module = import ./default.nix;
+            nvim = pkgs.neovim;
+          };
+        in
+        {
+          packages = {
+            default = dashieVimModule.nvim;
+          };
         };
-      };
-    in
-    {
-      imports = [ ./default.nix { inherit pkgs; } ];
     };
 }

nix/programs/nvim/lua/plugins/plugins.lua

@@ -1,12 +1,4 @@
-local Util = require("lazyvim.util")
-
 return {
-	{
-		"LazyVim/LazyVim",
-		opts = {
-			colorscheme = "tokyonight-night",
-		},
-	},
 	{
 		"nvim-telescope/telescope.nvim",
 		cmd = "Telescope",