recent changes on megaloman

7 files changed, 76 insertions, 72 deletions

diff --git a/Xresources/.Xresources b/Xresources/.Xresources
index f902c53..458d602 100644
--- a/Xresources/.Xresources
+++ b/Xresources/.Xresources
@@ -1,5 +1,8 @@
-!adobe-*-*-r-*-*-24-*-*-*-*-*-*-*https://wiki.archlinux.org/index.php/x_resources
+!adobe-*-*-r-*-*-24-*-*-*-*-*-*-*
+!https://wiki.archlinux.org/index.php/x_resources
 !https://wiki.archlinux.org/index.php/Xterm
+!https://github.com/adobe-fonts/source-code-pro
+!fc-list | cut -f2 -d: | sort -u
 
 xterm*eightBitInput: false
 xterm*bellIsUrgent: true
@@ -8,12 +11,13 @@ xterm*visualBell: true
 !xterm*font: -misc-fixed-medium-r-semicondensed
 !
 
-XTerm*renderFont: true
+! tell xterm to use the faceName resource
+XTerm*renderFont: true   
 !XTerm*renderFont: false
 !XTerm*faceName: DejaVu Sans Mono
-XTerm*faceName: Source Code Variable
+!XTerm*faceName: Source Code Variable
 !XTerm*faceName: Source Code Pro
-!XTerm*faceName: Inconsolata
+XTerm*faceName: Hack
 XTerm*faceSize: 14
 
 !
@@ -32,7 +36,7 @@ xterm*termName: xterm-256color
 XTerm*locale: true
 XTerm*vt100.locale: true
 xterm*showMissingGlyphs: true
-xterm*letterSpace: -2
+!xterm*letterSpace: 10
 !from vim manual
 !*background:                       black
 !*foreground:                       white
@@ -67,6 +71,12 @@ Xft.hinting: 1
 Xft.antialias: 0
 Xft.rgba: rgb
 
+Xmessage*font:  -adobe-courier-*-r-*--0-250-*-*-p-*-*-*
+
+! ******************************************************
+! 	SOLARIZED THEME
+! ******************************************************
+!
 !! drop in Solarized colorscheme for Xresources/Xdefaults
 
 !!SOLARIZED HEX     16/8 TERMCOL  XTERM/HEX   L*A*B      RGB         HSB
@@ -145,4 +155,3 @@ Xft.rgba: rgb
 *color7:                S_base2
 *color15:               S_base3
 
-Xmessage*font:  -adobe-courier-*-r-*--0-250-*-*-p-*-*-*
diff --git a/bash/.bashrc b/bash/.bashrc
index f660181..8f522f3 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -114,10 +114,27 @@ fi
 
 # MIGUELS CUSTOM ######################################################
 
+export GIT_PS1_SHOWCOLORHINTS=true
+export GIT_PS1_SHOWDIRTYSTATE=true
+export GIT_PS1_SHOWSTASHSTATE=true
+export GIT_PS1_SHOWUPSTREAM="verbose,name"
+export GIT_PS1_SHOWDIRTYSTATE=true
+export GIT_PS1_SHOWUNTRACKEDFILES=true
+#export PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$'
+#export PS1=''
+#export PROMPT_COMMAND='__git_ps1 "(%s)"'
+export PROMPT_COMMAND='__git_ps1 "\[\e[1;34m\]\u@\h\[\e[00m\]:\w" " \$ "'
+#export PROMPT_COMMAND="git status -sb"
+#export PS1="\\w\$(__git_ps1 '(%s)') \$ "
+#http://northernmost.org/blog/flush-bash_history-after-each-command/
+# append to the history file, don't overwrite it
+#shopt -s histappend
+#export PROMPT_COMMAND='history -a' #&&history -n'
+
 # bash vi mode
 set -o vi 
 
-export EDITOR=vi
+export EDITOR=vi 
 
 # usenet seriously? 
 # export NNTPSERVER="nntp.aioe.org"
@@ -153,13 +170,12 @@ export MC_SKIN=$HOME/.mc/solarized.ini
 #PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
 #PS1="\[\033[1;30;44m\] \u@\h\[\033[0;34;43m\]█\[\033[1;30;43m\] \w\[\033[0;33;49m\]█\[\033[0m\] "
 
-#http://northernmost.org/blog/flush-bash_history-after-each-command/
-# append to the history file, don't overwrite it
-#shopt -s histappend
-export PROMPT_COMMAND='history -a' #&&history -n'
 #alias ghci='stack ghci 2>&1 | stack exec HsColour -- -tty'
 
 alias vi="nvim"
 alias vim="nvim"
 
-export PATH=$PATH:/home/miguel/.local/bin
+export PATH=/home/miguel/.local/bin:$PATH
+#alias feh="feh -."
+
+#export PATH="$HOME/.cabal/bin:$HOME/.ghcup/bin:$PATH"
diff --git a/bash/.profile b/bash/.profile
deleted file mode 100644
index c9db459..0000000
--- a/bash/.profile
+++ /dev/null
@@ -1,22 +0,0 @@
-# ~/.profile: executed by the command interpreter for login shells.
-# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
-# exists.
-# see /usr/share/doc/bash/examples/startup-files for examples.
-# the files are located in the bash-doc package.
-
-# the default umask is set in /etc/profile; for setting the umask
-# for ssh logins, install and configure the libpam-umask package.
-#umask 022
-
-# if running bash
-if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f "$HOME/.bashrc" ]; then
-	. "$HOME/.bashrc"
-    fi
-fi
-
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ] ; then
-    PATH="$HOME/bin:$PATH"
-fi
diff --git a/mailcap/.mailcap b/mailcap/.mailcap
index 05edb9e..e615265 100644
--- a/mailcap/.mailcap
+++ b/mailcap/.mailcap
@@ -1,5 +1,6 @@
 #text/html; w3m -I %{charset} -T text/html; copiousoutput;
 #text/html; surf file:/%s;
+text/html; firefox %s;copiousoutput 
 image/*; feh -; 
 text/plain; vim -R -; 
-text/html; firefox %s;copiousoutput 
+application/pdf; xpdf %s;
diff --git a/xmonad/xmobarrc b/xmonad/xmobarrc
index b1ef843..11b917b 100644
--- a/xmonad/xmobarrc
+++ b/xmonad/xmobarrc
@@ -1,8 +1,8 @@
 -- vim: set ft=haskell:
 Config { 
 
-      font            = "xft:Sans-10:bold"
-    , additionalFonts = ["xft:FontAwesome-11"]
+      font            = "xft:Hack-12:bold"
+    , additionalFonts = ["xft:Font Awesome 5 Free Solid-12"]
     , bgColor         = "#002b36" 
     , fgColor         = "#657b83"
     , position        = TopW L 95
@@ -41,5 +41,5 @@ Config {
 
     , sepChar   = "%"
     , alignSep  = "}{"
-    , template  = "%StdinReader%}{%mymails% <action=xterm -e sudo iftop><fn=1></fn> %eno1% </action><action=xterm -e htop><fn=1></fn> %multicpu% <fn=1></fn> %coretemp%°C</action> <action=nvidia-settings><fn=1></fn> %gputemp%</action> <fn=1></fn> %memory% (%swap%) <fn=1></fn> %disku% %date% <action=`pavucontrol`><fn=1></fn> </action><action=`systemctl suspend`><fn=1></fn></action>"
+    , template  = "%StdinReader%}{%mymails% <action=xterm -e sudo iftop><fn=1></fn> %eno1% </action><action=xterm -e htop><fn=1></fn> %multicpu% <fn=1></fn> %coretemp%°C</action> <action=nvidia-settings><fn=1></fn> %gputemp%</action> <fn=1></fn> %memory% (%swap%) <fn=1></fn> %disku% %date% <action=`pavucontrol`><fn=1></fn> </action><action=`systemctl suspend`><fn=1></fn></action>"
 }
diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index 1574c23..22e4e25 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -86,7 +86,7 @@ main = do
     ,focusedBorderColor      = "#eee8d5"
 --  ,focusFollowsMouse  = False
     ,modMask = mod4Mask
-    ,terminal = "xterm -e tmux"
+    ,terminal = "xterm" -- -e tmux"
 -- if you are using xmonad 0.9, you can avoid web flash videos getting cropped in fullscreen like so:
 --  ,manageHook = ( isFullscreen --> doFullFloat ) <+> manageDocks <+> manageHook defaultConfig,
 -- no longer needed in 0.10
@@ -99,10 +99,11 @@ main = do
             --        <+> manageSpawn <+> manageDocks <+> manageHook defaultConfig
 
     ,layoutHook = avoidStruts $ layout
-    ,startupHook = do spawnOnSingle "6" "mutt"
-                      spawnOnSingle "6" "mcabber"
-                      spawnOnSingle "6" "weechat"
---                    setWMName "LG3D"
+--    ,startupHook = do spawnOnSingle "6" "mutt"
+--                      spawnOnSingle "6" "mcabber"
+--                      spawnOnSingle "6" "weechat"
+--                      spawnOn "6" "liferea"
+--                      setWMName "LG3D"
     ,logHook = 
             takeTopFocus >>( dynamicLogWithPP $ xmobarPP
                         { 
@@ -122,14 +123,14 @@ main = do
 } `additionalKeys`
                 (
                  [ 
-                         ((mod4Mask,               xK_F1     ), spawn "xterm -e vim ~/.xmonad/xmonad.hs")
-                        ,((mod4Mask              , xK_b      ), sendMessage ToggleStruts)
-                        ,((mod4Mask,               xK_p     ), spawn "dmenu_run -nb '#073642' -nf '#fdf6e3' -sb '#268bd2' -sf '#073642'  -fn 'DejaVu Sans-10'")
-                        ,((mod4Mask,               xK_x     ), spawn "slock")
-                        ,((mod4Mask,               xK_m     ), spawn "xterm -e \"fetchmail&&sleep 2\"")
-                        ,((mod4Mask,               xK_c     ), spawn "xterm -e \"echo clipboard&&xclip -o -selection clipboard&&echo&&echo&&echo primary&&xclip -o -selection p&&echo&&echo&&echo [press enter]&&read\"")
-                        ,((mod4Mask,               xK_s     ), spawn "import /tmp/screen.png && feh -. /tmp/screen.png")
---                        ,((mod4Mask,               xK_l     ), sendMessage Expand)
+                         ((mod4Mask, xK_F1), spawn "xterm -e vim ~/.xmonad/xmonad.hs")
+                        ,((mod4Mask, xK_b ), sendMessage ToggleStruts)
+                        ,((mod4Mask, xK_p ), spawn "dmenu_run -nb '#073642' -nf '#fdf6e3' -sb '#268bd2' -sf '#073642'  -fn 'DejaVu Sans-10'")
+                        ,((mod4Mask, xK_x ), spawn "slock")
+                        ,((mod4Mask, xK_m ), spawn "xterm -e \"fetchmail&&sleep 2\"")
+--                      ,((mod4Mask, xK_c ), spawn "xterm -e \"echo clipboard&&xclip -o -selection clipboard&&echo&&echo&&echo primary&&xclip -o -selection p&&echo&&echo&&echo [press enter]&&read\"")
+--                      ,((mod4Mask, xK_s ), spawn "import /tmp/screen.png && feh -. /tmp/screen.png")
+--                      ,((mod4Mask,               xK_l     ), sendMessage Expand)
 
 --                      , ((mod4Mask,               xK_m     ), spawn "notify-send \"$( fetchmail )\"")
                         --,((mod4Mask .|. shiftMask, xK_x     ), spawn "ans=$(zenity  --list  --text 'wanna restart?' --radiolist  --column 'Pick' --column 'Opinion' TRUE '' FALSE 'sudo shutdown -r now' FALSE 'sudo shutdown -h now' ); $ans")
@@ -152,7 +153,7 @@ main = do
                  ++
                  [
                     ((m .|. mod4Mask, key), screenWorkspace sc >>= flip whenJust (windows . f)) -- Replace 'mod1Mask' with your mod key of choice.
-                    | (key, sc) <- zip [xK_q,xK_w, xK_e, xK_r] [2,3,0,1] -- change to match your screen order
+                    | (key, sc) <- zip [xK_q,xK_w, xK_e, xK_r] [2,1,0,3] -- change to match your screen order
                     , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]
                  ] 
                  ++
diff --git a/xsession/.xsession b/xsession/.xsession
index 83d0891..9ed6739 100644
--- a/xsession/.xsession
+++ b/xsession/.xsession
@@ -1,35 +1,34 @@
 # vim: set ft=sh:
 
-userresources=$HOME/.Xresources
+#### XRESOURCES #####
 
+userresources=$HOME/.Xresources
 if [ -f "$userresources" ]; then
     xrdb -load "$userresources"
 fi
 
+#### XRANDR #######
+
+# This section depends on modeset=1:
+# vi /etc/modprobe.d/nvidia-drm-nomodeset.conf
+# options nvidia-drm modeset=1
+# sudo update-initramfs -u
+# cat /sys/module/nvidia_drm/parameters/modeset
+
 xrandr --setprovideroutputsource modesetting NVIDIA-0
 xrandr --auto
 xrandr --output DP-5      --scale 2x2     --pos     0x0    # SHARP TV             (3840x2160)
-xrandr --output VGA-1-1   --scale 1.8x1.8 --pos     3840x0 # Samsung SyncMaster   (2304x1843)
-xrandr --output DP-2      --primary       --pos     6144x0 # ASUS 4K              (3840x2160)
-xrandr --output HDMI-0    --scale 1.7x1.7 --pos     9984x0 # LG                   (3264x2040)
-
-xsetroot -solid DarkSlateGray
-#xsetroot -solid NavyBlue
-trayer   --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 5 --transparent true --alpha 0 --tint 0x002b36 --height 30 --monitor 2 &
+xrandr --output HDMI-0    --scale 1.7x1.7 --pos     3840x0 # LG                   (3264x2040)
+xrandr --output DP-0      --primary       --pos     7680x0 # ASUS 4K              (3840x2160)
 
-stack exec xmonad
-
-## pulseaudio &
-
-#export PATH=/home/miguel/bin:$PATH
-
-#xmonad
-#/home/miguel/cabal_sandbox1/.cabal-sandbox/bin/cabal --sandbox-config-file=/home/miguel/cabal_sandbox1/cabal.sandbox.config exec -- xmonad
+##### WALLPAPER ######
 
+xsetroot -solid DarkSlateGray
 #feh --bg-tile temp/bigblue.jpg --no-fehbg
-
 #xsetroot -cursor_name top_left_arrow # does not work!?
 
-## final line: start xmonad 
-#CABAL_SANDBOX_CONFIG=/home/miguel/sbx/hask/xmonad/cabal.sandbox.config cabal exec xmonad
-#cd /home/miguel/git/xmonad-contrib/ && /home/miguel/opt/stack-1.7.1-linux-x86_64/stack exec -- xmonad
+#### TRAYER #######
+trayer   --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 5 --transparent true --alpha 0 --tint 0x002b36 --height 40 --monitor 2 &
+
+##### XMONAD #####
+xmonad