feat: added themes and other stuff

home/modules/nushell.nix

@@ -4,5 +4,9 @@
     configFile.text = ''
       $env.config = {show_banner: false}
     '';
+    shellAliases = {
+      y = "yy";
+      lg = "lazygit";
+    };
   };
 }

home/modules/starship/config/settings.nix

@@ -1,9 +1,63 @@
 {
+  flake,
+  lib,
+  ...
+}: let
+  inherit (flake.config.aesthetics.themes.theme) colors;
+  makeColor = c: "#" + c;
+  makeStyle = bg: fg: "bg:" + bg + " fg:" + fg + " bold";
+  surround = fg: text: "[](fg:" + makeColor colors.base + " bg:" + fg + ")" + "[█](fg:" + fg + ")" + text + "[█](fg:" + fg + ")";
+in {
   settings = {
     add_newline = false;
-    character = {
-      success_symbol = "[ ➜](bold #8bd5ca)";
-      error_symbol = "[ ¬◇](bold #ee99a0)";
+    character = let
+      makeChar = bg: c: surround (makeColor bg) ("[" + c + "](" + makeStyle (makeColor bg) (makeColor colors.crust) + ")");
+    in {
+      error_symbol = makeChar colors.maroon "⊥";
+      format = "$symbol";
+      success_symbol = makeChar colors.teal "λ";
     };
+    cmd_duration = {
+      format = surround (makeColor colors.mauve) "[ $duration]($style)";
+      min_time = 0;
+      show_milliseconds = true;
+      style = makeStyle (makeColor colors.mauve) (makeColor colors.crust);
+    };
+    directory = {
+      format = surround (makeColor colors.blue) "[󰉋 $path]($style)[$read_only]($read_only_style)";
+      read_only = "  ";
+      read_only_style = makeStyle (makeColor colors.blue) (makeColor colors.crust);
+      style = makeStyle (makeColor colors.blue) (makeColor colors.crust);
+      truncation_length = 1;
+      truncate_to_repo = false;
+    };
+    git_branch = {
+      format = surround (makeColor colors.peach) "[$symbol $branch]($style)";
+      style = makeStyle (makeColor colors.peach) (makeColor colors.crust);
+      symbol = "";
+    };
+    git_status = {
+      format = "[ \\[$all_status$ahead_behind\\]]($style)";
+      style = makeStyle (makeColor colors.yellow) (makeColor colors.crust);
+    };
+    hostname = {
+      format = surround (makeColor colors.sapphire) "[$ssh_symbol$hostname]($style)";
+      ssh_symbol = "󰖟 ";
+      style = makeStyle (makeColor colors.sapphire) (makeColor colors.crust);
+    };
+    pijul_channel = {
+      disabled = false;
+      format = surround (makeColor colors.peach) "[$symbol $channel]($style)";
+      style = makeStyle (makeColor colors.peach) (makeColor colors.crust);
+      symbol = "";
+    };
+    format = lib.concatStrings [
+      "$hostname"
+      "$directory"
+      "$pijul_channel"
+      "$git_branch"
+      "$cmd_duration"
+      "$character "
+    ];
   };
 }

home/modules/starship/default.nix

@@ -1,9 +1,16 @@
 {
+  flake,
+  lib,
+  ...
+}: {
   programs.starship = let
     configPath = ./config;
   in
     {
       enable = true;
     }
-    // (import (configPath + /settings.nix));
+    // (import (configPath + /settings.nix) {
+      inherit flake;
+      inherit lib;
+    });
 }

home/modules/vscode/config/userSettings.nix

@@ -1,8 +1,11 @@
 {
   lib,
   pkgs,
+  flake,
   ...
-}: {
+}: let
+  inherit (flake.config.aesthetics.themes.theme) font;
+in {
   userSettings = {
     "git.confirmSync" = false;
     "editor.insertSpaces" = false;
@@ -20,5 +23,10 @@
     "elmLS.disableElmLSDiagnostics" = true;
     "elmLS.elmReviewDiagnostics" = "warning";
     "editor.wordWrap" = "on";
+    "editor.fontSize" = 14;
+    "editor.fontFamily" = "'${font}', 'monospace', monospace";
+    "terminal.integrated.fontSize" = 14;
+    "terminal.integrated.fontFamily" = "'${font}', 'monospace', monospace";
+    "editor.fontLigatures" = true;
   };
 }

home/modules/vscode/default.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  flake,
   ...
 }: {
   programs = {
@@ -13,6 +14,6 @@
       }
       // (import (configPath + /keybindings.nix))
       // (import (configPath + /extensions.nix)) {inherit pkgs;}
-      // (import (configPath + /userSettings.nix)) {inherit pkgs lib;};
+      // (import (configPath + /userSettings.nix)) {inherit pkgs lib flake;};
   };
 }

home/modules/wezterm/config/extraConfig.nix

@@ -1,12 +1,15 @@
-{
+{flake, ...}: let
+  inherit (flake.config.aesthetics.themes.theme) font;
+in {
   extraConfig = ''
     return {
       color_scheme = "Catppuccin Macchiato",
-      font_size = 10,
+      font_size = 11,
+      font = wezterm.font('${font}'),
       enable_tab_bar = false,
       window_close_confirmation = 'NeverPrompt',
       term = 'wezterm',
-      enable_wayland = false,
+      enable_wayland = true,
       front_end = "WebGpu",
       max_fps = 200
     }

home/modules/wezterm/default.nix

@@ -1,9 +1,9 @@
-{
+{flake, ...}: {
   programs.wezterm = let
     configPath = ./config;
   in
     {
       enable = true;
     }
-    // (import (configPath + /extraConfig.nix));
+    // (import (configPath + /extraConfig.nix) {inherit flake;});
 }

home/modules/yazi/config/keymap.nix

@@ -0,0 +1,12 @@
+{
+  keymap.manager.prepend_keymap = [
+    {
+      on = ["Q"];
+      run = "quit";
+    }
+    {
+      on = ["q"];
+      run = "quit --no-cwd-file";
+    }
+  ];
+}

home/modules/yazi/default.nix

@@ -6,6 +6,7 @@
       enable = true;
       enableNushellIntegration = true;
     }
+    // (import (configPath + /keymap.nix))
     // (import (configPath + /settings.nix));
   # Keymap
   # https://github.com/sxyazi/yazi/blob/main/yazi-config/preset/keymap.toml