colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Ivan Malison
2021-09-12 04:18:39 +00:00
parent 962dd7a8c9 04445bb84c
commit 805b64eb5d
17 changed files with 109 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dotfiles/config/picom.conf
View File

@@ -158,6 +158,7 @@ fade-exclude = [ ];
#################################
corner-radius: 10
rounded-corners-exclude = [ "class_g = 'xmonad'" ];
#################################
#

2
dotfiles/config/taffybar/taffybar

Submodule dotfiles/config/taffybar/taffybar updated: dd3d05555f...437f730752

3
dotfiles/config/taffybar/taffybar.css
View File

@@ -38,6 +38,9 @@
.workspaces .contents {
box-shadow: none;
border-radius: 4px;
border-width: 1px;
border-style: solid;
border-color: @transparent;
}
.workspace-label {

18
dotfiles/config/taffybar/taffybar.hs
View File

@@ -131,9 +131,12 @@ cssFilesByHostname =
, ("imalison-home", ["taffybar.css"])
, ("ivanm-dfinity-razer", ["taffybar.css"])
, ("ryzen-shine", ["taffybar.css"])
, ("stevie-nixos", ["taffybar.css"])
]
main = do
enableLogger "Graphics.UI.GIGtkStrut" DEBUG
hostName <- getHostName
homeDirectory <- getHomeDirectory
let relativeFiles = fromMaybe ["taffybar.css"] $ lookup hostName cssFilesByHostname
@@ -203,7 +206,7 @@ main = do
, barPosition = Top
, widgetSpacing = 0
, barPadding = 0
, barHeight = 50
, barHeight = ScreenRatio $ 1/27
, cssPaths = cssFiles
, startupHook = void $ setCMCAPIKey "f9e66366-9d42-4c6e-8d40-4194a0aaa329"
}
@@ -213,16 +216,19 @@ main = do
, baseConfig { endWidgets = laptopEndWidgets }
)
, ( "imalison-home"
, baseConfig { endWidgets = fullEndWidgets, barHeight = 42 }
, baseConfig { endWidgets = fullEndWidgets }
)
, ( "ryzen-shine"
, baseConfig { endWidgets = fullEndWidgets, barHeight = 50 }
, baseConfig { endWidgets = fullEndWidgets }
)
, ( "ivanm-dfinity-razer"
, baseConfig { endWidgets = laptopEndWidgets, barHeight = 42 }
, baseConfig { endWidgets = laptopEndWidgets }
)
, ( "adele"
, baseConfig { endWidgets = laptopEndWidgets, barHeight = 45 }
, baseConfig { endWidgets = laptopEndWidgets }
)
, ( "stevie-nixos"
, baseConfig { endWidgets = laptopEndWidgets }
)
]
simpleTaffyConfig = selectedConfig
@@ -231,7 +237,7 @@ main = do
-- , startWidgets = []
}
startTaffybar $
appendHook (void $ getHost False) $
appendHook (void $ getTrayHost False) $
withLogServer $
withToggleServer $
toTaffyConfig simpleTaffyConfig

2
dotfiles/config/xmonad/xmonad

Submodule dotfiles/config/xmonad/xmonad updated: aa18707c3e...485a0ad506

37
dotfiles/config/xmonad/xmonad.hs
View File

@@ -66,6 +66,7 @@ import XMonad.Layout.Accordion
import XMonad.Layout.BoringWindows
import XMonad.Layout.ConditionalLayout
import XMonad.Layout.Cross
import XMonad.Layout.Decoration
import XMonad.Layout.Grid
import XMonad.Layout.LayoutCombinators
import XMonad.Layout.LayoutModifier
@@ -90,7 +91,6 @@ import XMonad.Util.Minimize
import XMonad.Util.NamedScratchpad as NS
import XMonad.Util.NamedWindows (getName)
import XMonad.Util.Run
import XMonad.Util.Themes
import XMonad.Util.WorkspaceCompare
myConfig = def
@@ -100,8 +100,6 @@ myConfig = def
= namedScratchpadManageHook scratchpads
, layoutHook = myLayoutHook
, borderWidth = 0
, normalBorderColor = "#0096ff"
, focusedBorderColor = "#ffff00"
, logHook
= updatePointer (0.5, 0.5) (0, 0)
<> toggleFadeInactiveLogHook 0.9
@@ -112,12 +110,24 @@ myConfig = def
, handleEventHook
= followIfNoMagicFocus
<> minimizeEventHook
<> restartEventHook
-- <> restartEventHook
<> myScratchPadEventHook
, startupHook = myStartup
, keys = customKeys (const []) addKeys
}
gothamTheme =
def
{ inactiveBorderColor = "#000"
, activeBorderColor = "#edb443"
, activeColor = "#edb443"
, inactiveColor = "#091f2e"
, inactiveTextColor = "#edb443"
, activeTextColor = "#091f2e"
, fontName = "xft:Source Code Pro:style=Semibold"
, decoHeight = 25
}
restartEventHook e@ClientMessageEvent { ev_message_type = mt } = do
a <- getAtom "XMONAD_RESTART"
if mt == a
@@ -127,14 +137,13 @@ restartEventHook _ = return $ All True
myNavigation2DConfig = def { defaultTiledNavigation = centerNavigation }
main = do
dirs <- getDirectories
(`launch` dirs)
. docks
. pagerHints
. ewmh
. ewmhFullscreen
. withNavigation2DConfig myNavigation2DConfig $ myConfig
main =
xmonad
. docks
. pagerHints
. ewmh
. ewmhFullscreen
. withNavigation2DConfig myNavigation2DConfig $ myConfig
-- Utility functions
@@ -306,7 +315,7 @@ instance Transformer MyToggles Window where
transform AVOIDSTRUTS x k = k (avoidStruts x) unmodifyLayout
myToggles = [LIMIT, GAPS, MAGICFOCUS, MAGNIFY, AVOIDSTRUTS]
otherToggles = [NBFULL, MIRROR, NOBORDERS, SMARTBORDERS]
otherToggles = [NBFULL, NOBORDERS, MIRROR, SMARTBORDERS]
toggleHandlers =
[ (Toggle GAPS, toggleAll)
, (Toggle MAGNIFY, toggleAll)
@@ -406,7 +415,7 @@ layoutInfo =
rename "2 Columns" (Tall 1 (3 / 100) (1 / 2)) |||!
Accordion |||! simpleCross |||! myTabbed
where
myTabbed = rename "Tabbed" $ tabbed shrinkText (theme robertTheme)
myTabbed = rename "Tabbed" $ tabbed shrinkText gothamTheme
layoutList = snd layoutInfo

2
dotfiles/emacs.d/README.org
View File

@@ -5043,7 +5043,7 @@ load-theme hook (See the heading below).
** After ~load-theme~ hook
#+BEGIN_SRC emacs-lisp
(defvar imalison:light-theme 'solarized-light)
(defvar imalison:dark-theme 'flatland)
(defvar imalison:dark-theme 'gotham)
(defun imalison:after-load-theme (&rest _args)
(when (fboundp 'powerline-reset)

3
dotfiles/gitconfig
View File

@@ -98,3 +98,6 @@
[user]
email = IvanMalison@gmail.com
name = Ivan Malison
[init]
defaultBranch = master

7
dotfiles/xkb/keymap/stevie-nixos Normal file
View File

@@ -0,0 +1,7 @@
xkb_keymap {
xkb_keycodes { include "evdev+aliases(qwerty)" };
xkb_types { include "complete" };
xkb_compat { include "complete" };
xkb_symbols { include "pc+us+inet(evdev)+altwin(swap_lalt_lwin)+imalison(ralt_as_hyper)+capslock(ctrl_modifier)" };
xkb_geometry { include "pc(pc105)" };
};