Merge branch 'master' of dragon.orbekk.com:/storage/projects/dotfiles

4 files changed, 83 insertions, 6 deletions

diff --git a/desktop/.Xresources b/desktop/.Xresources
index a6724e6..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
@@ -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 5be3ed4..7294a42 100644
--- a/emacs/.doom.d/config.el
+++ b/emacs/.doom.d/config.el
@@ -50,12 +50,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..f35e8b9
--- /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
+
+*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
+*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
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 9e227da..e50124b 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,3 +1,9 @@
+if [[ ${TERM} = "dumb" ]]; then
+  # 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.
@@ -36,7 +42,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