mirror of
https://gitlab.com/dwt1/dotfiles.git
synced 2026-04-24 03:50:24 +10:00
Minor edits.
This commit is contained in:
@@ -180,7 +180,7 @@ font:
|
|||||||
style: Bold Italic
|
style: Bold Italic
|
||||||
|
|
||||||
# Point size
|
# Point size
|
||||||
size: 12.0
|
size: 11.0
|
||||||
|
|
||||||
# Offset is the extra space around each character. `offset.y` can be thought of
|
# Offset is the extra space around each character. `offset.y` can be thought of
|
||||||
# as modifying the line spacing, and `offset.x` as modifying the letter spacing.
|
# as modifying the line spacing, and `offset.x` as modifying the letter spacing.
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ highlight StatusLine ctermfg=7 ctermbg=8 cterm=none
|
|||||||
highlight StatusLineNC ctermfg=7 ctermbg=8 cterm=none
|
highlight StatusLineNC ctermfg=7 ctermbg=8 cterm=none
|
||||||
highlight NERDTreeClosable ctermfg=2
|
highlight NERDTreeClosable ctermfg=2
|
||||||
highlight NERDTreeOpenable ctermfg=8
|
highlight NERDTreeOpenable ctermfg=8
|
||||||
highlight Comment ctermfg=4 ctermbg=none cterm=none
|
highlight Comment ctermfg=4 ctermbg=none cterm=italic
|
||||||
highlight Constant ctermfg=12 ctermbg=none cterm=none
|
highlight Constant ctermfg=12 ctermbg=none cterm=none
|
||||||
highlight Special ctermfg=4 ctermbg=none cterm=none
|
highlight Special ctermfg=4 ctermbg=none cterm=none
|
||||||
highlight Identifier ctermfg=6 ctermbg=none cterm=none
|
highlight Identifier ctermfg=6 ctermbg=none cterm=none
|
||||||
|
|||||||
@@ -12,23 +12,28 @@
|
|||||||
|
|
||||||
;; Setting the font.
|
;; Setting the font.
|
||||||
(setq doom-font (font-spec :family "Mononoki Nerd Font Mono" :size 15))
|
(setq doom-font (font-spec :family "Mononoki Nerd Font Mono" :size 15))
|
||||||
|
;;(setq doom-font (font-spec :family "SauceCodePro Nerd Font" :size 15))
|
||||||
|
|
||||||
;; Setting the theme
|
;; Setting the theme
|
||||||
(setq doom-theme 'doom-dracula)
|
(setq doom-theme 'doom-palenight)
|
||||||
|
|
||||||
;; Setting the neotree width to be adjustable.
|
;; Setting the neotree width to be adjustable.
|
||||||
(setq neo-window-fixed-size nil)
|
(setq neo-window-fixed-size nil)
|
||||||
|
|
||||||
;; Setting the indent guides to show an arrow.
|
;; Sets transparency for focuses and unfocused frames.
|
||||||
(def-package! highlight-indent-guides
|
;; (set-frame-parameter (selected-frame) 'alpha '(95 . 80))
|
||||||
:commands highlight-indent-guides-mode
|
;; (add-to-list 'default-frame-alist '(alpha . (95 . 80)))
|
||||||
:hook (prog-mode . highlight-indent-guides-mode)
|
|
||||||
:config
|
;; Setting the indent guides to show a pipe character.
|
||||||
(setq highlight-indent-guides-method 'character
|
;; (def-package! highlight-indent-guides
|
||||||
highlight-indent-guides-character ?\⇨
|
;; :commands highlight-indent-guides-mode
|
||||||
highlight-indent-guides-delay 0.01
|
;; :hook (prog-mode . highlight-indent-guides-mode)
|
||||||
highlight-indent-guides-responsive 'top
|
;; :config
|
||||||
highlight-indent-guides-auto-enabled nil))
|
;; (setq highlight-indent-guides-method 'character
|
||||||
|
;; highlight-indent-guides-character ?\|
|
||||||
|
;; highlight-indent-guides-delay 0.01
|
||||||
|
;; highlight-indent-guides-responsive 'top
|
||||||
|
;; highlight-indent-guides-auto-enabled nil))
|
||||||
|
|
||||||
(require 'emms-setup)
|
(require 'emms-setup)
|
||||||
(emms-standard)
|
(emms-standard)
|
||||||
|
|||||||
@@ -54,10 +54,10 @@ import XMonad.Actions.GridSelect
|
|||||||
import XMonad.Actions.MouseResize
|
import XMonad.Actions.MouseResize
|
||||||
|
|
||||||
-- Layouts modifiers
|
-- Layouts modifiers
|
||||||
import XMonad.Layout.Gaps
|
|
||||||
import XMonad.Layout.Renamed (renamed, Rename(Replace))
|
import XMonad.Layout.Renamed (renamed, Rename(Replace))
|
||||||
import XMonad.Layout.Spacing (spacing)
|
import XMonad.Layout.Spacing
|
||||||
import XMonad.Layout.NoBorders
|
import XMonad.Layout.NoBorders
|
||||||
|
import XMonad.Layout.LayoutModifier
|
||||||
import XMonad.Layout.LimitWindows (limitWindows, increaseLimit, decreaseLimit)
|
import XMonad.Layout.LimitWindows (limitWindows, increaseLimit, decreaseLimit)
|
||||||
import XMonad.Layout.WindowArranger (windowArrange, WindowArrangerMsg(..))
|
import XMonad.Layout.WindowArranger (windowArrange, WindowArrangerMsg(..))
|
||||||
import XMonad.Layout.Reflect (REFLECTX(..), REFLECTY(..))
|
import XMonad.Layout.Reflect (REFLECTX(..), REFLECTY(..))
|
||||||
@@ -94,9 +94,6 @@ myNormColor = "#292d3e" -- Border color of normal windows
|
|||||||
myFocusColor :: [Char]
|
myFocusColor :: [Char]
|
||||||
myFocusColor = "#bbc5ff" -- Border color of focused windows
|
myFocusColor = "#bbc5ff" -- Border color of focused windows
|
||||||
|
|
||||||
myGaps :: Int
|
|
||||||
myGaps = 5 -- Sets layout gaps and window spacing
|
|
||||||
|
|
||||||
altMask :: KeyMask
|
altMask :: KeyMask
|
||||||
altMask = mod1Mask -- Setting this for use in xprompts
|
altMask = mod1Mask -- Setting this for use in xprompts
|
||||||
|
|
||||||
@@ -106,6 +103,7 @@ windowCount = gets $ Just . show . length . W.integrate' . W.stack . W.workspace
|
|||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
-- AUTOSTART
|
-- AUTOSTART
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
|
myStartupHook :: X ()
|
||||||
myStartupHook = do
|
myStartupHook = do
|
||||||
spawnOnce "nitrogen --restore &"
|
spawnOnce "nitrogen --restore &"
|
||||||
spawnOnce "picom &"
|
spawnOnce "picom &"
|
||||||
@@ -423,20 +421,64 @@ myManageHook = composeAll
|
|||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
-- LAYOUTS
|
-- LAYOUTS
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
|
-- Makes setting the spacingRaw simpler to write. The spacingRaw
|
||||||
|
-- module adds a configurable amount of space around windows.
|
||||||
|
mySpacing :: Integer -> l a -> XMonad.Layout.LayoutModifier.ModifiedLayout Spacing l a
|
||||||
|
mySpacing i = spacingRaw False (Border i i i i) True (Border i i i i) True
|
||||||
|
-- This is a variation of the above except no borders are applied
|
||||||
|
-- if fewer than two windows. So a single window has no gaps.
|
||||||
|
mySpacing' i = spacingRaw False (Border i i i i) True (Border i i i i) True
|
||||||
|
|
||||||
|
tall = renamed [Replace "tall"]
|
||||||
|
$ limitWindows 12
|
||||||
|
$ mySpacing 8
|
||||||
|
$ ResizableTall 1 (3/100) (1/2) []
|
||||||
|
|
||||||
|
grid = renamed [Replace "grid"]
|
||||||
|
$ limitWindows 12
|
||||||
|
$ mySpacing 8
|
||||||
|
$ mkToggle (single MIRROR)
|
||||||
|
$ Grid (16/10)
|
||||||
|
|
||||||
|
threeCol = renamed [Replace "threeCol"]
|
||||||
|
$ limitWindows 3
|
||||||
|
$ mySpacing' 8
|
||||||
|
$ ThreeCol 1 (3/100) (1/3)
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
monocle = renamed [Replace "monocle"]
|
||||||
|
$ limitWindows 20
|
||||||
|
$ Full
|
||||||
|
|
||||||
|
space = renamed [Replace "space"]
|
||||||
|
$ limitWindows 4
|
||||||
|
$ Mirror
|
||||||
|
$ mkToggle (single MIRROR)
|
||||||
|
$ mkToggle (single REFLECTX)
|
||||||
|
$ mkToggle (single REFLECTY)
|
||||||
|
$ OneBig (2/3) (2/3)
|
||||||
|
|
||||||
|
floats = renamed [Replace "floats"]
|
||||||
|
$ limitWindows 20
|
||||||
|
$ simplestFloat
|
||||||
|
|
||||||
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 = tall ||| grid ||| threeCol ||| threeRow ||| oneBig ||| noBorders monocle ||| space ||| floats
|
myDefaultLayout = tall ||| grid ||| threeCol ||| threeRow ||| oneBig ||| noBorders monocle ||| space ||| floats
|
||||||
|
|
||||||
tall = renamed [Replace "tall"] $ limitWindows 12 $ gaps [(U,myGaps), (D,myGaps), (L,myGaps), (R,myGaps)] $ spacing myGaps $ ResizableTall 1 (3/100) (1/2) []
|
|
||||||
grid = renamed [Replace "grid"] $ limitWindows 12 $ spacing myGaps $ mkToggle (single MIRROR) $ Grid (16/10)
|
|
||||||
threeCol = renamed [Replace "threeCol"] $ limitWindows 3 $ ThreeCol 1 (3/100) (1/2)
|
|
||||||
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)
|
|
||||||
monocle = renamed [Replace "monocle"] $ limitWindows 20 $ Full
|
|
||||||
space = renamed [Replace "space"] $ limitWindows 4 $ spacing 12 $ Mirror $ mkToggle (single MIRROR) $ mkToggle (single REFLECTX) $ mkToggle (single REFLECTY) $ OneBig (2/3) (2/3)
|
|
||||||
floats = renamed [Replace "floats"] $ limitWindows 20 $ simplestFloat
|
|
||||||
|
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
-- SCRATCHPADS
|
-- SCRATCHPADS
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
|
|||||||
Reference in New Issue
Block a user