1
0
Fork 0
mirror of https://gitlab.com/dwt1/dotfiles.git synced 2023-02-13 20:55:19 -05:00

Minor edits.

This commit is contained in:
Derek Taylor 2019-03-09 17:52:05 -06:00
parent c089a7e924
commit 07a8e21aa7
12 changed files with 62 additions and 55 deletions

View file

@ -83,7 +83,7 @@ XTerm*background: #292d3e
XTerm*cursorColor: #bbc5ff XTerm*cursorColor: #bbc5ff
! black ! black
*.color0: #292d3e *.color0: #101010 !! originally #292d3e
*.color8: #434758 *.color8: #434758
! red ! red

View file

@ -100,7 +100,6 @@ alias df='df -h' # human-readable sizes
alias free='free -m' # show sizes in MB alias free='free -m' # show sizes in MB
alias np='nano -w PKGBUILD' alias np='nano -w PKGBUILD'
alias more=less alias more=less
alias ub='$HOME/scripts/ub.sh'
# terminal rickroll! # terminal rickroll!
alias rr='curl -s -L https://raw.githubusercontent.com/keroserene/rickrollrc/master/roll.sh | bash' alias rr='curl -s -L https://raw.githubusercontent.com/keroserene/rickrollrc/master/roll.sh | bash'
@ -155,3 +154,5 @@ export YAOURT_COLORS="nb=1:pkg=1:ver=1;32:lver=1;45:installed=1;42:grp=1;34:od=1
neofetch neofetch
alias config='/usr/bin/git --git-dir=/home/dt/dotfiles --work-tree=/home/dt' alias config='/usr/bin/git --git-dir=/home/dt/dotfiles --work-tree=/home/dt'
alias tb="nc termbin.com 9999"
alias tb="nc termbin.com 9999"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

View file

@ -218,7 +218,7 @@ def init_keys():
# Apps Launched with <SUPER> + <SHIFT> + <KEYPAD 0-9> # Apps Launched with <SUPER> + <SHIFT> + <KEYPAD 0-9>
Key( Key(
[mod, "shift"], "KP_End", # Keypad 1 [mod, "shift"], "KP_End", # Keypad 1
lazy.spawn(myTerm+" -e vifm") lazy.spawn(myTerm+" -e sh ./.config/vifm/scripts/vifmrun")
), ),
Key( Key(
[mod, "shift"], "KP_Down", # Keypad 2 [mod, "shift"], "KP_Down", # Keypad 2
@ -295,17 +295,17 @@ def init_keys():
##### BAR COLORS ##### ##### BAR COLORS #####
def init_colors(): def init_colors():
return [["#1D2330", "#1D2330"], # panel background return [["#292D3E", "#292D3E"], # panel background
["#84598D", "#84598D"], # background for current screen tab ["#434758", "#434758"], # background for current screen tab
["#B1B5C8", "#B1B5C8"], # font color for group names ["#D0D0D0", "#D0D0D0"], # font color for group names
["#645377", "#645377"], # background color for layout widget ["#F07178", "#F07178"], # background color for layout widget
["#000000", "#000000"], # background for other screen tabs ["#000000", "#000000"], # background for other screen tabs
["#AD69AF", "#AD69AF"], # dark green gradiant for other screen tabs ["#AD69AF", "#AD69AF"], # dark green gradiant for other screen tabs
["#7B8290", "#7B8290"], # background color for network widget ["#C3E88D", "#C3E88D"], # background color for network widget
["#AD69AF", "#AD69AF"], # background color for pacman widget ["#C792EA", "#C792EA"], # background color for pacman widget
["#357FC5", "#357FC5"], # background color for cmus widget ["#9CC4FF", "#9CC4FF"], # background color for cmus widget
["#000000", "#000000"], # background color for clock widget ["#000000", "#000000"], # background color for clock widget
["#84598d", "#84598d"]] # background color for systray widget ["#434758", "#434758"]] # background color for systray widget
##### GROUPS ##### ##### GROUPS #####
@ -460,12 +460,12 @@ def init_widgets_list():
font="Ubuntu Bold", font="Ubuntu Bold",
text="", text="",
padding = 6, padding = 6,
foreground=colors[2], foreground=colors[0],
background=colors[3], background=colors[3],
fontsize=14 fontsize=14
), ),
widget.CurrentLayout( widget.CurrentLayout(
foreground = colors[2], foreground = colors[0],
background = colors[3], background = colors[3],
padding = 6 padding = 6
), ),
@ -503,14 +503,14 @@ def init_widgets_list():
font="Ubuntu Bold", font="Ubuntu Bold",
text="", text="",
padding = 6, padding = 6,
foreground = "d7d7d7", foreground=colors[0],
background=colors[8], background=colors[8],
fontsize=14 fontsize=14
), ),
widget.Cmus( widget.Cmus(
max_chars = 40, max_chars = 40,
update_interval = 0.5, update_interval = 0.5,
foreground = "d7d7d7", foreground=colors[0],
background = colors[8] background = colors[8]
), ),
widget.Image( widget.Image(

View file

@ -1,10 +1,6 @@
-- ____ _____ -- The xmonad configuration of Derek Taylor (DistroTube)
-- | _ \_ _| Derek Taylor (DistroTube) -- http://www.youtube.com/c/DistroTube
-- | | | || | http://www.youtube.com/c/DistroTube -- http://www.gitlab.com/dwt1/
-- | |_| || | http://www.gitlab.com/dwt1/
-- |____/ |_|
--
-- My configuration for the xmonad window manager (http://www.xmonad.org)
------------------------------------------------------------------------ ------------------------------------------------------------------------
---IMPORTS ---IMPORTS
@ -12,6 +8,7 @@
-- Base -- Base
import XMonad import XMonad
import XMonad.Config.Desktop import XMonad.Config.Desktop
import Data.Monoid
import Data.Maybe (isJust) import Data.Maybe (isJust)
import System.IO (hPutStrLn) import System.IO (hPutStrLn)
import System.Exit (exitSuccess) import System.Exit (exitSuccess)
@ -29,8 +26,6 @@ import XMonad.Hooks.DynamicLog (dynamicLogWithPP, defaultPP, wrap, pad, xmobarPP
import XMonad.Hooks.ManageDocks (avoidStruts, docksStartupHook, manageDocks, ToggleStruts(..)) import XMonad.Hooks.ManageDocks (avoidStruts, docksStartupHook, manageDocks, ToggleStruts(..))
import XMonad.Hooks.ManageHelpers (isFullscreen, isDialog, doFullFloat, doCenterFloat) import XMonad.Hooks.ManageHelpers (isFullscreen, isDialog, doFullFloat, doCenterFloat)
import XMonad.Hooks.Place (placeHook, withGaps, smart) import XMonad.Hooks.Place (placeHook, withGaps, smart)
import XMonad.Hooks.InsertPosition
import XMonad.Hooks.FloatNext (floatNextHook, toggleFloatNext, toggleFloatAllNew)
import XMonad.Hooks.SetWMName import XMonad.Hooks.SetWMName
import XMonad.Hooks.EwmhDesktops -- required for xcomposite in obs to work import XMonad.Hooks.EwmhDesktops -- required for xcomposite in obs to work
@ -44,7 +39,6 @@ import XMonad.Actions.WithAll (sinkAll, killAll)
import XMonad.Actions.CycleWS (moveTo, shiftTo, WSType(..), shiftNextScreen, shiftPrevScreen) import XMonad.Actions.CycleWS (moveTo, shiftTo, WSType(..), shiftNextScreen, shiftPrevScreen)
import XMonad.Actions.GridSelect (GSConfig(..), goToSelected, bringSelected, colorRangeFromClassName, buildDefaultGSConfig) import XMonad.Actions.GridSelect (GSConfig(..), goToSelected, bringSelected, colorRangeFromClassName, buildDefaultGSConfig)
import XMonad.Actions.DynamicWorkspaces (addWorkspacePrompt, removeEmptyWorkspace) import XMonad.Actions.DynamicWorkspaces (addWorkspacePrompt, removeEmptyWorkspace)
import XMonad.Actions.Warp (warpToWindow, banishScreen, Corner(LowerRight))
import XMonad.Actions.MouseResize import XMonad.Actions.MouseResize
import qualified XMonad.Actions.ConstrainedResize as Sqr import qualified XMonad.Actions.ConstrainedResize as Sqr
@ -86,8 +80,8 @@ main = do
xmproc0 <- spawnPipe "xmobar -x 0 /home/dt/.config/xmobar/xmobarrc2" -- xmobar mon 2 xmproc0 <- spawnPipe "xmobar -x 0 /home/dt/.config/xmobar/xmobarrc2" -- xmobar mon 2
xmproc1 <- spawnPipe "xmobar -x 1 /home/dt/.config/xmobar/xmobarrc1" -- xmobar mon 1 xmproc1 <- spawnPipe "xmobar -x 1 /home/dt/.config/xmobar/xmobarrc1" -- xmobar mon 1
xmproc2 <- spawnPipe "xmobar -x 2 /home/dt/.config/xmobar/xmobarrc0" -- xmobar mon 0 xmproc2 <- spawnPipe "xmobar -x 2 /home/dt/.config/xmobar/xmobarrc0" -- xmobar mon 0
xmonad $ ewmh $ desktopConfig xmonad $ ewmh desktopConfig
{ manageHook = ( isFullscreen --> doFullFloat ) <+> manageDocks <+> myManageHook <+> manageHook desktopConfig { manageHook = ( isFullscreen --> doFullFloat ) <+> myManageHook <+> manageHook desktopConfig <+> manageDocks
, logHook = dynamicLogWithPP xmobarPP , logHook = dynamicLogWithPP xmobarPP
{ ppOutput = \x -> hPutStrLn xmproc0 x >> hPutStrLn xmproc1 x >> hPutStrLn xmproc2 x { ppOutput = \x -> hPutStrLn xmproc0 x >> hPutStrLn xmproc1 x >> hPutStrLn xmproc2 x
, ppCurrent = xmobarColor "#c3e88d" "" . wrap "[" "]" -- Current workspace in xmobar , ppCurrent = xmobarColor "#c3e88d" "" . wrap "[" "]" -- Current workspace in xmobar
@ -130,12 +124,15 @@ myKeys =
, ("M-S-q", io exitSuccess) -- Quits xmonad , ("M-S-q", io exitSuccess) -- Quits xmonad
-- Windows -- Windows
, ("M-r", refresh) -- Refresh -- , ("M-r", refresh) -- Refresh
, ("M-S-c", kill1) -- Kill the currently focused client , ("M-S-c", kill1) -- Kill the currently focused client
, ("M-S-a", killAll) -- Kill all the windows on the current workspace , ("M-S-a", killAll) -- Kill all the windows on current workspace
-- Floating windows
, ("M-<Delete>", withFocused $ windows . W.sink) -- Push floating window back to tile. , ("M-<Delete>", withFocused $ windows . W.sink) -- Push floating window back to tile.
, ("M-S-<Delete>", sinkAll) -- Push ALL floating windows back to tile. , ("M-S-<Delete>", sinkAll) -- Push ALL floating windows back to tile.
-- Windows navigation
, ("M-m", windows W.focusMaster) -- Move focus to the master window , ("M-m", windows W.focusMaster) -- Move focus to the master window
, ("M-j", windows W.focusDown) -- Move focus to the next window , ("M-j", windows W.focusDown) -- Move focus to the next window
, ("M-k", windows W.focusUp) -- Move focus to the prev window , ("M-k", windows W.focusUp) -- Move focus to the prev window
@ -145,9 +142,6 @@ myKeys =
, ("M-<Backspace>", promote) -- Moves focused window to master, all others maintain order , ("M-<Backspace>", promote) -- Moves focused window to master, all others maintain order
, ("M1-S-<Tab>", rotSlavesDown) -- Rotate all windows except master and keep focus in place , ("M1-S-<Tab>", rotSlavesDown) -- Rotate all windows except master and keep focus in place
, ("M1-C-<Tab>", rotAllDown) -- Rotate all the windows in the current stack , ("M1-C-<Tab>", rotAllDown) -- Rotate all the windows in the current stack
, ("M-$", toggleFloatNext)
, ("M-S-$", toggleFloatAllNew)
, ("M-S-s", windows copyToAll) , ("M-S-s", windows copyToAll)
, ("M-C-s", killAllOtherCopies) , ("M-C-s", killAllOtherCopies)
@ -180,8 +174,10 @@ myKeys =
, ("M-S-<KP_Multiply>", increaseLimit) -- Increase number of windows that can be shown , ("M-S-<KP_Multiply>", increaseLimit) -- Increase number of windows that can be shown
, ("M-S-<KP_Divide>", decreaseLimit) -- Decrease number of windows that can be shown , ("M-S-<KP_Divide>", decreaseLimit) -- Decrease number of windows that can be shown
, ("M-h", sendMessage Shrink) , ("M-C-h", sendMessage Shrink)
, ("M-l", sendMessage Expand) , ("M-C-l", sendMessage Expand)
, ("M-C-j", sendMessage MirrorShrink)
, ("M-C-k", sendMessage MirrorExpand)
, ("M-S-;", sendMessage zoomReset) , ("M-S-;", sendMessage zoomReset)
, ("M-;", sendMessage ZoomFullToggle) , ("M-;", sendMessage ZoomFullToggle)
@ -233,7 +229,7 @@ myKeys =
, ("M-C-<KP_Page_Up>", spawn (myTerminal ++ " -e wopr report.xml")) -- Keypad 9 , ("M-C-<KP_Page_Up>", spawn (myTerminal ++ " -e wopr report.xml")) -- Keypad 9
-- GUI Apps -- GUI Apps
, ("M-w", spawn "surf http://www.youtube.com/c/DistroTube/") , ("M-b", spawn "surf http://www.youtube.com/c/DistroTube/")
, ("M-f", spawn "pcmanfm") , ("M-f", spawn "pcmanfm")
, ("M-g", runOrRaise "geany" (resource =? "geany")) , ("M-g", runOrRaise "geany" (resource =? "geany"))
@ -269,20 +265,17 @@ myWorkspaces = clickable . (map xmobarEscape)
clickable l = [ "<action=xdotool key super+" ++ show (n) ++ ">" ++ ws ++ "</action>" | clickable l = [ "<action=xdotool key super+" ++ show (n) ++ ">" ++ ws ++ "</action>" |
(i,ws) <- zip [1..8] l, (i,ws) <- zip [1..8] l,
let n = i ] let n = i ]
myManageHook :: Query (Data.Monoid.Endo WindowSet)
myManageHook = composeAll myManageHook = composeAll
[ [
className =? "Firefox" --> doShift "www" className =? "Firefox" --> doShift "<action=xdotool key super+2>www</action>"
, className =? "vivaldi" --> doShift "www" , title =? "Vivaldi" --> doShift "<action=xdotool key super+2>www</action>"
, className =? "irssi" --> doShift "chat" , title =? "irssi" --> doShift "<action=xdotool key super+6>chat</action>"
, className =? "zoom" --> doShift "chat" , className =? "cmus" --> doShift "<action=xdotool key super+7>media</action>"
, className =? "hexchat" --> doShift "chat" , className =? "vlc" --> doShift "<action=xdotool key super+7>media</action>"
, className =? "pcmanfm" --> doShift "sys" , className =? "Virtualbox" --> doFloat
, className =? "vifm" --> doShift "sys" , className =? "Gimp" --> doFloat
, className =? "cmus" --> doShift "media" , className =? "Gimp" --> doShift "<action=xdotool key super+8>gfx</action>"
, className =? "Vlc" --> doShift "media"
, className =? "Virtualbox" --> doFloat
, className =? "Gimp" --> doFloat
, (className =? "Firefox" <&&> resource =? "Dialog") --> doFloat -- Float Firefox Dialog , (className =? "Firefox" <&&> resource =? "Dialog") --> doFloat -- Float Firefox Dialog
] <+> namedScratchpadManageHook myScratchPads ] <+> namedScratchpadManageHook myScratchPads
@ -293,9 +286,11 @@ myManageHook = composeAll
myLayoutHook = avoidStruts $ mouseResize $ windowArrange $ T.toggleLayouts floats $ myLayoutHook = avoidStruts $ mouseResize $ windowArrange $ T.toggleLayouts floats $
mkToggle (NBFULL ?? NOBORDERS ?? EOT) $ myDefaultLayout mkToggle (NBFULL ?? NOBORDERS ?? EOT) $ myDefaultLayout
where where
myDefaultLayout = grid ||| threeCol ||| threeRow ||| oneBig ||| noBorders monocle ||| space ||| floats myDefaultLayout = tall ||| grid ||| threeCol ||| threeRow ||| oneBig ||| noBorders monocle ||| space ||| floats
grid = renamed [Replace "grid"] $ limitWindows 12 $ spacing 4 $ mkToggle (single MIRROR) $ Grid (16/10)
tall = renamed [Replace "tall"] $ limitWindows 12 $ spacing 6 $ ResizableTall 1 (3/100) (1/2) []
grid = renamed [Replace "grid"] $ limitWindows 12 $ spacing 6 $ mkToggle (single MIRROR) $ Grid (16/10)
threeCol = renamed [Replace "threeCol"] $ limitWindows 3 $ ThreeCol 1 (3/100) (1/2) threeCol = renamed [Replace "threeCol"] $ limitWindows 3 $ ThreeCol 1 (3/100) (1/2)
threeRow = renamed [Replace "threeRow"] $ limitWindows 3 $ Mirror $ mkToggle (single MIRROR) zoomRow threeRow = renamed [Replace "threeRow"] $ limitWindows 3 $ Mirror $ mkToggle (single MIRROR) zoomRow
oneBig = renamed [Replace "oneBig"] $ limitWindows 6 $ Mirror $ mkToggle (single MIRROR) $ mkToggle (single REFLECTX) $ mkToggle (single REFLECTY) $ OneBig (5/9) (8/12) oneBig = renamed [Replace "oneBig"] $ limitWindows 6 $ Mirror $ mkToggle (single MIRROR) $ mkToggle (single REFLECTX) $ mkToggle (single REFLECTY) $ OneBig (5/9) (8/12)

21
.zshrc
View file

@ -84,11 +84,11 @@ plugins=(
# export LANG=en_US.UTF-8 # export LANG=en_US.UTF-8
# Preferred editor for local and remote sessions # Preferred editor for local and remote sessions
# if [[ -n $SSH_CONNECTION ]]; then if [[ -n $SSH_CONNECTION ]]; then
# export EDITOR='vim' export EDITOR='vim'
# else else
# export EDITOR='mvim' export EDITOR='mvim'
# fi fi
# Compilation flags # Compilation flags
# export ARCHFLAGS="-arch x86_64" # export ARCHFLAGS="-arch x86_64"
@ -118,4 +118,15 @@ alias rr='curl -s -L https://raw.githubusercontent.com/keroserene/rickrollrc/mas
# dotfile git alias # dotfile git alias
alias config='/usr/bin/git --git-dir=/home/dt/dotfiles --work-tree=/home/dt' alias config='/usr/bin/git --git-dir=/home/dt/dotfiles --work-tree=/home/dt'
# Changing "ls" to "exa"
alias ls='exa -al --color=always --group-directories-first' # my preferred listing
alias la='exa -a --color=always --group-directories-first' # all files and dirs
alias ll='exa -l --color=always --group-directories-first' # long format
alias lt='exa -aT --color=always --group-directories-first' # tree listing
alias cp="cp -i" # confirm before overwriting something
alias df='df -h' # human-readable sizes
alias grep='grep --colour=auto'
zstyle ':completion:*' completer _expand_alias _complete _ignored zstyle ':completion:*' completer _expand_alias _complete _ignored
alias tb="nc termbin.com 9999"