diff options
| -rw-r--r-- | config/xorg/Xmodmap | 2 | ||||
| -rwxr-xr-x | config/xorg/init.sh (renamed from external/xconfig/init.sh) | 12 | ||||
| -rw-r--r-- | external/xconfig/Xmodmap | 8 | ||||
| -rw-r--r-- | external/xconfig/Xresources | 57 | ||||
| -rw-r--r-- | home.nix | 54 | ||||
| -rw-r--r-- | login.nix | 2 |
6 files changed, 62 insertions, 73 deletions
diff --git a/config/xorg/Xmodmap b/config/xorg/Xmodmap new file mode 100644 index 0000000..5f02818 --- /dev/null +++ b/config/xorg/Xmodmap @@ -0,0 +1,2 @@ +clear Lock +keycode 66 = Escape NoSymbol Escape diff --git a/external/xconfig/init.sh b/config/xorg/init.sh index d51f6df..b1f6cb7 100755 --- a/external/xconfig/init.sh +++ b/config/xorg/init.sh @@ -1,12 +1,10 @@ #!/usr/bin/env sh -NIX_X="$HOME/nixos/external/xconfig"; - # Xresources (theme) -xrdb -merge $NIX_X/Xresources; +xrdb -merge ~/.Xresources; # Xmodmap (keymapping) -xmodmap $NIX_X/Xmodmap; +xmodmap ~/.config/xorg/Xmodmap; # No screen saver xset s off; @@ -17,10 +15,10 @@ xset s noblank; xset r rate 350 30; # Display settings -# ~/scripts/commands/:day +~/scripts/commands/:day # Sound #~/scripts/sound.sh mic-vol full; -#~/scripts/sound.sh mute-mic; -#~/scripts/sound.sh mute; +~/scripts/sound.sh mute-mic; +~/scripts/sound.sh mute; diff --git a/external/xconfig/Xmodmap b/external/xconfig/Xmodmap deleted file mode 100644 index 8516782..0000000 --- a/external/xconfig/Xmodmap +++ /dev/null @@ -1,8 +0,0 @@ -clear Lock - -keycode 66 = Escape NoSymbol Escape -! keycode 66 = Hyper_L - -remove mod4 = Hyper_L -add mod3 = Hyper_L - diff --git a/external/xconfig/Xresources b/external/xconfig/Xresources deleted file mode 100644 index ab3701b..0000000 --- a/external/xconfig/Xresources +++ /dev/null @@ -1,57 +0,0 @@ - - -#define bg #0f0c19 -#define fg #d8dee9 -#define acc #4e3aA3 -! #383F6B -! #5587BA - -! Special -*.foreground: fg -*.background: bg -*.cursorColor: fg -*.accent: acc - -! Colors -*.color0: #15121f -*.color8: #555555 - -*.color1: #e06c75 -*.color9: #bf616a - -*.color2: #98C379 -*.color10: #a3be8c - -*.color3: #E5C07B -*.color11: #f7b731 - -*.color4: #60a3bc -*.color12: #5e81ac - -*.color5: #4e3aA3 -*.color13: #4e3aA3 - -*.color6: #56B6C2 -*.color14: #0fb9b1 - -*.color7: #ABB2BF -*.color15: #ebdbb2 - -dmenu.background: bg -dmenu.foreground: fg -dmenu.selbackground: acc -dmenu.selforeground: fg - -dmenu.highlightbg: bg -dmenu.highlightfg: acc -dmenu.highlightselbg: acc -dmenu.highlightselfg: bg - -dwm.normbordercolor: bg -dwm.normbgcolor: bg -dwm.normfgcolor: fg - -dwm.selbordercolor: acc -dwm.selbgcolor: acc -dwm.selfgcolor: fg - @@ -96,7 +96,61 @@ in { #''; }; + xresources.properties = let + bg = "#0f0c19"; + fg = "#d8dee9"; + accent = "#4e3aA3"; + in { + "*.foreground" = fg; + "*.background" = bg; + "*.cursorColor" = fg; + "*.accent" = accent; + + "*.color0" = "#15121f"; + "*.color8" = "#555555"; + + "*.color1" = "#e06c75"; + "*.color9" = "#bf616a"; + + "*.color2" = "#98C379"; + "*.color10" = "#a3be8c"; + + "*.color3" = "#E5C07B"; + "*.color11" = "#f7b731"; + + "*.color4" = "#60a3bc"; + "*.color12" = "#5e81ac"; + + "*.color5" = "#4e3aA3"; + "*.color13" = "#4e3aA3"; + + "*.color6" = "#56B6C2"; + "*.color14" = "#0fb9b1"; + + "*.color7" = "#ABB2BF"; + "*.color15" = "#ebdbb2"; + + "dmenu.background" = bg; + "dmenu.foreground" = fg; + "dmenu.selbackground" = accent; + "dmenu.selforeground" = fg; + + "dmenu.highlightbg" = bg; + "dmenu.highlightfg" = accent; + "dmenu.highlightselbg" = accent; + "dmenu.highlightselfg" = bg; + + "dwm.normbordercolor" = bg; + "dwm.normbgcolor" = bg; + "dwm.normfgcolor" = fg; + + "dwm.selbordercolor" = accent; + "dwm.selbgcolor" = accent; + "dwm.selfgcolor" = fg; + }; + home.file = { + ".config/xorg".source = ./config/xorg; ".config/zsh".source = ./config/zsh; ".config/nvim".source = ./config/nvim; ".config/qutebrowser".source = ./config/qutebrowser; @@ -59,7 +59,7 @@ in { loginShellInit = with builtins; let cases = map (s: '' /dev/${elemAt s 0}) - echo "~/nixos/external/xconfig/init.sh; ${elemAt s 1}" > ~/.xinitrc; + echo "~/.config/xorg/init.sh; ${elemAt s 1}" > ~/.xinitrc; sleep 0.2; startx; ;; |