a lotta shit idfk

flake.lock

@@ -62,6 +62,38 @@
       }
     },
     "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1717312683,
@@ -78,6 +110,48 @@
       }
     },
     "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "neovim-nightly-overlay",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1730504689,
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "neovim-nightly-overlay",
+          "hercules-ci-effects",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1712014858,
+        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
+        "type": "github"
+      },
+      "original": {
+        "id": "flake-parts",
+        "type": "indirect"
+      }
+    },
+    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
@@ -146,6 +220,77 @@
         "type": "github"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "neovim-nightly-overlay",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "neovim-nightly-overlay",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1730814269,
+        "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "neovim-nightly-overlay",
+          "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"
+      }
+    },
+    "hercules-ci-effects": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": [
+          "neovim-nightly-overlay",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1730903510,
+        "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=",
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-effects",
+        "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-effects",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -209,6 +354,45 @@
         "type": "github"
       }
     },
+    "neovim-nightly-overlay": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-parts": "flake-parts",
+        "git-hooks": "git-hooks",
+        "hercules-ci-effects": "hercules-ci-effects",
+        "neovim-src": "neovim-src",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1731284192,
+        "narHash": "sha256-+j6clqTmoM05sGkoSUFg2yMYJqmQhJkgLD3MBy7/S/A=",
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
+        "rev": "6844f66deb364e804f9b875db3fc87ee14b52141",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
+        "type": "github"
+      }
+    },
+    "neovim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1731246444,
+        "narHash": "sha256-j7Ls3SaF8JzbaM2aU6ZqcHfyzqC+0F9pLiwZ+fwXgpo=",
+        "owner": "neovim",
+        "repo": "neovim",
+        "rev": "0e54931b99530cd58af0434e12c58fe6243acb64",
+        "type": "github"
+      },
+      "original": {
+        "owner": "neovim",
+        "repo": "neovim",
+        "type": "github"
+      }
+    },
     "nh": {
       "inputs": {
         "nixpkgs": [
@@ -231,7 +415,7 @@
     },
     "nix-gaming": {
       "inputs": {
-        "flake-parts": "flake-parts",
+        "flake-parts": "flake-parts_3",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -254,7 +438,7 @@
     "nix-inspect": {
       "inputs": {
         "nci": "nci",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "parts": "parts_2"
       },
       "locked": {
@@ -273,7 +457,7 @@
     },
     "nixos-cosmic": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_3",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -296,16 +480,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709961763,
+        "lastModified": 1730958623,
-        "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
+        "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
+        "rev": "85f7e662eda4fa3a995556527c87b2524b691933",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -355,6 +539,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1709961763,
+        "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1728193676,
         "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=",
@@ -370,7 +570,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1658161305,
         "narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=",
@@ -475,11 +675,12 @@
         "disko": "disko",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
+        "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nh": "nh",
         "nix-gaming": "nix-gaming",
         "nix-inspect": "nix-inspect",
         "nixos-cosmic": "nixos-cosmic",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "st": "st"
       }
@@ -548,7 +749,7 @@
     "st": {
       "inputs": {
         "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1726952303,

flake.nix

@@ -34,6 +34,8 @@
     };
 
     st.url = "github:devawaves/st";
+
+    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
   };
 
   outputs = {

home/dotfiles/chadtain.toml

@@ -1,25 +0,0 @@
-[colors]
-foreground = '#B0B0B0'
-background = '#151B21'
-cursor_fg = '#B0B0B0'
-cursor_border = '#B0B0B0'
-ansi = [
-  '#151B21',
-  '#AC8A8C',
-  '#8AAC8B',
-  '#ACA98A',
-  '#6B8BAB',
-  '#8F8AAC',
-  '#7C9CBC',
-  '#565C62'
-]
-brights = [
-  '#42484E',
-  '#C9938A',
-  '#9EC49F',
-  '#C4C19E',
-  '#7797B7',
-  '#A39EC4',
-  '#9AAFE6',
-  '#B0B0B0'
-]

home/dotfiles/wezterm.lua

@@ -2,57 +2,42 @@ local wezterm = require("wezterm")
 
 local config = wezterm.config_builder()
 
-config.color_scheme = "Catppuccin Macchiato"
+config.color_scheme = "nordfox"
 config.use_fancy_tab_bar = false
 config.window_decorations = "RESIZE"
 config.hide_tab_bar_if_only_one_tab = true
--- config.font = wezterm.font({
--- 	family = "Rec Mono Waves",
--- 	weight = "Regular",
--- })
 config.font = wezterm.font_with_fallback({
-	-- { family = "Rec Mono Waves", weight = "Regular" },
+    { family = "Cartograph CF", weight = "Medium" },
-	-- { family = "Monaspace Argon", weight = "Medium" },
+    "Symbols Nerd Font",
-	{ family = "0xProto", weight = "Medium", harfbuzz_features = { "ss01=1" } },
-	-- "CozetteHiDpi",
-	"Symbols Nerd Font",
 })
--- config.font_rules = {
+
---   {
---     italic = true,
---     font = wezterm.font_with_fallback({
---       {family = 'Monaspace Radon', weight = 'Regular'}
---     })
---   },
--- }
 config.font_size = 13
-config.cell_width = 0.95
+config.line_height = 1.2
 
 config.set_environment_variables = {
-	TERM = "xterm-256color",
+    TERM = "xterm-256color",
-	EDITOR = "nvim",
-	VISUAL = "nvim",
 }
 
 config.window_padding = {
-	left = 7,
+    left = 10,
-	right = 7,
+    right = 10,
-	top = 0,
+    top = 10,
-	bottom = 0,
+    bottom = 10,
 }
 
 config.default_cursor_style = "SteadyBar"
+config.cursor_blink_rate = 0
 
 -- wayland support
 config.enable_wayland = false
 
 config.unix_domains = {
-	{
+    {
-		name = "unix",
+        name = "unix",
-	},
+    },
 }
 config.freetype_load_flags = "DEFAULT"
-config.window_background_opacity = 1.00
+config.window_background_opacity = 0.95
 config.max_fps = 144
 config.scrollback_lines = 10000
 

home/modules/core/default.nix

@@ -1,4 +1,14 @@
 {pkgs, ...}: {
+  home.packages = with pkgs; [
+    spotify
+
+    noto-fonts
+    noto-fonts-emoji
+    material-design-icons
+    commit-mono
+    (google-fonts.override {fonts = ["Overpass" "Nunito"];})
+    (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
+  ];
   services.gnome-keyring = {
     enable = true;
     components = ["secrets" "ssh"];
@@ -43,7 +53,7 @@
       set recolor-lightcolor          "#2E3440"
       set recolor-darkcolor           "#ECEFF4"
       set recolor                     "true"
-      set font                        "0xProto"
+      set font                        "Lacklustre"
       set guioptions                  none
     '';
   };

home/modules/default.nix

@@ -1,6 +1,5 @@
 [
   ./core
-  ./gui
   ./term
   ./dev
   ./gnome.nix

home/modules/dev/default.nix

@@ -38,6 +38,8 @@
     deno
     gleam
     unzip
+    porsmo
+    mprocs
 
     transmission_4-gtk
   ];

home/modules/gui/default.nix

@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    noto-fonts
-    julia-mono
-    noto-fonts-emoji
-    material-design-icons
-    cozette
-    (google-fonts.override {fonts = ["Overpass" "Nunito"];})
-    (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
-  ];
-}

home/modules/term/default.nix

@@ -7,14 +7,6 @@
   pst = pkgs.writeShellScriptBin "pst" (builtins.readFile ../../dotfiles/pst);
   runpkg = pkgs.writeShellScriptBin "run" (builtins.readFile ../../dotfiles/run);
 in {
-  xdg.configFile."wezterm/colors/camellia-hope-dark.toml".text = builtins.readFile (pkgs.fetchFromGitHub {
-      owner = "camellia-theme";
-      repo = "camellia";
-      rev = "3b319bb337caccc311e60c3a8d357c4431b63680";
-      hash = "sha256-HNdGHJ8n81HpVK9gFiRLZBBh0sz4FIUUx/ykGyoxv0c=";
-    }
-    + "/ports/wezterm/colors/camelliaHopeDark.toml");
-  xdg.configFile."wezterm/colors/chadtain.toml".text = builtins.readFile ../../dotfiles/chadtain.toml;
   programs = {
     kitty = {
       enable = true;
@@ -24,7 +16,7 @@ in {
         "TERM" = "xterm-256color";
       };
       settings = {
-        font_family = "0xProto";
+        font_family = "Cartograph CF";
         font_size = "13.0";
         disable_ligatures = "never";
         undercurl_style = "thick-sparse";
@@ -195,6 +187,7 @@ in {
           bind | split-window -h -c "#{pane_current_path}"
           bind c new-window -c "#{pane_current_path}"
 
+          set -g status-position top
           run '~/.tmux/plugins/tpm/tpm'
         '';
     };
@@ -223,9 +216,9 @@ in {
     nurl
     delta
     bottom
+    unstable.dwt1-shell-color-scripts
   ];
 
-  programs.wezterm.enableZshIntegration = true;
   programs.fzf = {
     enable = true;
     enableZshIntegration = true;
@@ -403,12 +396,9 @@ in {
       lg = "lazygit";
       ls = "eza -alTL 1 --icons --no-time --group-directories-first";
       la = "eza -a --icons --no-time --group-directories-first";
-      cat = "bat --theme gruvbox-dark --style numbers,changes --color=always --tabs=2 --wrap=never";
+      cat = "bat --theme Nord --style numbers,changes --color=always --tabs=2 --wrap=never";
       diff = "delta";
       top = "btm";
-      c = "code";
-      cr = "code -r";
-      cw = "code --wait";
       glg = "git lg";
       serve = "python3 -m http.server";
       ytmp3 = "yt-dlp --ignore-errors --format bestaudio --extract-audio --audio-format mp3 --audio-quality 0 --embed-thumbnail --embed-metadata --output '%(title)s.%(ext)s'";

system/waves/configuration.nix

@@ -92,10 +92,23 @@
   };
 
   # system-wide pkgs
-  environment.systemPackages = builtins.attrValues {
+  environment.systemPackages = with pkgs;
-    inherit (pkgs) python3 fuse3 floorp localsend parsec-bin kanata bubblewrap;
+    [
-    inherit (pkgs.unstable) neovim;
+      python3
-  };
+      fuse3
+      floorp
+      localsend
+      parsec-bin
+      kanata
+      bubblewrap
+      inputs.neovim-nightly-overlay.packages.${pkgs.system}.default
+    ]
+    ++ [
+      (unstable.koboldcpp.override {
+        cublasSupport = true;
+        cudaArches = ["sm_86"];
+      })
+    ];
 
   # security
   security = {
@@ -254,7 +267,7 @@
   };
 
   services.xserver.videoDrivers = ["nvidia"];
-  boot.kernelParams = ["nvidia-drm.fbdev=1"];
+  boot.kernelParams = ["nvidia-drm.fbdev=1" "sysrq_always_enabled=1"];
 
   hardware.nvidia = {
     # Modesetting is required.