fish: better environment variable config

.gitignore

@@ -13,7 +13,7 @@ qutebrowser/**
 !qutebrowser/.local/share/qutebrowser/greasemonkey/youtube-ad.js
 !qutebrowser/.local/share/qutebrowser/userscripts/readability
 
-fish/
+fish/**
 !fish/.config/fish/config.fish
 
 emacs/.emacs.d

fish/.config/fish/config.fish

@@ -15,16 +15,19 @@ set -x VISUAL nvim
 # set -x BROWSER=qutebrowser
 set -x PAGER less
 
-export _JAVA_AWT_WM_NONREPARENTING=1
-export GTK_CSD=0
-export LD_PRELOAD=/usr/lib/libgtk3-nocsd.so.0
-export XCURSOR_THEME=capitaine-cursors
-export GTK_THEME=materia-custom-accent:dark
+if test -n "$XDG_VTRN"; and test -z "$DISPLAY"
+    or command -qs systemctl;and systemctl -q is-enabled ly
+    export _JAVA_AWT_WM_NONREPARENTING=1
+    export GTK_CSD=0
+    export LD_PRELOAD=/usr/lib/libgtk3-nocsd.so.0
+    export XCURSOR_THEME=capitaine-cursors
+    export GTK_THEME=materia-custom-accent:dark
 
-# export XDG_CURRENT_DESKTOP=Unity
-export QT_SCALE_FACTOR=1
-export QPA_PLATFORM=wayland
-export QT_QPA_PLATFORM=wayland
+    # export XDG_CURRENT_DESKTOP=Unity
+    export QT_SCALE_FACTOR=1
+    export QPA_PLATFORM=wayland
+    export QT_QPA_PLATFORM=wayland
+end
 #}}}
 # Aliases{{{
 abbr rv sudo nvim
@@ -82,27 +85,10 @@ end
     function esway
         clear
         # export XDG_CURRENT_DESKTOP=Unity
-        export QT_SCALE_FACTOR=1
-        export QPA_PLATFORM=wayland
-        export QT_QPA_PLATFORM=wayland
         pgrep sway || exec sway
     end
-    function ei3
-        clear
-        exec startx /bin/i3
-    end
-    function ebsp
-        clear
-        exec startx /bin/bspwm
-    end
     if test "$XDG_VTNR" = 1 -a -z "$DISPLAY" #faster like this
         if command -v systemctl -a systemctl -q is-active graphical.target 
-            export _JAVA_AWT_WM_NONREPARENTING=1
-            export GTK_CSD=0
-            export LD_PRELOAD=/usr/lib/libgtk3-nocsd.so.0
-            export XCURSOR_THEME=capitaine-cursors
-            export GTK_THEME=materia-custom-accent:dark
-
             esway &> .swaylog
             # ei3 &> .i3log
             # ebsp &> .bsplog

scripts/.local/bin/forecast

@@ -36,7 +36,7 @@ format_weather(){
          WEATHER=""
          ;;
      "Rain"|"Drizzle")
-         WEATHER=""
+         WEATHER=""
          ;;
      "Mist")
          WEATHER=""

scripts/.local/bin/gui-cli

@@ -31,13 +31,9 @@ gui_off (){
     sudo systemctl enable  netctl-ifplugd@enp2s0
     sudo systemctl enable  netctl
 
+    sudo systemctl disable display-manager.service
 
-    systemctl -q is-active gdm && 
-        sudo systemctl disable gdm &
-    systemctl -q is-active gdm-plymouth && 
-        sudo systemctl disable gdm-plymouth &
-
-    sudo systemctl start getty@tty1
+    sudo systemctl enable ly
 
 }
 
@@ -45,6 +41,7 @@ gui_on (){
     # sudo chsh -s /usr/bin/fish $(whoami)
 
     rm -f ~/.config/mimeapps.list
+    yay -S --noconfirm --needed gnome-defaults-list
     cp /usr/share/applications/gnome-mimeapps.list ~/.config/mimeapps.list
 
     kvantummanager --set Materia
@@ -63,6 +60,8 @@ gui_on (){
     sudo systemctl disable  netctl
     sudo systemctl enable  NetworkManager
 
+    sudo systemctl disable display-manager.service
+
     sudo systemctl enable gdm-plymouth
 }