feat: fuck alejandra

home/modules/helix/config/languages.nix

@@ -2,7 +2,7 @@
   language = [
     {
       auto-format = true;
-      formatter.command = "alejandra";
+      formatter.command = "nixfmt";
       name = "nix";
     }
     {

home/modules/hyprland/hyprland/config/exec-once.nix

@@ -8,11 +8,9 @@
   "waybar"
   "nm-applet"
   "blueman-applet"
-  "easyeffects"
-  "pkill easyeffects"
+  "easyeffects -r"
   "emote"
   "flameshot"
-  "protonvpn c -cc CA"
   "pactl set-default-sink alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink"
   "pactl set-default-source alsa_input.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Mic1__source"
   "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'"

home/modules/hyprland/hyprland/config/windowrulev2.nix

@@ -61,7 +61,7 @@ let
 
   workspaceInit2 = builtins.map (x: "workspace 2 silent, " + x) [
     "class:^${code}$"
-    "class:^${firefox}$"
+    # "class:^${firefox}$"
   ];
 
   workspaceInit3 = builtins.map (x: "workspace 3 silent, " + x) [

home/modules/vscode/config/extensions.nix

@@ -6,11 +6,11 @@ with pkgs.vscode-extensions; [
   esbenp.prettier-vscode
   haskell.haskell
   james-yu.latex-workshop
-  jnoortheen.nix-ide
-  kamadorueda.alejandra
+  # jnoortheen.nix-ide
   mattn.lisp
   mkhl.direnv
   pkief.material-icon-theme
   streetsidesoftware.code-spell-checker
   tamasfe.even-better-toml
+  brettm12345.nixfmt-vscode
 ]

home/modules/vscode/config/userSettings.nix

@@ -15,11 +15,11 @@ in {
   "git.enableSmartCommit" = true;
   "nix.enableLanguageServer" = true;
   "nix.serverPath" = lib.getExe pkgs.nil;
-  "nix.formatterPath" = lib.getExe pkgs.alejandra;
+  "nix.formatterPath" = lib.getExe pkgs.haskellPackages.nixfmt;
   "window.menuBarVisibility" = "toggle";
   "workbench.iconTheme" = "material-icon-theme";
   "workbench.startupEditor" = "none";
-  "workbench.colorTheme" = "Catppuccin Mocha";
+  "workbench.colorTheme" = "Catppuccin Macchiato";
   "workbench.statusBar.visible" = false;
   "editor.multiCursorLimit" = 700000;
   "elmLS.disableElmLSDiagnostics" = true;

home/modules/waybar/config/style.nix

@@ -6,24 +6,24 @@
 
   inherit
     (flake.config.aesthetics.themes)
-    currentTheme
-    currentColours
-    schemes
+    # currentTheme
+    # elements
+    # schemes
     font
     ;
 
-  cc = currentColours;
+  # el = elements;
 
-  theme = colour: schemes.${currentTheme}.colours.${colour};
+  # theme = colour: schemes.${currentTheme}.colours.${colour};
 
   custom = {
     font = font;
     font_size = "12px";
     font_weight = "bold";
-    text_color = theme cc.warmAccent2;
-    secondary_accent = theme cc.coolAccent4;
-    tertiary_accent = theme cc.coolAccent1;
-    button_color = theme cc.overlay2;
+    # text_color = theme el.keyword;
+    # secondary_accent = theme el.link;
+    # tertiary_accent = theme el.operator;
+    # button_color = theme el.overlay2;
     background_1 = colours.base;
     background_2 = colours.crust;
     background_3 = colours.surface2;

home/modules/zed/config/userSettings/config/assistant/default.nix

@@ -1,9 +1,9 @@
 {
   enabled = true;
   version = "2";
-  default_open_ai_model = null;
-  default_model = {
-    provider = "zed.dev";
-    model = "claude-3-5-sonnet-latest";
-  };
+  # default_open_ai_model = null;
+  # default_model = {
+  #   provider = "zed.dev";
+  #   model = "claude-3-5-sonnet-latest";
+  # };
 }

home/modules/zed/config/userSettings/config/interface/default.nix

@@ -13,7 +13,7 @@ in {
   buffer_font_size = 14;
   tab_size = 2;
   cursor_blink = true;
-  theme = "Rosé Pine";
+  theme = "Catppuccin Macchiato";
   show_copilot_suggestions = true;
   bracket_pairing = "always";
   relative_line_numbers = true;

home/modules/zed/default.nix

@@ -19,14 +19,15 @@
       pkgs
       ;
   };
+in
   # packagePath = flake.inputs.zed.packages.${pkgs.system}.default;
-in {
-  programs.zed-editor = {
-    enable = true;
-    # package = packagePath;
-    extraPackages = extraPackagesPath;
-    extensions = extensionsPath;
-    userKeymaps = userKeymapsPath;
-    userSettings = userSettingsPath;
-  };
-}
+  {
+    programs.zed-editor = {
+      enable = true;
+      # package = packagePath;
+      extraPackages = extraPackagesPath;
+      extensions = extensionsPath;
+      userKeymaps = userKeymapsPath;
+      userSettings = userSettingsPath;
+    };
+  }