From 8105c1ed34842cd26f82e8b0d48d0f37da9c0d85 Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 30 May 2024 20:02:02 +0200 Subject: [PATCH] feat(rice): catppuccin -> milspec --- README.md | 1 - _sources/generated.json | 51 +++----- _sources/generated.nix | 53 +++----- flake.lock | 42 ------ flake.nix | 8 -- home/apps/colorscheme-sync.nix | 29 +++-- home/apps/nu.nix | 9 +- home/apps/nu/config.nu | 19 +-- home/apps/nu/config/keybindings.nu | 4 +- home/apps/starship/config.toml | 201 ++++++++++------------------- home/apps/vscode.nix | 1 - home/apps/vscode/settings.json | 5 +- home/apps/wezterm.nix | 2 +- home/apps/wezterm/wezterm.lua | 35 ++++- home/apps/zsh.nix | 2 - home/default.nix | 2 - machines/common/darwin/default.nix | 2 + machines/sashimi/brew.nix | 5 +- nvfetcher.toml | 16 +-- pkgs/overlays.nix | 2 - 20 files changed, 180 insertions(+), 309 deletions(-) diff --git a/README.md b/README.md index 997fdee..5b7ab3f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ Here's what you can find: - **Firefox** with privacy-centered settings, though I don't use it heavily anymore. - My **GPG** & **[Sops.nix](https://github.com/Mic92/sops-nix)** settings - Other random bits of config tools I've collected over the years -- The **[Catppuccin](https://github.com/catppuccin)** theme, wherever possible - macOS: - **[Yabai](https://github.com/koekeishiya/yabai)** as my WM - Linux: diff --git a/_sources/generated.json b/_sources/generated.json index 63ef0a7..f19edee 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -11,18 +11,19 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, + "owner": "catppuccin", + "repo": "bat", "rev": "d714cc1d358ea51bfc02550dabab693f70cccea0", "sha256": "sha256-Q5B4NDrfCIK3UAMs94vdXnR42k4AXCqZz6sRn8bzmf4=", - "type": "git", - "url": "https://github.com/catppuccin/bat" + "type": "github" }, "version": "d714cc1d358ea51bfc02550dabab693f70cccea0" }, - "catppuccin-wezterm": { + "milspec": { "cargoLocks": null, - "date": "2023-04-12", + "date": "2024-05-30", "extract": null, - "name": "catppuccin-wezterm", + "name": "milspec", "passthru": null, "pinned": false, "src": { @@ -30,31 +31,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "b1a81bae74d66eaae16457f2d8f151b5bd4fe5da", - "sha256": "sha256-McSWoZaJeK+oqdK/0vjiRxZGuLBpEB10Zg4+7p5dIGY=", - "type": "git", - "url": "https://github.com/catppuccin/wezterm" + "owner": "nekowinston", + "repo": "milspec.nvim", + "rev": "89b7d29dad6708c04821cbf8ba8c80294f8d1733", + "sha256": "sha256-GWto6Y+2ZJXgTbOApQrhzsBT9sPENhgqoD6SSxykAVE=", + "type": "github" }, - "version": "b1a81bae74d66eaae16457f2d8f151b5bd4fe5da" - }, - "catppuccin-zsh-fsh": { - "cargoLocks": null, - "date": "2024-04-09", - "extract": null, - "name": "catppuccin-zsh-fsh", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "rev": "dd7baca6e0e943f36d1a6721820346e91f25065f", - "sha256": "sha256-qd/+MHmgP+dOnYm6meSu5oCZ/TunCWGHnHqAXm79ERw=", - "type": "git", - "url": "https://github.com/catppuccin/zsh-fsh" - }, - "version": "dd7baca6e0e943f36d1a6721820346e91f25065f" + "version": "89b7d29dad6708c04821cbf8ba8c80294f8d1733" }, "nekowinston-wezterm-bar": { "cargoLocks": null, @@ -68,10 +51,11 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, + "owner": "nekowinston", + "repo": "wezterm-bar", "rev": "e96b81460b3ad11a7461934dcb7889ce5079f97f", "sha256": "sha256-3acxqJ9HMA5hASWq/sVL9QQjfEw5Xrh2fT9nFuGjzHM=", - "type": "git", - "url": "https://github.com/nekowinston/wezterm-bar" + "type": "github" }, "version": "e96b81460b3ad11a7461934dcb7889ce5079f97f" }, @@ -102,10 +86,11 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, + "owner": "zdharma-continuum", + "repo": "fast-syntax-highlighting", "rev": "cf318e06a9b7c9f2219d78f41b46fa6e06011fd9", "sha256": "sha256-RVX9ZSzjBW3LpFs2W86lKI6vtcvDWP6EPxzeTcRZua4=", - "type": "git", - "url": "https://github.com/zdharma-continuum/fast-syntax-highlighting" + "type": "github" }, "version": "cf318e06a9b7c9f2219d78f41b46fa6e06011fd9" } diff --git a/_sources/generated.nix b/_sources/generated.nix index 0b3cf00..27bf034 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -4,51 +4,35 @@ catppuccin-bat = { pname = "catppuccin-bat"; version = "d714cc1d358ea51bfc02550dabab693f70cccea0"; - src = fetchgit { - url = "https://github.com/catppuccin/bat"; + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "bat"; rev = "d714cc1d358ea51bfc02550dabab693f70cccea0"; fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; sha256 = "sha256-Q5B4NDrfCIK3UAMs94vdXnR42k4AXCqZz6sRn8bzmf4="; }; date = "2024-04-25"; }; - catppuccin-wezterm = { - pname = "catppuccin-wezterm"; - version = "b1a81bae74d66eaae16457f2d8f151b5bd4fe5da"; - src = fetchgit { - url = "https://github.com/catppuccin/wezterm"; - rev = "b1a81bae74d66eaae16457f2d8f151b5bd4fe5da"; + milspec = { + pname = "milspec"; + version = "89b7d29dad6708c04821cbf8ba8c80294f8d1733"; + src = fetchFromGitHub { + owner = "nekowinston"; + repo = "milspec.nvim"; + rev = "89b7d29dad6708c04821cbf8ba8c80294f8d1733"; fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sha256 = "sha256-McSWoZaJeK+oqdK/0vjiRxZGuLBpEB10Zg4+7p5dIGY="; + sha256 = "sha256-GWto6Y+2ZJXgTbOApQrhzsBT9sPENhgqoD6SSxykAVE="; }; - date = "2023-04-12"; - }; - catppuccin-zsh-fsh = { - pname = "catppuccin-zsh-fsh"; - version = "dd7baca6e0e943f36d1a6721820346e91f25065f"; - src = fetchgit { - url = "https://github.com/catppuccin/zsh-fsh"; - rev = "dd7baca6e0e943f36d1a6721820346e91f25065f"; - fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sha256 = "sha256-qd/+MHmgP+dOnYm6meSu5oCZ/TunCWGHnHqAXm79ERw="; - }; - date = "2024-04-09"; + date = "2024-05-30"; }; nekowinston-wezterm-bar = { pname = "nekowinston-wezterm-bar"; version = "e96b81460b3ad11a7461934dcb7889ce5079f97f"; - src = fetchgit { - url = "https://github.com/nekowinston/wezterm-bar"; + src = fetchFromGitHub { + owner = "nekowinston"; + repo = "wezterm-bar"; rev = "e96b81460b3ad11a7461934dcb7889ce5079f97f"; fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; sha256 = "sha256-3acxqJ9HMA5hASWq/sVL9QQjfEw5Xrh2fT9nFuGjzHM="; }; date = "2023-05-10"; @@ -64,12 +48,11 @@ zsh-fast-syntax-highlighting = { pname = "zsh-fast-syntax-highlighting"; version = "cf318e06a9b7c9f2219d78f41b46fa6e06011fd9"; - src = fetchgit { - url = "https://github.com/zdharma-continuum/fast-syntax-highlighting"; + src = fetchFromGitHub { + owner = "zdharma-continuum"; + repo = "fast-syntax-highlighting"; rev = "cf318e06a9b7c9f2219d78f41b46fa6e06011fd9"; fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; sha256 = "sha256-RVX9ZSzjBW3LpFs2W86lKI6vtcvDWP6EPxzeTcRZua4="; }; date = "2023-07-05"; diff --git a/flake.lock b/flake.lock index b2f3118..93b32df 100644 --- a/flake.lock +++ b/flake.lock @@ -50,46 +50,6 @@ "type": "github" } }, - "catppuccin-toolbox": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715991036, - "narHash": "sha256-ZVT4ttJ9gR/u2rlIrsGXX48pBFoemQfzvdDe4oHwzgs=", - "owner": "catppuccin", - "repo": "toolbox", - "rev": "145f7b68bd4be34daccd17cb5ddd9f6d7187c1ee", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "toolbox", - "type": "github" - } - }, - "catppuccin-vsc": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715401925, - "narHash": "sha256-EGZGHCv4OFqzFc9oP82LCKMWfMGsmadOOZ0DZHYSdns=", - "owner": "catppuccin", - "repo": "vscode", - "rev": "f0a6271f62ebb868f32c7ad4ecb31104c26f987a", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "vscode", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -368,8 +328,6 @@ "inputs": { "agenix": "agenix", "caarlos0-nur": "caarlos0-nur", - "catppuccin-toolbox": "catppuccin-toolbox", - "catppuccin-vsc": "catppuccin-vsc", "darwin": "darwin", "flake-parts": "flake-parts", "flake-utils": "flake-utils", diff --git a/flake.nix b/flake.nix index 23bfdb0..5e1a427 100644 --- a/flake.nix +++ b/flake.nix @@ -145,14 +145,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nekowinston-nur.url = "github:nekowinston/nur"; - catppuccin-vsc = { - url = "github:catppuccin/vscode"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - catppuccin-toolbox = { - url = "github:catppuccin/toolbox"; - inputs.nixpkgs.follows = "nixpkgs"; - }; agenix = { url = "github:ryantm/agenix"; diff --git a/home/apps/colorscheme-sync.nix b/home/apps/colorscheme-sync.nix index 34c5148..84daada 100644 --- a/home/apps/colorscheme-sync.nix +++ b/home/apps/colorscheme-sync.nix @@ -7,10 +7,12 @@ let inherit (pkgs.stdenv) isDarwin isLinux; - vividCatppuccin = pkgs.runCommand "vivid-catppuccin" { nativeBuildInputs = [ pkgs.vivid ]; } '' + milspec = (pkgs.callPackage ../../_sources/generated.nix { }).milspec; + + vividMilspec = pkgs.runCommand "vivid-catppuccin" { nativeBuildInputs = [ pkgs.vivid ]; } '' mkdir -p $out - for flavor in mocha macchiato frappe latte; do - vivid generate "catppuccin-''${flavor}" > "$out/''${flavor}" + for variant in dark light; do + vivid generate "${milspec.src}/extras/vivid/milspec-''${variant}.yml" > "$out/''${variant}" done ''; in @@ -64,31 +66,40 @@ in }; }; + xdg.configFile."fsh".source = "${milspec.src}/extras/zsh-fast-syntax-highlighting"; programs.zsh.initExtra = '' zadm_sync() { local flavor="$(dark-mode-ternary mocha latte)" + local variant="$(dark-mode-ternary dark light)" export BAT_THEME="Catppuccin ''${(C)flavor}" - export LS_COLORS="$(cat "${vividCatppuccin}/''${flavor}")" - export STARSHIP_CONFIG__PALETTE="catppuccin_''${flavor}" + export LS_COLORS="$(cat "${vividMilspec}/''${variant}")" + export STARSHIP_CONFIG__PALETTE="milspec_''${variant}" - fast-theme "XDG:catppuccin-''${flavor}" >/dev/null + fast-theme "XDG:milspec-''${variant}" >/dev/null } add-zsh-hook precmd zadm_sync ''; + programs.nushell.extraConfig = '' + use ${milspec.src}/extras/nu/milspec.nu + $env.config = ($env.config? | default {}) + + $env.config.color_config = (milspec -R dark) + $env.config.hooks = ($env.config.hooks? | default {}) $env.config.hooks.pre_prompt = ( $env.config.hooks.pre_prompt? | default [] | append {|| let flavor = dark-mode-ternary "mocha" "latte" + let variant = dark-mode-ternary "dark" "light" - $env.config.color_config = (catppuccin $flavor) + $env.config.color_config = (milspec -R $variant) $env.BAT_THEME = "Catppuccin " + ($flavor | str capitalize) - $env.STARSHIP_CONFIG__PALETTE = "catppuccin_" + $flavor - $env.LS_COLORS = (cat $"${vividCatppuccin}/($flavor)") + $env.STARSHIP_CONFIG__PALETTE = "milspec_" + $variant + $env.LS_COLORS = (cat $"${vividMilspec}/($variant)") } ) ''; diff --git a/home/apps/nu.nix b/home/apps/nu.nix index ad8ab93..ed41abe 100644 --- a/home/apps/nu.nix +++ b/home/apps/nu.nix @@ -5,7 +5,10 @@ ... }: let - plugins = "${pkgs.nu_scripts}/share/nu_scripts"; + nu_scripts = "${pkgs.nu_scripts}/share/nu_scripts"; + + # milspec = (pkgs.callPackage ../../_sources/generated.nix { }).milspec; + milspec.src = /Users/winston/Code/neovim/milspec; shellAliases = lib.concatStringsSep "\n" ( lib.mapAttrsToList (k: v: "alias ${k} = ${v}") config.home.shellAliases @@ -20,7 +23,7 @@ let name = el.name or el; filename = el.filename or el; in - "source ${plugins}/custom-completions/${name}/${filename}-completions.nu" + "source ${nu_scripts}/custom-completions/${name}/${filename}-completions.nu" ) completions ); @@ -67,7 +70,7 @@ in |cmd_name| (try { ${command-not-found} $cmd_name }) } - source ${plugins}/aliases/git/git-aliases.nu + source ${nu_scripts}/aliases/git/git-aliases.nu '' + shellAliases + mkCompletions completions; diff --git a/home/apps/nu/config.nu b/home/apps/nu/config.nu index 6907295..d1a479d 100644 --- a/home/apps/nu/config.nu +++ b/home/apps/nu/config.nu @@ -1,5 +1,4 @@ use ($nu.default-config-dir | path join 'config/keybindings.nu') -use ($nu.default-config-dir | path join 'catppuccin.nu') # use prompt indicators from starship $env.PROMPT_INDICATOR = "" @@ -15,27 +14,20 @@ $env.config = { clickable_links: true } - rm: { - always_trash: false - } + rm: { always_trash: false } table: { - # basic, compact, compact_double, light, thin, with_love, rounded, reinforced, heavy, none, other - mode: thin - # "always" show indexes, "never" show indexes, "auto" = show indexes when a table has "index" column + mode: psql index_mode: auto - # show 'empty list' and 'empty record' placeholders for command output show_empty: true - # a left right padding of each column in a table padding: { left: 1, right: 1 } trim: { - methodology: truncating # `wrapping` or `truncating` + methodology: truncating truncating_suffix: "…" } - # show header text on separator/border line - header_on_separator: false + header_on_separator: true # limit data rows from top and bottom after reaching a set point - # abbreviated_row_count: 10 + # abbreviated_row_count: 100 } error_style: fancy @@ -91,7 +83,6 @@ $env.config = { vi_normal: inherit } - color_config: (catppuccin "mocha") use_grid_icons: true # always, never, number_of_rows, auto footer_mode: 20 diff --git a/home/apps/nu/config/keybindings.nu b/home/apps/nu/config/keybindings.nu index c8ef7a0..572b294 100644 --- a/home/apps/nu/config/keybindings.nu +++ b/home/apps/nu/config/keybindings.nu @@ -16,7 +16,7 @@ export def main [] { { name: ide_completion_menu modifier: control - keycode: char_n + keycode: char_j mode: [vi_normal, vi_insert] event: { until: [ @@ -211,7 +211,7 @@ export def main [] { { name: move_down modifier: control - keycode: char_t + keycode: char_n mode: [vi_normal, vi_insert] event: { until: [ diff --git a/home/apps/starship/config.toml b/home/apps/starship/config.toml index b6e8863..4adf589 100644 --- a/home/apps/starship/config.toml +++ b/home/apps/starship/config.toml @@ -1,7 +1,7 @@ '$schema' = 'https://starship.rs/config-schema.json' format = """ -[┌](surface2)\ +[┌](gray)\ $directory\ $username\ $hostname\ @@ -70,21 +70,21 @@ $terraform)\ \ $line_break\ \ -[└](surface2)\ +[└](gray)\ $character""" add_newline = true -continuation_prompt = '[>](bold subtext0) ' -palette = "catppuccin_mocha" +continuation_prompt = '[>](bold gray) ' +palette = "milspec_dark" [character] -success_symbol = '[λ](bold text)' +success_symbol = '[λ](bold fg)' error_symbol = '[λ](bold red)' -vimcmd_symbol = '[](bold cyan)' +vimcmd_symbol = '[](bold turquoise)' [time] format = ' [$time]($style) ' -style = 'fg:subtext0' +style = 'fg:gray' disabled = true [directory] @@ -112,28 +112,28 @@ style = 'fg:red' ### VCS [git_branch] format = '[$symbol$branch ]($style)' -style = 'fg:peach' +style = 'fg:orange' symbol = ' ' ignore_branches = ['main', 'master'] [hg_branch] format = '[$symbol$branch ]($style)' -style = 'fg:peach' +style = 'fg:orange' [git_commit] format = '[$tag ]($style)' -style = 'fg:peach' +style = 'fg:orange' tag_disabled = false tag_symbol = ' ' [git_state] format = '[\[$state($progress_current/$progress_total)\] ]($style)' -style = 'fg:peach' +style = 'fg:orange' disabled = false [git_status] format = '[$all_status$ahead_behind]($style)' -style = 'fg:peach' +style = 'fg:orange' ahead = ' ' behind = ' ' conflicted = '󰩌 ' @@ -149,25 +149,25 @@ disabled = false ### SHELL STATUS [cmd_duration] format = '[ $duration ]($style)' -style = 'fg:yellow' +style = 'fg:gold' show_milliseconds = true min_time = 2000 [jobs] disabled = false symbol = ' ' -style = 'fg:yellow' +style = 'fg:gold' [shlvl] disabled = false format = '[$symbol$shlvl]($style) ' -style = 'fg:yellow' +style = 'fg:gold' symbol = ' ' threshold = 3 [status] format = '[$symbol$status]($style) ' -style = 'fg:yellow' +style = 'fg:gold' not_executable_symbol = ' ' not_found_symbol = ' ' sigint_symbol = ' ' @@ -179,7 +179,7 @@ disabled = true [sudo] disabled = false format = '[$symbol ]($style)' -style = 'fg:yellow' +style = 'fg:gold' symbol = ' ' ### LANGUAGE VERSION INDICATORS @@ -389,37 +389,37 @@ symbol = '󰗹 ' [aws] disabled = false format = '[$symbol($profile)(\($region\))(\[$duration\]) ]($style)' -style = 'fg:mauve' +style = 'fg:violet' symbol = ' ' [azure] disabled = true format = '[$symbol($subscription)]($style)' -style = 'fg:mauve' +style = 'fg:violet' symbol = ' ' [docker_context] disabled = false format = '[$symbol$context ]($style)' -style = 'fg:mauve' +style = 'fg:violet' symbol = ' ' [gcloud] disabled = false format = '[$symbol$account(@$domain)(\($region\)) ]($style)' -style = 'fg:mauve' +style = 'fg:violet' symbol = ' ' [kubernetes] disabled = false format = '[$symbol($cluster/$namespace) ]($style)' -style = 'fg:mauve' +style = 'fg:violet' symbol = '󱃾 ' [openstack] disabled = false format = '[$symbol$cloud(\($project\)) ]($style)' -style = 'fg:mauve' +style = 'fg:violet' symbol = ' ' [pulumi] @@ -430,119 +430,50 @@ style = 'fg:blue' [terraform] disabled = false format = '[$symbol$workspace ]($style)' -style = 'fg:mauve' +style = 'fg:violet' symbol = '󱁢 ' ### COLOR PALETTES -[palettes.catppuccin_latte] -rosewater = '#dc8a78' -flamingo = '#dd7878' -pink = '#ea76cb' -mauve = '#8839ef' -red = '#d20f39' -maroon = '#e64553' -peach = '#fe640b' -yellow = '#df8e1d' -green = '#40a02b' -teal = '#179299' -sky = '#04a5e5' -sapphire = '#209fb5' -blue = '#1e66f5' -lavender = '#7287fd' -text = '#4c4f69' -subtext1 = '#5c5f77' -subtext0 = '#6c6f85' -overlay2 = '#7c7f93' -overlay1 = '#8c8fa1' -overlay0 = '#9ca0b0' -surface2 = '#acb0be' -surface1 = '#bcc0cc' -surface0 = '#ccd0da' -base = '#eff1f5' -mantle = '#e6e9ef' -crust = '#dce0e8' -contrast = '#ffffff' +[palettes.milspec_light] +fg = "#111418" +bg = "#f6f7f9" +gray = "#5f6b7c" +bgGray = "#d3d8de" +fgGray = "#404854" +core = "#ffffff" +blue = "#2d72d2" +green = "#238551" +orange = "#c87619" +red = "#cd4246" +vermilion = "#d33d17" +rose = "#db2c6f" +violet = "#9d3f9d" +indigo = "#7961db" +cerulean = "#147eb3" +turquoise = "#00a396" +forest = "#29a634" +lime = "#8eb125" +gold = "#d1980b" +sepia = "#946638" -[palettes.catppuccin_frappe] -rosewater = "#f2d5cf" -flamingo = "#eebebe" -pink = "#f4b8e4" -mauve = "#ca9ee6" -red = "#e78284" -maroon = "#ea999c" -peach = "#ef9f76" -yellow = "#e5c890" -green = "#a6d189" -teal = "#81c8be" -sky = "#99d1db" -sapphire = "#85c1dc" -blue = "#8caaee" -lavender = "#babbf1" -text = "#c6d0f5" -subtext1 = "#b5bfe2" -subtext0 = "#a5adce" -overlay2 = "#949cbb" -overlay1 = "#838ba7" -overlay0 = "#737994" -surface2 = "#626880" -surface1 = "#51576d" -surface0 = "#414559" -base = "#303446" -mantle = "#292c3c" -crust = "#232634" - -[palettes.catppuccin_macchiato] -rosewater = "#f4dbd6" -flamingo = "#f0c6c6" -pink = "#f5bde6" -mauve = "#c6a0f6" -red = "#ed8796" -maroon = "#ee99a0" -peach = "#f5a97f" -yellow = "#eed49f" -green = "#a6da95" -teal = "#8bd5ca" -sky = "#91d7e3" -sapphire = "#7dc4e4" -blue = "#8aadf4" -lavender = "#b7bdf8" -text = "#cad3f5" -subtext1 = "#b8c0e0" -subtext0 = "#a5adcb" -overlay2 = "#939ab7" -overlay1 = "#8087a2" -overlay0 = "#6e738d" -surface2 = "#5b6078" -surface1 = "#494d64" -surface0 = "#363a4f" -base = "#24273a" -mantle = "#1e2030" -crust = "#181926" - -[palettes.catppuccin_mocha] -rosewater = "#f5e0dc" -flamingo = "#f2cdcd" -pink = "#f5c2e7" -mauve = "#cba6f7" -red = "#f38ba8" -maroon = "#eba0ac" -peach = "#fab387" -yellow = "#f9e2af" -green = "#a6e3a1" -teal = "#94e2d5" -sky = "#89dceb" -sapphire = "#74c7ec" -blue = "#89b4fa" -lavender = "#b4befe" -text = "#cdd6f4" -subtext1 = "#bac2de" -subtext0 = "#a6adc8" -overlay2 = "#9399b2" -overlay1 = "#7f849c" -overlay0 = "#6c7086" -surface2 = "#585b70" -surface1 = "#45475a" -surface0 = "#313244" -base = "#1e1e2e" -mantle = "#181825" -crust = "#11111b" +[palettes.milspec_dark] +fg = "#ffffff" +bg = "#1c2127" +gray = "#c5cbd3" +bgGray = "#404854" +fgGray = "#d3d8de" +core = "#111418" +blue = "#8abbff" +green = "#72ca9b" +orange = "#fbb360" +red = "#fa999c" +vermilion = "#ff9980" +rose = "#ff66a1" +violet = "#d69fd6" +indigo = "#bdadff" +cerulean = "#68c1ee" +turquoise = "#7ae1d8" +forest = "#62d96b" +lime = "#d4f17e" +gold = "#fbd065" +sepia = "#d0b090" diff --git a/home/apps/vscode.nix b/home/apps/vscode.nix index 0f9415c..fd18a12 100644 --- a/home/apps/vscode.nix +++ b/home/apps/vscode.nix @@ -90,7 +90,6 @@ in astro-build.astro-vscode bashmish.es6-string-css bradlc.vscode-tailwindcss - catppuccin.catppuccin-vsc-icons charliermarsh.ruff dbaeumer.vscode-eslint denoland.vscode-deno diff --git a/home/apps/vscode/settings.json b/home/apps/vscode/settings.json index f809549..ef1286c 100644 --- a/home/apps/vscode/settings.json +++ b/home/apps/vscode/settings.json @@ -24,9 +24,9 @@ "editor.fontSize": 15, "editor.inlayHints.fontSize": 8, "terminal.integrated.fontSize": 14, - "editor.fontFamily": "Berkeley Mono, Symbols Nerd Font, monospace", + "editor.fontFamily": "Cascadia Code, Symbols Nerd Font, monospace", // Use these with Cascadia Code for cursive - // "editor.fontLigatures": "'calt', 'ss01'", + "editor.fontLigatures": "'calt', 'ss01'", "markdown.preview.fontFamily": "IBM Plex Sans, sans-serif", // disable updates @@ -39,7 +39,6 @@ "window.commandCenter": false, "window.titleBarStyle": "custom", "workbench.colorTheme": "Catppuccin Mocha", - "workbench.iconTheme": "catppuccin-mocha", "workbench.layoutControl.enabled": false, "workbench.preferredDarkColorTheme": "Catppuccin Mocha", "workbench.preferredLightColorTheme": "Catppuccin Latte", diff --git a/home/apps/wezterm.nix b/home/apps/wezterm.nix index f03242d..4c4909c 100644 --- a/home/apps/wezterm.nix +++ b/home/apps/wezterm.nix @@ -24,7 +24,7 @@ in recursive = true; }; "wezterm/bar".source = srcs.nekowinston-wezterm-bar.src; - "wezterm/catppuccin".source = srcs.catppuccin-wezterm.src; + "wezterm/milspec".source = srcs.milspec.src + "/extras/wezterm"; }; }) ]; diff --git a/home/apps/wezterm/wezterm.lua b/home/apps/wezterm/wezterm.lua index 2253153..9840a1a 100644 --- a/home/apps/wezterm/wezterm.lua +++ b/home/apps/wezterm/wezterm.lua @@ -6,16 +6,20 @@ require("config.keys").apply(c) c.font = wezterm.font_with_fallback({ "Berkeley Mono", + -- "Cascadia Code", "Symbols Nerd Font", }) c.front_end = "WebGpu" c.font_size = 13 -c.harfbuzz_features = { "calt=1", "ss01=1" } +-- c.harfbuzz_features = { "calt=1", "ss01=1" } c.command_palette_font_size = c.font_size * 1.1 c.window_frame = { font = wezterm.font("IBM Plex Sans"), } +-- c.window_background_opacity = 0.85 +-- c.macos_window_background_blur = 20 + c.window_decorations = "RESIZE|INTEGRATED_BUTTONS" c.window_padding = { left = 0, right = 0, top = 50, bottom = 0 } c.adjust_window_size_when_changing_font_size = false @@ -28,6 +32,33 @@ if utils.is_darwin() then require("bar.plugin").apply_to_config(c) end -require("catppuccin.plugin").apply_to_config(c, { sync = true }) +c.use_fancy_tab_bar = false +c.tab_bar_at_bottom = true + +require("milspec.plugin").apply_to_config(c, { sync = true }) + +-- folke/zen-mode.nvim +wezterm.on("user-var-changed", function(window, pane, name, value) + local overrides = window:get_config_overrides() or {} + if name == "ZEN_MODE" then + local incremental = value:find("+") + local number_value = tonumber(value) + if incremental ~= nil then + while number_value > 0 do + window:perform_action(wezterm.action.IncreaseFontSize, pane) + number_value = number_value - 1 + end + overrides.enable_tab_bar = false + elseif number_value < 0 then + window:perform_action(wezterm.action.ResetFontSize, pane) + overrides.font_size = nil + overrides.enable_tab_bar = true + else + overrides.font_size = number_value + overrides.enable_tab_bar = false + end + end + window:set_config_overrides(overrides) +end) return c diff --git a/home/apps/zsh.nix b/home/apps/zsh.nix index d2808fa..190c9d9 100644 --- a/home/apps/zsh.nix +++ b/home/apps/zsh.nix @@ -107,6 +107,4 @@ in }; history.path = "${config.xdg.configHome}/zsh/history"; }; - - xdg.configFile."fsh".source = "${srcs.catppuccin-zsh-fsh.src}/themes"; } diff --git a/home/default.nix b/home/default.nix index 6b3e5f7..157470a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -22,8 +22,6 @@ in _1password age age-plugin-yubikey - catppuccin-catwalk - catppuccin-whiskers deno fd ffmpeg diff --git a/machines/common/darwin/default.nix b/machines/common/darwin/default.nix index c3e9052..7e4b8fc 100644 --- a/machines/common/darwin/default.nix +++ b/machines/common/darwin/default.nix @@ -12,6 +12,8 @@ # Auto upgrade nix package and the daemon service. services.nix-daemon.enable = true; + nix.linux-builder.enable = true; + services = { yabai = { enable = true; diff --git a/machines/sashimi/brew.nix b/machines/sashimi/brew.nix index 3c5fe2e..bb4ee22 100644 --- a/machines/sashimi/brew.nix +++ b/machines/sashimi/brew.nix @@ -16,10 +16,7 @@ in homebrew = { enable = true; caskArgs.require_sha = true; - brews = [ - "podman" - "podman-compose" - ]; + brews = [ "podman" ]; casks = [ "1password" (skipSha "affinity-designer") diff --git a/nvfetcher.toml b/nvfetcher.toml index a3510b9..acc4e97 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -1,18 +1,14 @@ [catppuccin-bat] src.git = "https://github.com/catppuccin/bat" -fetch.git = "https://github.com/catppuccin/bat" +fetch.github = "catppuccin/bat" -[catppuccin-wezterm] -src.git = "https://github.com/catppuccin/wezterm" -fetch.git = "https://github.com/catppuccin/wezterm" - -[catppuccin-zsh-fsh] -src.git = "https://github.com/catppuccin/zsh-fsh" -fetch.git = "https://github.com/catppuccin/zsh-fsh" +[milspec] +src.git = "https://github.com/nekowinston/milspec.nvim" +fetch.github = "nekowinston/milspec.nvim" [nekowinston-wezterm-bar] src.git = "https://github.com/nekowinston/wezterm-bar" -fetch.git = "https://github.com/nekowinston/wezterm-bar" +fetch.github = "nekowinston/wezterm-bar" [yabai] src.github = "koekeishiya/yabai" @@ -20,4 +16,4 @@ fetch.url = "https://github.com/koekeishiya/yabai/releases/download/$ver/yabai-$ [zsh-fast-syntax-highlighting] src.git = "https://github.com/zdharma-continuum/fast-syntax-highlighting" -fetch.git = "https://github.com/zdharma-continuum/fast-syntax-highlighting" +fetch.github = "zdharma-continuum/fast-syntax-highlighting" diff --git a/pkgs/overlays.nix b/pkgs/overlays.nix index e17883a..614e2e1 100644 --- a/pkgs/overlays.nix +++ b/pkgs/overlays.nix @@ -1,7 +1,5 @@ { inputs }: [ - inputs.catppuccin-toolbox.overlays.default - inputs.catppuccin-vsc.overlays.default inputs.nix-vscode-extensions.overlays.default ( final: prev: