From 8695012020d00baaccc5648963b2f74825a44db0 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Tue, 21 Dec 2021 15:49:04 -0500 Subject: Skip zsh setup with TRAMP --- zsh/.zshrc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/zsh/.zshrc b/zsh/.zshrc index 9e227da..c0d0f7c 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,3 +1,8 @@ +if [[ ${TERM} = "dumb" ]]; then + echo "No zsh setup" + exit 0 +fi + # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. # Initialization code that may require console input (password prompts, [y/n] # confirmations, etc.) must go above this block; everything else may go below. @@ -36,7 +41,8 @@ setopt interactivecomments alias ls="ls --color" alias e="emacsclient -n" -(( $+commands[exa] )) && alias ls="exa" +# Never got used to this. +# (( $+commands[exa] )) && alias ls="exa" if (( $+commands[fzf] )); then if (( $+commands[fzf-share] )); then -- cgit v1.2.3 From 26ba1d0da74edfdd5ef352eb592e970b33c090d4 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Tue, 21 Dec 2021 15:55:03 -0500 Subject: Fix tramp --- zsh/.zshrc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zsh/.zshrc b/zsh/.zshrc index c0d0f7c..e50124b 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,8 +1,9 @@ if [[ ${TERM} = "dumb" ]]; then - echo "No zsh setup" - exit 0 + # This fixes TRAMP. + echo "Skip zsh setup" + unsetopt zle + return 0 fi - # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. # Initialization code that may require console input (password prompts, [y/n] # confirmations, etc.) must go above this block; everything else may go below. -- cgit v1.2.3 From afbfbc65759a847eea7629d59745f7ebe3025722 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Tue, 21 Dec 2021 16:49:47 -0500 Subject: Add solarized theme --- desktop/.Xresources | 4 +-- emacs/.doom.d/config.el | 4 +-- etc/Xresources-solarized-light | 70 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 etc/Xresources-solarized-light diff --git a/desktop/.Xresources b/desktop/.Xresources index a6724e6..31abf28 100644 --- a/desktop/.Xresources +++ b/desktop/.Xresources @@ -33,8 +33,8 @@ URxvt.iso14755_52: false URxvt.url-launcher: /usr/bin/xdg-open URxvt.matcher.button: 1 -urxvt*foreground: white -urxvt*background: black +*foreground: white +*background: black *color0: #2E3436 *color1: #a40000 diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el index 1b1ac9c..086404a 100644 --- a/emacs/.doom.d/config.el +++ b/emacs/.doom.d/config.el @@ -49,12 +49,12 @@ (system-specific-config "orbekk" - (setq doom-theme 'doom-acario-light)) + (setq doom-theme 'doom-solarized-light)) (system-specific-config "^zot\." (setq kj/font-size 20) - (setq doom-theme 'doom-acario-light)) + (setq doom-theme 'doom-one-light)) (setq doom-font (font-spec :family "iosevka" :size kj/font-size)) (setq doom-variable-pitch-font (font-spec :family "Noto Serif" :size kj/font-size)) diff --git a/etc/Xresources-solarized-light b/etc/Xresources-solarized-light new file mode 100644 index 0000000..1afd733 --- /dev/null +++ b/etc/Xresources-solarized-light @@ -0,0 +1,70 @@ +! Solarized color scheme for the X Window System +! +! http://ethanschoonover.com/solarized + + +! Common + +#define S_yellow #b58900 +#define S_orange #cb4b16 +#define S_red #dc322f +#define S_magenta #d33682 +#define S_violet #6c71c4 +#define S_blue #268bd2 +#define S_cyan #2aa198 +#define S_green #859900 + + +! Dark + +! #define S_base03 #002b36 +! #define S_base02 #073642 +! #define S_base01 #586e75 +! #define S_base00 #657b83 +! #define S_base0 #839496 +! #define S_base1 #93a1a1 +! #define S_base2 #eee8d5 +! #define S_base3 #fdf6e3 + + +! Light + +#define S_base03 #fdf6e3 +#define S_base02 #eee8d5 +#define S_base01 #93a1a1 +#define S_base00 #839496 +#define S_base0 #657b83 +#define S_base1 #586e75 +#define S_base2 #073642 +#define S_base3 #002b36 + + +! To only apply colors to your terminal, for example, prefix +! the color assignment statement with its name. Example: +! +! URxvt*background: S_base03 + +urxvt*background: S_base03 +urxvt*foreground: S_base0 +urxvt*fading: 40 +urxvt*fadeColor: S_base03 +urxvt*cursorColor: S_base1 +urxvt*pointerColorBackground: S_base01 +urxvt*pointerColorForeground: S_base1 + +*color0: S_base02 +*color1: S_red +*color2: S_green +*color3: S_yellow +*color4: S_blue +*color5: S_magenta +*color6: S_cyan +*color7: S_base2 +*color9: S_orange +*color8: S_base03 +*color10: S_base01 +*color11: S_base00 +*color12: S_base0 +*color13: S_violet +*color14: S_base1 +*color15: S_base3 -- cgit v1.2.3 From 8655138fd717d175fbc80fc15a4a7ec5c9be8baa Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Tue, 21 Dec 2021 17:13:44 -0500 Subject: Update --- desktop/.Xresources | 2 +- etc/Xresources-solarized-light | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/desktop/.Xresources b/desktop/.Xresources index 31abf28..5d5ce3a 100644 --- a/desktop/.Xresources +++ b/desktop/.Xresources @@ -2,7 +2,7 @@ !urxvt*font: xft:dejavu sans mono:pixelsize=22:antialias=true:hinting=true !urxvt*font: xft:DejaVu Sans Mono:pixelsize=20:antialias=true:hinting=true ! urxvt*font: xft:fira code:pixelsize=22:antialias=true:hinting=true -urxvt*font: xft:iosevka term:size=14,xft:dejavu sans mono:size=14 +urxvt*font: xft:iosevka term:size=15,xft:dejavu sans mono:size=14 !urxvt*letterSpace: -5 !urxvt*font: xft:fira code:pixelsize=22:antialias=true !urxvt*font: xft:inconsolata:size=18:antialias=true diff --git a/etc/Xresources-solarized-light b/etc/Xresources-solarized-light index 1afd733..f35e8b9 100644 --- a/etc/Xresources-solarized-light +++ b/etc/Xresources-solarized-light @@ -44,13 +44,13 @@ ! ! URxvt*background: S_base03 -urxvt*background: S_base03 -urxvt*foreground: S_base0 -urxvt*fading: 40 -urxvt*fadeColor: S_base03 -urxvt*cursorColor: S_base1 -urxvt*pointerColorBackground: S_base01 -urxvt*pointerColorForeground: S_base1 +*background: S_base03 +*foreground: S_base0 +*fading: 15 +*fadeColor: S_base03 +*cursorColor: S_base1 +*pointerColorBackground: S_base01 +*pointerColorForeground: S_base1 *color0: S_base02 *color1: S_red -- cgit v1.2.3