Merge branch 'master' of github.com:yulqen/arch-dotfiles

4 files changed, 79 insertions, 15 deletions

diff --git a/bashrc b/bashrc
index d0e0364..bba3c68 100644
--- a/bashrc
+++ b/bashrc
@@ -11,7 +11,7 @@ fi
 
 # export PS1='bash-\v-\u@\h \W\$ '
 # export PS1='\[\033[38;5;208m\]\u@\h:\w\$\[\033[0m\] '
-export PS1='\[\033[01;32m\]$\u@\h:\w\$\[\033[0m\] '
+export PS1='\[\033[01;32m\]\u@\h:\w\$\[\033[0m\] '
 
 # vi mode
 #set -o vi
@@ -29,7 +29,7 @@ export EDITOR=vim
 # export VISUAL="emacsclient -c -a emacs"         # $VISUAL opens in GUI mode
 
 # openai keys
-source $HOME/dotfiles/openai_key
+source $HOME/Documents/sync/openai_key
 
 # aliases
 alias pacget="pacman -Slq | fzf --multi --preview 'pacman -Si {1}' | xargs -ro sudo pacman -S"
@@ -87,10 +87,17 @@ source /usr/share/fzf/key-bindings.bash
 source /usr/share/fzf/completion.bash
 
 # gpg
-export=GPG_TTY="$(tty)"
-export=SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+export GPG_TTY="$(tty)"
 gpgconf --launch gpg-agent
 
+# ssh - from https://wiki.archlinux.org/title/SSH_keys#SSH_agents
+if ! pgrep -u "$USER" ssh-agent > /dev/null; then
+    ssh-agent -t 1h > "$XDG_RUNTIME_DIR/ssh-agent.env"
+fi
+if [[ ! -f "$SSH_AUTH_SOCK" ]]; then
+    source "$XDG_RUNTIME_DIR/ssh-agent.env" >/dev/null
+fi
+
 # bind '"\C-r": "\C-x1\e^\er"'
 # bind -x '"\C-x1": __fzf_history';
 
diff --git a/i3-config b/i3-config
index e6bb06e..30ed14b 100644
--- a/i3-config
+++ b/i3-config
@@ -118,7 +118,7 @@ bindsym $mod+Shift+g         gaps inner current minus 5
 bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
-bindsym $mod+d exec "dmenu_run -nf '#F8F8F2' -nb '#282A36' -sb '#6272A4' -sf '#F8F8F2' -fn 'Iosevka-10' -p 'dmenu%'"
+bindsym $mod+d exec "dmenu_run -nf '#F8F8F2' -nb '#282A36' -sb '#6272A4' -sf '#F8F8F2' -fn 'IosevkaNerdFont-Regular14' -p 'dmenu%'"
 
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
@@ -309,7 +309,7 @@ bar {
     tray_output primary
     status_command i3status
     position bottom
-    font pango:Iosevka Regular 11
+    font pango:Iosevka Nerd Font Regular 11
     mode dock
 
     colors {
diff --git a/i3status_config b/i3status_config
index 82bd2e7..598079c 100644
--- a/i3status_config
+++ b/i3status_config
@@ -12,27 +12,27 @@ general {
 }
 
 # order += "ipv6"
-# order += "wireless _first_"
+order += "wireless _first_"
 order += "ethernet _first_"
-# order += "battery all"
+order += "battery all"
 # order += "disk /"
 # order += "load"
 order += "memory"
 order += "tztime local"
 
-# wireless _first_ {
-#         format_up = "W: (%quality at %essid) %ip"
-#         format_down = "W: down"
-# }
+wireless _first_ {
+        format_up = "W: (%quality at %essid) %ip"
+        format_down = "W: down"
+}
 
 ethernet _first_ {
         format_up = "E: %ip (%speed)"
         format_down = "E: down"
 }
 
-# battery all {
-#         format = "%status %percentage %remaining"
-# }
+battery all {
+        format = "%status %percentage %remaining"
+}
 
 # disk "/" {
 #         format = "%avail"
diff --git a/xinitrc_artix b/xinitrc_artix
new file mode 100644
index 0000000..89639c8
--- /dev/null
+++ b/xinitrc_artix
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+
+
+
+
+
+
+
+    xrdb -merge $sysresources
+
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+
+
+
+
+
+
+
+    xrdb -merge "$userresources"
+
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# start some nice programs
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+ for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+  [ -x "$f" ] && . "$f"
+ done
+ unset f
+fi
+
+#twm &
+#xclock -geometry 50x50-1+1 &
+#xterm -geometry 80x50+494+51 &
+#xterm -geometry 80x20+494-0 &
+#exec xterm -geometry 80x66+0+0 -name login
+syncthing &
+exec i3