From a9abbb678682534cda5b9cfbf92083208f983468 Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Thu, 9 Jan 2025 12:01:35 -0500 Subject: [PATCH] add ghostty and remove kitty --- ghostty/config/ghostty.conf | 26 +++++++ ghostty/default.nix | 8 +++ home.nix | 57 ++++++++-------- kitty/config/kitty.conf | 132 ------------------------------------ kitty/default.nix | 12 ---- neofetch/config/config.conf | 1 + 6 files changed, 64 insertions(+), 172 deletions(-) create mode 100644 ghostty/config/ghostty.conf create mode 100644 ghostty/default.nix delete mode 100644 kitty/config/kitty.conf delete mode 100644 kitty/default.nix diff --git a/ghostty/config/ghostty.conf b/ghostty/config/ghostty.conf new file mode 100644 index 0000000..abdcc63 --- /dev/null +++ b/ghostty/config/ghostty.conf @@ -0,0 +1,26 @@ +command = /Users/evanreichard/.nix-profile/bin/bash --login +macos-titlebar-style = tabs +auto-update = off +font-family = "MesloLGM Nerd Font Mono" + +# Melange Dark - Adapted From: https://github.com/savq/melange-nvim/blob/master/term/kitty/melange_dark.conf +palette = 0=#34302C +palette = 1=#BD8183 +palette = 2=#78997A +palette = 3=#E49B5D +palette = 4=#7F91B2 +palette = 5=#B380B0 +palette = 6=#7B9695 +palette = 7=#C1A78E +palette = 8=#867462 +palette = 9=#D47766 +palette = 10=#85B695 +palette = 11=#EBC06D +palette = 12=#A3A9CE +palette = 13=#CF9BC2 +palette = 14=#89B3B6 +palette = 15=#ECE1D7 +background = 292522 +foreground = ECE1D7 +selection-background = 403A36 +selection-foreground = ECE1D7 diff --git a/ghostty/default.nix b/ghostty/default.nix new file mode 100644 index 0000000..dbee0e2 --- /dev/null +++ b/ghostty/default.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: +{ + xdg.configFile = { + "ghostty/config" = { + source = ./config/ghostty.conf; + }; + }; +} diff --git a/home.nix b/home.nix index ca7b04a..87ad7a0 100644 --- a/home.nix +++ b/home.nix @@ -8,9 +8,9 @@ in imports = [ ./bash ./direnv + ./ghostty ./git ./htop - ./kitty ./neofetch ./nvim ./powerline @@ -20,7 +20,7 @@ in # Home Manager Config home.username = "evanreichard"; home.homeDirectory = "/Users/evanreichard"; - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; programs.home-manager.enable = true; # Global Packages @@ -30,6 +30,7 @@ in awscli2 bashInteractive cw + # ghostty - Pending Darwin @ https://github.com/NixOS/nixpkgs/pull/369788 gitAndTools.gh google-cloud-sdk imagemagick @@ -40,12 +41,12 @@ in pre-commit python311 ssm-session-manager-plugin + texliveSmall # Pandoc PDF Dep thefuck tldr - texliveSmall # Pandoc PDF Dep - ] ++ optionals isDarwin [ - kitty - ] ++ optionals isLinux [ ]; + ] + ++ optionals isDarwin [ ] + ++ optionals isLinux [ ]; # GitHub CLI programs.gh = { @@ -74,28 +75,28 @@ in ''; # Darwin Spotlight Indexing Hack - home.activation = mkIf isDarwin { - copyApplications = - let - apps = pkgs.buildEnv { - name = "home-manager-applications"; - paths = config.home.packages; - pathsToLink = "/Applications"; - }; - in - lib.hm.dag.entryAfter [ "writeBoundary" ] '' - baseDir="$HOME/Applications/Home Manager Apps" - if [ -d "$baseDir" ]; then - rm -rf "$baseDir" - fi - mkdir -p "$baseDir" - for appFile in ${apps}/Applications/*; do - target="$baseDir/$(basename "$appFile")" - $DRY_RUN_CMD cp ''${VERBOSE_ARG:+-v} -fHRL "$appFile" "$baseDir" - $DRY_RUN_CMD chmod ''${VERBOSE_ARG:+-v} -R +w "$target" - done - ''; - }; + # home.activation = mkIf isDarwin { + # copyApplications = + # let + # apps = pkgs.buildEnv { + # name = "home-manager-applications"; + # paths = config.home.packages; + # pathsToLink = "/Applications"; + # }; + # in + # lib.hm.dag.entryAfter [ "writeBoundary" ] '' + # baseDir="$HOME/Applications/Home Manager Apps" + # if [ -d "$baseDir" ]; then + # rm -rf "$baseDir" + # fi + # mkdir -p "$baseDir" + # for appFile in ${apps}/Applications/*; do + # target="$baseDir/$(basename "$appFile")" + # $DRY_RUN_CMD cp ''${VERBOSE_ARG:+-v} -fHRL "$appFile" "$baseDir" + # $DRY_RUN_CMD chmod ''${VERBOSE_ARG:+-v} -R +w "$target" + # done + # ''; + # }; # Darwin Spotlight Indexing Hack disabledModules = [ "targets/darwin/linkapps.nix" ]; diff --git a/kitty/config/kitty.conf b/kitty/config/kitty.conf deleted file mode 100644 index 7f59f2d..0000000 --- a/kitty/config/kitty.conf +++ /dev/null @@ -1,132 +0,0 @@ -# ------------------------------------------------------- -# ------------------ Generic Settings ------------------- -# ------------------------------------------------------- - -font_family MesloLGM Nerd Font Mono -font_size 18.0 -hide_window_decorations titlebar-only -shell /Users/evanreichard/.nix-profile/bin/bash --login -tab_bar_style powerline - -# ------------------------------------------------------- -# ----------------------- Hotkeys ----------------------- -# ------------------------------------------------------- - -# Tab Switching -map cmd+, set_tab_title -map cmd+0 goto_tab 10 -map cmd+1 goto_tab 1 -map cmd+2 goto_tab 2 -map cmd+3 goto_tab 3 -map cmd+4 goto_tab 4 -map cmd+5 goto_tab 5 -map cmd+6 goto_tab 6 -map cmd+7 goto_tab 7 -map cmd+8 goto_tab 8 -map cmd+9 goto_tab 9 - -# Window Switching -map alt+0 tenth_window -map alt+1 first_window -map alt+2 second_window -map alt+3 third_window -map alt+4 fourth_window -map alt+5 fifth_window -map alt+6 sixth_window -map alt+7 seventh_window -map alt+8 eighth_window -map alt+9 ninth_window -map shift+enter new_window_with_cwd - -# Layout Specific Shortcuts -map alt+f toggle_layout stack -map alt+s toggle_layout horizontal -map alt+v toggle_layout vertical - -# Active Window Relative Movement -map shift+down move_window down -map shift+left move_window left -map shift+right move_window right -map shift+up move_window up - -# Focus Window Relative -map alt+down neighboring_window down -map alt+left neighboring_window left -map alt+right neighboring_window right -map alt+up neighboring_window up - -# ------------------------------------------------------- -# ----------------- 1984 Orwellian Theme ---------------- -# ------------------------------------------------------- - -foreground #f1f1f1 -background #2e2923 -selection_foreground #000000 -selection_background #3fc4ce -color0 #000000 -color1 #e74946 -color2 #4cb605 -color3 #fcd395 -color4 #356fe4 -color5 #fcbe95 -color6 #3fc4ce -color7 #f1f1f1 -color8 #000000 -color9 #e74946 -color10 #4cb605 -color11 #fcd395 -color12 #356fe4 -color13 #fcbe95 -color14 #3fc4ce -color15 #f1f1f1 - -# URL styles -url_color #e74946 -url_style single - -# Cursor styles -cursor #3fc4ce - - -# ------------------------------------------------------- -# ------------------ Nord Color Scheme ------------------ -# ------------------------------------------------------- -# -# foreground #D8DEE9 -# background #2E3440 -# selection_foreground #000000 -# selection_background #FFFACD -# url_color #0087BD -# cursor #81A1C1 -# -# # Black -# color0 #3B4252 -# color8 #4C566A -# -# # Red -# color1 #BF616A -# color9 #BF616A -# -# # Green -# color2 #A3BE8C -# color10 #A3BE8C -# -# # Yellow -# color3 #EBCB8B -# color11 #EBCB8B -# -# # Blue -# color4 #81A1C1 -# color12 #81A1C1 -# -# # Magenta -# color5 #B48EAD -# color13 #B48EAD -# -# # Cyan -# color6 #88C0D0 -# color14 #8FBCBB -# -# # White -# color7 #E5E9F0 -# color15 #ECEFF4 diff --git a/kitty/default.nix b/kitty/default.nix deleted file mode 100644 index c9553f4..0000000 --- a/kitty/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, pkgs, ... }: -let - inherit (pkgs.lib) mkIf; - inherit (pkgs.stdenv) isDarwin; -in -{ - xdg.configFile = mkIf isDarwin { - "kitty/kitty.conf" = { - source = ./config/kitty.conf; - }; - }; -} diff --git a/neofetch/config/config.conf b/neofetch/config/config.conf index 5123bf0..9733b1e 100644 --- a/neofetch/config/config.conf +++ b/neofetch/config/config.conf @@ -11,6 +11,7 @@ print_info() { info " " kernel info " " term info "󰏖 " packages + info " " term_font prin "" prin "Network Information" info " " public_ip