flake.lock

@@ -441,22 +441,6 @@
         "type": "github"
       }
     },
-    "flake-compat_4": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "locked": {
         "lastModified": 1678901627,
@@ -502,21 +486,6 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "ghc-utils": {
       "flake": false,
       "locked": {
@@ -938,8 +907,7 @@
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-wayland": "nixpkgs-wayland",
         "nur": "nur",
-        "stylix": "stylix",
+        "stylix": "stylix"
-        "vscode-extensions": "vscode-extensions"
       }
     },
     "rust-analyzer-src": {
@@ -1061,16 +1029,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1681281620,
+        "lastModified": 1680432579,
-        "narHash": "sha256-SjX38nDKBrlQN0CbbUgHHYshlfewrjgQ4p0nKL4W4YI=",
+        "narHash": "sha256-sIcl3DvrDdQZM5kBWY25ocxJsIQFPV4gm54l79ZysB0=",
-        "owner": "yusdacra",
+        "owner": "danth",
         "repo": "stylix",
-        "rev": "e53b29d8e850bd7ee3012f5e4c7c0a1ded533a91",
+        "rev": "4205a141bfcc0b9d1c04932ec7fdf0f86f99aaf6",
         "type": "github"
       },
       "original": {
-        "owner": "yusdacra",
+        "owner": "danth",
-        "ref": "fixed",
         "repo": "stylix",
         "type": "github"
       }
@@ -1089,28 +1056,6 @@
         "repo": "flake-utils",
         "type": "github"
       }
-    },
-    "vscode-extensions": {
-      "inputs": {
-        "flake-compat": "flake-compat_4",
-        "flake-utils": "flake-utils_4",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1681693872,
-        "narHash": "sha256-gEy7sfcRiJypI0irVBWZ1xxyc+4MZPb5RqcC8krQi9s=",
-        "owner": "nix-community",
-        "repo": "nix-vscode-extensions",
-        "rev": "1c784113bfb7f0f0d82b32832fdf739f083e8d3a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-vscode-extensions",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -34,13 +34,10 @@
     nil.url = "github:oxalica/nil";
     nil.inputs.nixpkgs.follows = "nixpkgs";
 
-    stylix.url = "github:yusdacra/stylix/fixed";
+    stylix.url = "github:danth/stylix";
     stylix.inputs.nixpkgs.follows = "nixpkgs";
     stylix.inputs.home-manager.follows = "home";
 
-    vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
-    vscode-extensions.inputs.nixpkgs.follows = "nixpkgs";
-
     # needed for hyprland setup
     # hyprland.url = "github:hyprwm/Hyprland";
     # hyprland.inputs.nixpkgs.follows = "nixpkgs";

hosts/tkaronto/default.nix

@@ -113,8 +113,6 @@
     };
   };
 
-  networking.firewall.allowedUDPPorts = [49152];
-
   # for tailscale
   networking.firewall.checkReversePath = "loose";
   services.tailscale.enable = true;

pkgs-set/overlays/helix.nix

@@ -1,3 +1,8 @@
 {inputs}: final: prev: {
-  helix = inputs.helix.packages.${prev.system}.default;
+  helix = inputs.helix.packages.${prev.system}.default.override {
+    includeGrammarIf = grammar:
+      prev.lib.any
+      (name: grammar.name == name)
+      ["toml" "rust" "nix" "protobuf" "yaml" "json" "markdown" "html" "css" "zig"];
+  };
 }

users/modules/code/default.nix

@@ -1,34 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  # stylix.targets.vscode.enable = false;
-  programs.vscode = {
-    enable = true;
-    package = pkgs.vscodium;
-    extensions = with inputs.vscode-extensions.extensions.x86_64-linux.vscode-marketplace; [
-      mkhl.direnv
-      bbenoist.nix
-      svelte.svelte-vscode
-      bradlc.vscode-tailwindcss
-      (rust-lang.rust-analyzer.overrideAttrs (old: {
-        src = old.src.overrideAttrs (old: {
-          outputHash = "sha256-k9eDTY9y2ejg4jTApji8X6UmKYK/eCLMZJbiYuoTuyY=";
-        });
-      }))
-      # explodingcamera."1am"
-    ];
-    userSettings = {
-      "files.associations" = {
-        "*.css" = "tailwindcss";
-      };
-      "editor.quickSuggestions" = {
-        "strings" = "on";
-      };
-      "editor.suggest.showStatusBar" = true;
-      "editor.formatOnSave" = true;
-      # "workbench.colorTheme" = "1am";
-    };
-  };
-}

users/modules/helix/default.nix

@@ -3,7 +3,6 @@
   pkgs,
   ...
 }: {
-  stylix.targets.helix.enable = false;
   programs.helix = {
     enable = true;
     languages = [
@@ -18,7 +17,6 @@
       }
     ];
     settings = {
-      theme = "ferra";
       editor = {
         soft-wrap.enable = true;
         line-number = "relative";
@@ -28,10 +26,11 @@
         cursor-shape.insert = "block";
         lsp = {
           display-messages = true;
-          display-inlay-hints = false;
+          display-inlay-hints = true;
         };
         indent-guides = {
           render = true;
+          # character = "|";
         };
         auto-pairs = {
           "(" = ")";

users/patriot/default.nix

@@ -111,7 +111,7 @@ in {
         # cli stuff
         ["zoxide" "zsh" "fzf" "starship" "direnv"]
         # dev stuff
-        ["helix" "code" "git" "ssh"]
+        ["helix" "git" "ssh"]
         ["lollypop"]
       ];
     in

users/patriot/stylix.nix

@@ -10,53 +10,23 @@
 
   stylix.image = ./wallpaper.png;
   stylix.polarity = "dark";
-  # stylix.base16Scheme = {
+  stylix.base16Scheme = {
-  #   "base00" = "04080e";
+    "base00" = "04080e";
-  #   "base01" = "36393e";
+    "base01" = "36393e";
-  #   "base02" = "686b6e";
+    "base02" = "686b6e";
-  #   "base03" = "9b9c9f";
+    "base03" = "9b9c9f";
-  #   "base04" = "cdcecf";
+    "base04" = "cdcecf";
-  #   "base05" = "ffffff";
+    "base05" = "ffffff";
-  #   "base06" = "1d2126";
+    "base06" = "1d2126";
-  #   "base07" = "e6e6e7";
+    "base07" = "e6e6e7";
-  #   "base08" = "cf0466"; # splatoon 2 pink
+    "base08" = "cf0466"; # splatoon 2 pink
-  #   "base09" = "2851f6"; # splatoon 1 blue
+    "base09" = "2851f6"; # splatoon 1 blue
-  #   "base0A" = "6844e6"; # splatoon 3 purple
+    "base0A" = "6844e6"; # splatoon 3 purple
-  #   "base0B" = "17a80d"; # splatoon 2 green
+    "base0B" = "17a80d"; # splatoon 2 green
-  #   "base0C" = "fea972"; # splatoon 3 fuzzy orange color
+    "base0C" = "fea972"; # splatoon 3 fuzzy orange color
-  #   "base0D" = "fa5a00"; # splatoon 1 orange
+    "base0D" = "fa5a00"; # splatoon 1 orange
-  #   "base0E" = "fffe27"; # splatoon 3 yellow
+    "base0E" = "fffe27"; # splatoon 3 yellow
-  #   "base0F" = "bdbebc";
+    "base0F" = "bdbebc";
-  # };
-  stylix.base16Scheme = let
-    night = "#2b292d";
-    ash = "#383539";
-    umber = "#4d424b";
-    bark = "#6F5D63";
-    mist = "#D1D1E0";
-    sage = "#B1B695";
-    blush = "#fecdb2";
-    coral = "#ffa07a";
-    rose = "#F6B6C9";
-    ember = "#e06b75";
-    honey = "#F5D76E";
-  in {
-    base00 = night;
-    base01 = ash;
-    base02 = umber;
-    base03 = bark;
-    base04 = blush;
-    base05 = mist;
-    base06 = mist;
-    base07 = bark;
-    base08 = ember;
-    base09 = honey;
-    base0A = rose;
-    base0B = sage;
-    base0C = bark;
-    base0D = coral;
-    base0E = blush;
-    base0F = umber;
   };
 
   stylix.fonts = {