Basic updates.
This commit is contained in:
parent
08c122f3fd
commit
a3bd316ea2
12 changed files with 352 additions and 152 deletions
|
|
@ -1,14 +1,18 @@
|
|||
#!/bin/sh
|
||||
|
||||
sudo ryzenadj-service &
|
||||
|
||||
# Enable Tear Free
|
||||
xrandr --output eDP --set TearFree on
|
||||
|
||||
# Load xresources
|
||||
xrdb --merge $HOME/.config/X11/xresources
|
||||
# Set dpms to 0
|
||||
xset dpms 0 0 0
|
||||
|
||||
# Disable mouse acceleration
|
||||
xinput --set-prop 18 'libinput Accel Speed' 0
|
||||
xinput --set-prop 18 'libinput Accel Profile Enabled' 0, 1
|
||||
# Load xresources
|
||||
xrdb $HOME/.config/X11/xresources
|
||||
|
||||
# Disable mouse acceleration and change sensitivity
|
||||
mouse-settings
|
||||
|
||||
# Hide the mouse after 5 seconds
|
||||
unclutter --timeout 5 &
|
||||
|
|
@ -26,7 +30,9 @@ xrdb -merge $HOME/.Xresources
|
|||
xmonad --recompile
|
||||
|
||||
# Set wallpaper
|
||||
xwallpaper --stretch $HOME/pics/wallpapers/cowppuccin.png
|
||||
xwallpaper --stretch $HOME/pics/wallpapers/wawe.jpg
|
||||
|
||||
[ -f "$HOME/.cache/gaming.lock" ] && rm $HOME/.cache/gaming.lock
|
||||
|
||||
# Run xmonad with dbus
|
||||
exec dbus-launch --exit-with-session xmonad
|
||||
|
|
|
|||
|
|
@ -6,3 +6,5 @@ Xft.hintstyle: hintfull
|
|||
Xft.hinting: 1
|
||||
Xft.antialias: 1
|
||||
Xft.rgba: rgb
|
||||
|
||||
URxvt.*font: xft:Comic Code Ligatures:size=14,xft:Symbols Nerd Font:size=14
|
||||
|
|
|
|||
|
|
@ -13,21 +13,21 @@ window:
|
|||
|
||||
font:
|
||||
normal:
|
||||
family: IBMPlex Mono
|
||||
family: JetBrainsMono Nerd Font
|
||||
style: Regular
|
||||
|
||||
bold:
|
||||
family: IBMPlex Mono
|
||||
family: JetBrainsMono Nerd Font
|
||||
|
||||
style: Bold
|
||||
|
||||
italic:
|
||||
family: IBMPlex Mono
|
||||
family: JetBrainsMono Nerd Font
|
||||
|
||||
style: Italic
|
||||
|
||||
bold_italic:
|
||||
family: IBMPlex Mono
|
||||
family: JetBrainsMono Nerd Font
|
||||
|
||||
style: Bold Italic
|
||||
|
||||
|
|
@ -35,82 +35,154 @@ font:
|
|||
|
||||
builtin_box_drawing: true
|
||||
|
||||
colors:
|
||||
# Default colors
|
||||
primary:
|
||||
background: "#303446" # base
|
||||
foreground: "#C6D0F5" # text
|
||||
# Bright and dim foreground colors
|
||||
dim_foreground: "#C6D0F5" # text
|
||||
bright_foreground: "#C6D0F5" # text
|
||||
schemes:
|
||||
catppuccin_frappe: &catppuccin_frappe
|
||||
# Default colors
|
||||
primary:
|
||||
background: "#303446" # base
|
||||
foreground: "#C6D0F5" # text
|
||||
# Bright and dim foreground colors
|
||||
dim_foreground: "#C6D0F5" # text
|
||||
bright_foreground: "#C6D0F5" # text
|
||||
|
||||
# Cursor colors
|
||||
cursor:
|
||||
text: "#303446" # base
|
||||
cursor: "#F2D5CF" # rosewater
|
||||
vi_mode_cursor:
|
||||
text: "#303446" # base
|
||||
cursor: "#BABBF1" # lavender
|
||||
# Cursor colors
|
||||
cursor:
|
||||
text: "#303446" # base
|
||||
cursor: "#F2D5CF" # rosewater
|
||||
vi_mode_cursor:
|
||||
text: "#303446" # base
|
||||
cursor: "#BABBF1" # lavender
|
||||
|
||||
# Search colors
|
||||
search:
|
||||
matches:
|
||||
foreground: "#303446" # base
|
||||
background: "#A5ADCE" # subtext0
|
||||
focused_match:
|
||||
foreground: "#303446" # base
|
||||
background: "#A6D189" # green
|
||||
footer_bar:
|
||||
foreground: "#303446" # base
|
||||
background: "#A5ADCE" # subtext0
|
||||
# Search colors
|
||||
search:
|
||||
matches:
|
||||
foreground: "#303446" # base
|
||||
background: "#A5ADCE" # subtext0
|
||||
focused_match:
|
||||
foreground: "#303446" # base
|
||||
background: "#A6D189" # green
|
||||
footer_bar:
|
||||
foreground: "#303446" # base
|
||||
background: "#A5ADCE" # subtext0
|
||||
|
||||
# Keyboard regex hints
|
||||
hints:
|
||||
start:
|
||||
foreground: "#303446" # base
|
||||
background: "#E5C890" # yellow
|
||||
end:
|
||||
foreground: "#303446" # base
|
||||
background: "#A5ADCE" # subtext0
|
||||
# Keyboard regex hints
|
||||
hints:
|
||||
start:
|
||||
foreground: "#303446" # base
|
||||
background: "#E5C890" # yellow
|
||||
end:
|
||||
foreground: "#303446" # base
|
||||
background: "#A5ADCE" # subtext0
|
||||
|
||||
# Selection colors
|
||||
selection:
|
||||
text: "#303446" # base
|
||||
background: "#F2D5CF" # rosewater
|
||||
# Selection colors
|
||||
selection:
|
||||
text: "#303446" # base
|
||||
background: "#F2D5CF" # rosewater
|
||||
|
||||
# Normal colors
|
||||
normal:
|
||||
black: "#51576D" # surface1
|
||||
red: "#E78284" # red
|
||||
green: "#A6D189" # green
|
||||
yellow: "#E5C890" # yellow
|
||||
blue: "#8CAAEE" # blue
|
||||
magenta: "#F4B8E4" # pink
|
||||
cyan: "#81C8BE" # teal
|
||||
white: "#B5BFE2" # subtext1
|
||||
# Normal colors
|
||||
normal:
|
||||
black: "#51576D" # surface1
|
||||
red: "#E78284" # red
|
||||
green: "#A6D189" # green
|
||||
yellow: "#E5C890" # yellow
|
||||
blue: "#8CAAEE" # blue
|
||||
magenta: "#F4B8E4" # pink
|
||||
cyan: "#81C8BE" # teal
|
||||
white: "#B5BFE2" # subtext1
|
||||
|
||||
# Bright colors
|
||||
bright:
|
||||
black: "#626880" # surface2
|
||||
red: "#E78284" # red
|
||||
green: "#A6D189" # green
|
||||
yellow: "#E5C890" # yellow
|
||||
blue: "#8CAAEE" # blue
|
||||
magenta: "#F4B8E4" # pink
|
||||
cyan: "#81C8BE" # teal
|
||||
white: "#A5ADCE" # subtext0
|
||||
# Bright colors
|
||||
bright:
|
||||
black: "#626880" # surface2
|
||||
red: "#E78284" # red
|
||||
green: "#A6D189" # green
|
||||
yellow: "#E5C890" # yellow
|
||||
blue: "#8CAAEE" # blue
|
||||
magenta: "#F4B8E4" # pink
|
||||
cyan: "#81C8BE" # teal
|
||||
white: "#A5ADCE" # subtext0
|
||||
|
||||
# Dim colors
|
||||
dim:
|
||||
black: "#51576D" # surface1
|
||||
red: "#E78284" # red
|
||||
green: "#A6D189" # green
|
||||
yellow: "#E5C890" # yellow
|
||||
blue: "#8CAAEE" # blue
|
||||
magenta: "#F4B8E4" # pink
|
||||
cyan: "#81C8BE" # teal
|
||||
white: "#B5BFE2" # subtext1
|
||||
# Dim colors
|
||||
dim:
|
||||
black: "#51576D" # surface1
|
||||
red: "#E78284" # red
|
||||
green: "#A6D189" # green
|
||||
yellow: "#E5C890" # yellow
|
||||
blue: "#8CAAEE" # blue
|
||||
magenta: "#F4B8E4" # pink
|
||||
cyan: "#81C8BE" # teal
|
||||
white: "#B5BFE2" # subtext1
|
||||
|
||||
indexed_colors:
|
||||
- { index: 16, color: "#EF9F76" }
|
||||
- { index: 17, color: "#F2D5CF" }
|
||||
indexed_colors:
|
||||
- { index: 16, color: "#EF9F76" }
|
||||
- { index: 17, color: "#F2D5CF" }
|
||||
everforest_dark_hard: &everforest_dark_hard
|
||||
primary:
|
||||
background: '#272e33'
|
||||
foreground: '#d3c6aa'
|
||||
normal:
|
||||
black: '#414b50'
|
||||
red: '#e67e80'
|
||||
green: '#a7c080'
|
||||
yellow: '#dbbc7f'
|
||||
blue: '#7fbbb3'
|
||||
magenta: '#d699b6'
|
||||
cyan: '#83c092'
|
||||
white: '#d3c6aa'
|
||||
bright:
|
||||
black: '#475258'
|
||||
red: '#e67e80'
|
||||
green: '#a7c080'
|
||||
yellow: '#dbbc7f'
|
||||
blue: '#7fbbb3'
|
||||
magenta: '#d699b6'
|
||||
cyan: '#83c092'
|
||||
white: '#d3c6aa'
|
||||
everforest_dark_medium: &everforest_dark_medium
|
||||
primary:
|
||||
background: '#2d353b'
|
||||
foreground: '#d3c6aa'
|
||||
normal:
|
||||
black: '#475258'
|
||||
red: '#e67e80'
|
||||
green: '#a7c080'
|
||||
yellow: '#dbbc7f'
|
||||
blue: '#7fbbb3'
|
||||
magenta: '#d699b6'
|
||||
cyan: '#83c092'
|
||||
white: '#d3c6aa'
|
||||
bright:
|
||||
black: '#475258'
|
||||
red: '#e67e80'
|
||||
green: '#a7c080'
|
||||
yellow: '#dbbc7f'
|
||||
blue: '#7fbbb3'
|
||||
magenta: '#d699b6'
|
||||
cyan: '#83c092'
|
||||
white: '#d3c6aa'
|
||||
everforest_dark_soft: &everforest_dark_soft
|
||||
primary:
|
||||
background: '#333c43'
|
||||
foreground: '#d3c6aa'
|
||||
normal:
|
||||
black: '#4d5960'
|
||||
red: '#e67e80'
|
||||
green: '#a7c080'
|
||||
yellow: '#dbbc7f'
|
||||
blue: '#7fbbb3'
|
||||
magenta: '#d699b6'
|
||||
cyan: '#83c092'
|
||||
white: '#d3c6aa'
|
||||
bright:
|
||||
black: '#4d5960'
|
||||
red: '#e67e80'
|
||||
green: '#a7c080'
|
||||
yellow: '#dbbc7f'
|
||||
blue: '#7fbbb3'
|
||||
magenta: '#d699b6'
|
||||
cyan: '#83c092'
|
||||
white: '#d3c6aa'
|
||||
|
||||
colors: *catppuccin_frappe
|
||||
|
||||
key_bindings:
|
||||
- {key: F11, action: ToggleFullscreen}
|
||||
|
|
|
|||
|
|
@ -8,4 +8,17 @@
|
|||
|
||||
"query:Podcast's:tags # \"Podcast's\" and unread = \"yes\"
|
||||
|
||||
"query:YouTube:tags # \"YouTube\" and unread = \"yes\"
|
||||
"query:YouTube:tags =~ \"YouTube\" and unread = \"yes\"
|
||||
|
||||
"query:YouTube-GameSales:(tags # \"YouTube-GameSales\") and (unread = \"yes\")
|
||||
"query:YouTube-Comentary:(tags # \"YouTube-Comentary\") and (unread = \"yes\")
|
||||
"query:YouTube-Fun:(tags # \"YouTube-Fun\") and (unread = \"yes\")
|
||||
"query:YouTube-Croatian:(tags # \"YouTube-Croatian\") and (unread = \"yes\")
|
||||
"query:YouTube-Weeb:(tags # \"YouTube-Weeb\") and (unread = \"yes\")
|
||||
"query:YouTube-Tech:(tags # \"YouTube-Tech\") and (unread = \"yes\")
|
||||
"query:YouTube-Learning:(tags # \"YouTube-Learning\") and (unread = \"yes\")
|
||||
"query:YouTube-Linux:(tags # \"YouTube-Linux\") and (unread = \"yes\")
|
||||
"query:YouTube-Gaming:(tags # \"YouTube-Gaming\") and (unread = \"yes\")
|
||||
"query:YouTube-SelfHost:(tags # \"YouTube-SelfHost\") and (unread = \"yes\")
|
||||
"query:YouTube-OpenSource:(tags # \"YouTube-OpenSource\") and (unread = \"yes\")
|
||||
"query:YouTube-Programming:(tags # \"YouTube-Programming\") and (unread = \"yes\")
|
||||
|
|
|
|||
|
|
@ -1,13 +1,60 @@
|
|||
'$schema' = "https://starship.rs/config-schema.json"
|
||||
|
||||
# Inserts a blank line between shell prompts
|
||||
add_newline = false
|
||||
palette = "catppuccin_frappe"
|
||||
format = '\[$username[@](bold blue)$hostname\] $all'
|
||||
|
||||
# Replace the "❯" symbol in the prompt with "➜"
|
||||
# [character] # The name of the module we are configuring is "character"
|
||||
# success_symbol = "[➜](bold green)" # The "success_symbol" segment is being set to "➜" with the color "bold green"
|
||||
|
||||
# Disable the package module, hiding it from the prompt completely
|
||||
[package]
|
||||
[character]
|
||||
# Note the use of Catppuccin color 'maroon'
|
||||
success_symbol = "[❯](green)"
|
||||
error_symbol = "[❮](red)"
|
||||
vimcmd_symbol = "[❮](green)"
|
||||
|
||||
[username]
|
||||
style_root = "bold red"
|
||||
style_user = "bold yellow"
|
||||
format = "[$user]($style)"
|
||||
show_always = true
|
||||
disabled = false
|
||||
|
||||
[hostname]
|
||||
ssh_only = false
|
||||
style = "bold teal"
|
||||
format = "[$hostname]($style)"
|
||||
|
||||
[directory]
|
||||
truncation_length = 4
|
||||
style = "bold lavender"
|
||||
|
||||
[cmd_duration]
|
||||
min_time = 500
|
||||
|
||||
[palettes.catppuccin_frappe]
|
||||
rosewater = "#f2d5cf"
|
||||
flamingo = "#eebebe"
|
||||
pink = "#f4b8e4"
|
||||
mauve = "#ca9ee6"
|
||||
red = "#e78284"
|
||||
maroon = "#ea999c"
|
||||
peach = "#ef9f76"
|
||||
yellow = "#e5c890"
|
||||
green = "#a6d189"
|
||||
teal = "#81c8be"
|
||||
sky = "#99d1db"
|
||||
sapphire = "#85c1dc"
|
||||
blue = "#8caaee"
|
||||
lavender = "#babbf1"
|
||||
text = "#c6d0f5"
|
||||
subtext1 = "#b5bfe2"
|
||||
subtext0 = "#a5adce"
|
||||
overlay2 = "#949cbb"
|
||||
overlay1 = "#838ba7"
|
||||
overlay0 = "#737994"
|
||||
surface2 = "#626880"
|
||||
surface1 = "#51576d"
|
||||
surface0 = "#414559"
|
||||
base = "#303446"
|
||||
mantle = "#292c3c"
|
||||
crust = "#232634"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
Config { lowerOnStart = True
|
||||
, overrideRedirect = True
|
||||
, font = "xft:IBMPlex Mono:size=10:antialias=true,IpaGothic:size=11:antialias,Symbols Nerd Font:size=10"
|
||||
, font = "xft:IBMPlex Mono:size=10:antialias=true,IpaGothic:size=11:antialias=true,Symbols Nerd Font:size=10:antialias=true"
|
||||
, bgColor = "#303446"
|
||||
, fgColor = "#c6d0f5"
|
||||
, position = TopSize L 100 27
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ main = xmonad
|
|||
myConfig = def
|
||||
{ modMask = myModMask
|
||||
, layoutHook = myLayoutHook
|
||||
, manageHook = myManageHook
|
||||
, manageHook = insertPosition End Newer <+> myManageHook
|
||||
, handleEventHook = trayerAboveXmobarEventHook
|
||||
, focusFollowsMouse = myFocusFollowsMouse
|
||||
, terminal = myTerminal
|
||||
|
|
@ -83,14 +83,15 @@ myStartupHook = do
|
|||
spawn "killall trayer-srg" -- kill current trayer on each restart
|
||||
spawnOnce "sxhkd -c $HOME/.config/sxhkd/general"
|
||||
spawnOnce "gentoo-pipewire-launcher"
|
||||
-- spawnOnce "transmission-daemon"
|
||||
spawnOnce "transmission-daemon"
|
||||
spawnOnce "syncthing"
|
||||
-- spawnOnce "lxsession"
|
||||
-- spawnOnce "picom"
|
||||
-- spawnOnce "clipmenud"
|
||||
spawnOnce "lxsession"
|
||||
spawnOnce "picom"
|
||||
spawnOnce "clipmenud"
|
||||
spawnOnce "dunst"
|
||||
-- spawnOnce "discord --start-minimized"
|
||||
spawnOnce "keepassxc"
|
||||
spawnOnce "/usr/libexec/polkit-gnome-authentication-agent-1"
|
||||
spawn ("sleep 2 && trayer-srg --edge top --align right --widthtype request --padding 6 --iconspacing 7 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 --tint 0x303446 --height 27 -l")
|
||||
setWMName "LG3D" -- Fix java programs
|
||||
|
||||
|
|
@ -99,6 +100,7 @@ myScratchPads :: [NamedScratchpad]
|
|||
myScratchPads = [ NS "terminal" spawnTerm findTerm manageTerm
|
||||
, NS "wiki" spawnWiki findWiki manageWiki
|
||||
, NS "notes" spawnNotes findNotes manageNotes
|
||||
, NS "profanity" spawnProfanity findProfanity manageProfanity
|
||||
]
|
||||
where
|
||||
spawnTerm = myTerminal ++ " --class scratchpad,scratchpad"
|
||||
|
|
@ -109,7 +111,7 @@ myScratchPads = [ NS "terminal" spawnTerm findTerm manageTerm
|
|||
w = 0.8
|
||||
t = 0.9 -h
|
||||
l = 0.9 -w
|
||||
spawnWiki = myTerminal ++ " -class wiki,wiki -e wiki"
|
||||
spawnWiki = myTerminal ++ " --class wiki,wiki -e wiki"
|
||||
findWiki = className =? "wiki"
|
||||
manageWiki = customFloating $ W.RationalRect l t w h
|
||||
where
|
||||
|
|
@ -117,7 +119,7 @@ myScratchPads = [ NS "terminal" spawnTerm findTerm manageTerm
|
|||
w = 0.8
|
||||
t = 0.9 -h
|
||||
l = 0.9 -w
|
||||
spawnNotes = myTerminal ++ " -class wiki,wiki -e notes"
|
||||
spawnNotes = myTerminal ++ " --class wiki,wiki -e notes"
|
||||
findNotes = className =? "notes"
|
||||
manageNotes = customFloating $ W.RationalRect l t w h
|
||||
where
|
||||
|
|
@ -125,6 +127,15 @@ myScratchPads = [ NS "terminal" spawnTerm findTerm manageTerm
|
|||
w = 0.8
|
||||
t = 0.9 -h
|
||||
l = 0.9 -w
|
||||
spawnProfanity = myTerminal ++ " --class profanity,profanity -e profanity"
|
||||
findProfanity = className =? "profanity"
|
||||
manageProfanity = customFloating $ W.RationalRect l t w h
|
||||
where
|
||||
h = 0.8
|
||||
w = 0.8
|
||||
t = 0.9 -h
|
||||
l = 0.9 -w
|
||||
|
||||
|
||||
--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
|
||||
|
|
@ -139,11 +150,11 @@ mySpacing' i = spacingRaw True (Border i i i i) True (Border i i i i) True
|
|||
tall = renamed [Replace "tall"]
|
||||
$ withBorder myBorderWidth
|
||||
$ windowNavigation
|
||||
$ mySpacing 6
|
||||
$ mySpacing 7
|
||||
$ ResizableTall 1 (3/100) (1/2) []
|
||||
monocle = renamed [Replace "monocle"]
|
||||
$ withBorder myBorderWidth
|
||||
$ mySpacing 6
|
||||
$ mySpacing 7
|
||||
$ windowNavigation
|
||||
$ Full
|
||||
floats = renamed [Replace "floats"]
|
||||
|
|
@ -164,7 +175,7 @@ myLayoutHook = lessBorders OnlyScreenFloat
|
|||
-- My manage hook
|
||||
myManageHook :: ManageHook
|
||||
myManageHook = composeAll
|
||||
[ className =? "LibreWolf" --> doShiftAndGo ( myWorkspaces !! 0)
|
||||
[ className =? "librewolf" --> doShiftAndGo ( myWorkspaces !! 0)
|
||||
, className =? "newsboat" --> doShiftAndGo ( myWorkspaces !! 3)
|
||||
, className =? "videos" --> doShiftAndGo ( myWorkspaces !! 3)
|
||||
, className =? "ytfzf" --> doShiftAndGo ( myWorkspaces !! 3)
|
||||
|
|
@ -173,22 +184,23 @@ myManageHook = composeAll
|
|||
, className =? "Ferdium" --> doShiftAndGo ( myWorkspaces !! 4)
|
||||
, className =? "discord" --> doShiftAndGo ( myWorkspaces !! 4)
|
||||
, className =? "tutanota-desktop" --> doShiftAndGo ( myWorkspaces !! 4)
|
||||
, className =? "Lutris" --> doShiftAndGo ( myWorkspaces !! 5) <+> doF W.swapUp
|
||||
, className =? "Steam" --> doShiftAndGo ( myWorkspaces !! 5)
|
||||
, className =? "Lutris" --> doShiftAndGo ( myWorkspaces !! 5)
|
||||
, className =? "steam" --> doShiftAndGo ( myWorkspaces !! 5)
|
||||
, className =? "heroic" --> doShiftAndGo ( myWorkspaces !! 5)
|
||||
, className =? "cartridges" --> doShiftAndGo ( myWorkspaces !! 5)
|
||||
, isDialog --> doCenterFloat <+> doF W.swapUp
|
||||
, className =? "Gimp" --> doFloat
|
||||
, className =? "confirm" --> doFloat
|
||||
, className =? "file_progress" --> doFloat
|
||||
, className =? "dialog" --> doFloat
|
||||
, className =? "download" --> doFloat
|
||||
, className =? "error" --> doFloat
|
||||
, className =? "notification" --> doFloat
|
||||
, className =? "splash" --> doFloat
|
||||
, className =? "toolbar" --> doFloat
|
||||
, className =? "pinentry-gtk-2" --> doFloat
|
||||
, className =? "Yad" --> doCenterFloat
|
||||
, className =? "badd" --> doCenterFloat
|
||||
, className =? "Gimp" --> doFloat <+> doF W.swapUp
|
||||
, className =? "confirm" --> doFloat <+> doF W.swapUp
|
||||
, className =? "file_progress" --> doFloat <+> doF W.swapUp
|
||||
, className =? "dialog" --> doFloat <+> doF W.swapUp
|
||||
, className =? "download" --> doFloat <+> doF W.swapUp
|
||||
, className =? "error" --> doFloat <+> doF W.swapUp
|
||||
, className =? "notification" --> doFloat <+> doF W.swapUp
|
||||
, className =? "splash" --> doFloat <+> doF W.swapUp
|
||||
, className =? "toolbar" --> doFloat <+> doF W.swapUp
|
||||
, className =? "pinentry-gtk-2" --> doFloat <+> doF W.swapUp
|
||||
, className =? "Yad" --> doCenterFloat <+> doF W.swapUp
|
||||
, className =? "badd" --> doCenterFloat <+> doF W.swapUp
|
||||
, isFullscreen --> doFullFloat <+> doF W.swapUp
|
||||
, namedScratchpadManageHook myScratchPads
|
||||
]
|
||||
|
|
@ -215,6 +227,7 @@ myKeys = \c -> mkKeymap c $
|
|||
, ("M-s t", namedScratchpadAction myScratchPads "terminal") -- Toggle scratchpad
|
||||
, ("M-s w", namedScratchpadAction myScratchPads "wiki") -- Toggle scratchpad
|
||||
, ("M-s n", namedScratchpadAction myScratchPads "notes") -- Toggle scratchpad
|
||||
, ("M-s p", namedScratchpadAction myScratchPads "profanity") -- Toggle scratchpad
|
||||
, ("M-1", viewDesktop 0) -- Check workspace 1
|
||||
, ("M-2", viewDesktop 1) -- Check workspace 2
|
||||
, ("M-3", viewDesktop 2) -- Check workspace 3
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@ export QT_QPA_PLATFORMTHEME=qt5ct
|
|||
|
||||
# Path exprt (.zshenv method doesn't work with gentoo for no real reason)
|
||||
typeset -U PATH path
|
||||
path=("$HOME/.local/bin" "$HOME/bin/dmenu/" "$HOME/bin/gaming/" "$HOME/bin/statusbar/" "$HOME/bin/misc/" "$HOME/bin/wayland" "$HOME/bin/fzf" "$HOME/bin/bspwm" "$path[@]")
|
||||
path=("$HOME/.local/share/cargo/bin" "$HOME/.local/bin" "$HOME/bin/dmenu" "$HOME/bin/misc" "$HOME/bin/statusbar" "$HOME/bin/tmux" "$path[@]")
|
||||
export PATH
|
||||
|
||||
export SXHKD_SHELL='/bin/sh'
|
||||
|
||||
[[ $(fgconsole 2>/dev/null) == 1 ]] && exec startx $HOME/.config/X11/xinitrc &> /dev/null
|
||||
# [[ $(fgconsole 2>/dev/null) == 1 ]] && exec start-river &> /dev/null
|
||||
# [[ $(fgconsole 2>/dev/null) == 1 ]] && exec start-dwl &> /dev/null
|
||||
# [[ $(fgconsole 2>/dev/null) == 1 ]] && exec start-hyprland &> /dev/null
|
||||
|
||||
eval "$(ssh-agent -s)" &> /dev/null
|
||||
|
|
|
|||
|
|
@ -16,7 +16,16 @@ plug "zap-zsh/completions"
|
|||
plug "zap-zsh/vim"
|
||||
plug "zsh-users/zsh-autosuggestions"
|
||||
plug "zsh-users/zsh-completions"
|
||||
plug "zsh-users/zsh-syntax-highlighting"
|
||||
plug "chivalryq/git-alias"
|
||||
plug "zdharma-continuum/fast-syntax-highlighting"
|
||||
plug "zsh-users/zsh-history-substring-search"
|
||||
plug "MichaelAquilina/zsh-you-should-use"
|
||||
|
||||
# Substring search settings
|
||||
export HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND="bg=blue,fg=black,bold"
|
||||
export HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=black,bold'
|
||||
bindkey -M vicmd 'k' history-substring-search-up
|
||||
bindkey -M vicmd 'j' history-substring-search-down
|
||||
|
||||
# Plugin settings
|
||||
if [ -n "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ]; then
|
||||
|
|
@ -33,7 +42,16 @@ plug "$XDG_CONFIG_HOME/zsh/functions.zsh"
|
|||
setopt appendhistory
|
||||
setopt INC_APPEND_HISTORY
|
||||
export HISTTIMEFORMAT="[%F %T]"
|
||||
# HISTSIZE=10000
|
||||
# SAVEHIST=5000
|
||||
|
||||
HISTFILE="$XDG_STATE_HOME"/zsh/history
|
||||
|
||||
[ -n "$NNNLVL" ] && PS1="N$NNNLVL $PS1"
|
||||
|
||||
nnn_cd ()
|
||||
{
|
||||
if ! [ -z "$NNN_PIPE" ]; then
|
||||
printf "%s\0" "0c${PWD}" > "${NNN_PIPE}" !&
|
||||
fi
|
||||
}
|
||||
|
||||
trap nnn_cd EXIT
|
||||
|
|
|
|||
|
|
@ -13,41 +13,19 @@ alias tree='tree -C'
|
|||
alias less='less -R'
|
||||
[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
|
||||
|
||||
# Git aliases
|
||||
alias g='git'
|
||||
alias gst='git status -s'
|
||||
alias gc='git commit'
|
||||
alias ga='git add'
|
||||
alias gpl="git pull"
|
||||
alias gpom="git pull origin master"
|
||||
alias gpu="git push"
|
||||
alias gpuom="git push origin master"
|
||||
alias gd="git diff"
|
||||
alias gch="git checkout"
|
||||
alias gnb="git checkout -b"
|
||||
alias gac="git add . && git commit"
|
||||
alias grs="git restore --staged ."
|
||||
alias gre="git restore"
|
||||
alias gr="git remote"
|
||||
alias gcl="git clone"
|
||||
alias glg="git log --graph --abbrev-commit --decorate --format=format:'%C(bold green)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold yellow)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all"
|
||||
alias gt="git ls-tree -r master --name-only"
|
||||
alias grm="git remote"
|
||||
alias gb="git branch"
|
||||
alias gf="git fetch"
|
||||
|
||||
# Easier to type
|
||||
alias vi='nvim'
|
||||
alias nnn='nnn -xec'
|
||||
|
||||
# Humna readable + better output
|
||||
alias df='df -h -x devtmpfs -x tmpfs -x usbfs -x loop'
|
||||
alias free='free -m -h'
|
||||
|
||||
# speed up
|
||||
alias spotdl='spotdl --output-format ogg -p "{artist}/{album}/{artists} - {title}.{ext}" --dt 8 --st 8'
|
||||
alias spotdl='spotdl --format mp3 --output "{artist}/{artists} - {title}" --threads 16 --sponsor-block'
|
||||
|
||||
# Just cause I can't remember the command at all
|
||||
alias update-grub='doas grub-mkconfig -o /boot/grub/grub.cfg'
|
||||
alias update-grub='sudo grub-mkconfig -o /boot/grub/grub.cfg'
|
||||
|
||||
# Quickly see the hogger in the directory
|
||||
alias dust='du -hd1 | sort -hr | sed "s/.\///g" | sed "/\.$/d"'
|
||||
|
|
@ -59,10 +37,6 @@ alias ytvf='yt-dlp --merge-output-format mp4 --format best --embed-thumbnail --e
|
|||
|
||||
# Nice
|
||||
alias dl='aria2c -j 16 -s 16 -x 16 -k 5M --file-allocation=none'
|
||||
|
||||
# ;)
|
||||
alias lf='lfrun $@'
|
||||
|
||||
alias b='buku --suggest'
|
||||
|
||||
# cryptography
|
||||
|
|
|
|||
|
|
@ -2,14 +2,21 @@
|
|||
|
||||
# Cd into a directory using fzf
|
||||
fcd () {
|
||||
dir=$(fd -a --type d --hidden --exclude ".git|.github" | fzf --prompt "Choose directory: ")
|
||||
dir=$(fd -a --type d --hidden --exclude ".git|.github" --color=never | fzf --prompt "Choose directory: ")
|
||||
[ -z $dir ] && return 1
|
||||
cd $dir
|
||||
}
|
||||
|
||||
# Cd into specific repo
|
||||
fr () {
|
||||
dir=$(fd . ~/repos --maxdepth 1 -a --type d --hidden --exclude ".git|.github" --color=never | fzf --prompt "Choose directory: ")
|
||||
[ -z $dir ] && return 1
|
||||
cd $dir
|
||||
}
|
||||
|
||||
# Remove choosed stuff
|
||||
frm () {
|
||||
remove=$(fd --hidden --maxdepth 1 | fzf -m --prompt "Choose to delete: ")
|
||||
remove=$(fd --hidden --maxdepth 1 --color=never | fzf -m --prompt "Choose to delete: ")
|
||||
[ -z $remove ] && return 1
|
||||
rm -rf $(printf '%s' $remove)
|
||||
}
|
||||
|
|
@ -33,6 +40,7 @@ md () {
|
|||
mvln () {
|
||||
from=$(readlink -f $1)
|
||||
to=$(readlink -f $2)
|
||||
[ ! -d "$(basename $to)" ] && mkdir "$to"
|
||||
mv $from $to
|
||||
ln -s $to $from
|
||||
}
|
||||
|
|
@ -45,13 +53,17 @@ se() {
|
|||
|
||||
# List my config and open the dir in a editor
|
||||
ce() {
|
||||
fd . ~/.config -L --maxdepth 1 --color=never | fzf --prompt \
|
||||
"Choose config to edit: " --preview 'tree -a -C {}' | xargs -r $EDITOR
|
||||
current=$(pwd)
|
||||
dir=$(fd . ~/.config -L --maxdepth 1 --color=never | fzf --prompt \
|
||||
"Choose config to edit: " --preview 'tree -a -C {}')
|
||||
[ "$dir" = "" ] && return
|
||||
cd "$dir" && nvim .
|
||||
cd "$current"
|
||||
}
|
||||
|
||||
# List files in a directory and edit choosen one
|
||||
vf(){
|
||||
fd -L --maxdepth 1 --type f --color=never --hidden | fzf --prompt "Choose script to edit: " \
|
||||
fd -L --maxdepth 1 --type f --color=never --hidden | fzf --prompt "Choose file to edit: " \
|
||||
--preview 'bat --color=always --style=plain --pager=never {}' | xargs -r $EDITOR
|
||||
}
|
||||
|
||||
|
|
@ -84,3 +96,31 @@ erm() {
|
|||
printf '%s\n' ""
|
||||
done
|
||||
}
|
||||
|
||||
# Check use flags of package in world
|
||||
u() {
|
||||
cat /var/lib/portage/world | fzf --prompt "Choose package to uninstall: " --preview "equery u {}" --multi
|
||||
}
|
||||
|
||||
# Check dependencies of packages in world
|
||||
d() {
|
||||
cat /var/lib/portage/world | fzf --prompt "Choose package to uninstall: " --preview "emerge -pqe {}"
|
||||
}
|
||||
|
||||
n () {
|
||||
# Block nesting of nnn in subshells
|
||||
[ "${NNNLVL:-0}" -eq 0 ] || {
|
||||
echo "nnn is already running"
|
||||
return
|
||||
}
|
||||
|
||||
# Tempfile location
|
||||
export NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
|
||||
|
||||
nnn "$@"
|
||||
|
||||
[ ! -f "$NNN_TMPFILE" ] || {
|
||||
. "$NNN_TMPFILE"
|
||||
rm -f "$NNN_TMPFILE" > /dev/null
|
||||
}
|
||||
}
|
||||
|
|
|
|||
17
.zshenv
17
.zshenv
|
|
@ -10,7 +10,7 @@ export VIDEO="mpv"
|
|||
export IMAGE="nsxiv"
|
||||
export OPENER="xdg-open"
|
||||
export PAGER="less"
|
||||
export WM="awesome"
|
||||
export WM="xmonad"
|
||||
export SUDO_ASKPASS="dmenu-pass"
|
||||
|
||||
# clipmenu settings
|
||||
|
|
@ -20,6 +20,17 @@ export CM_SELECTIONS="clipboard"
|
|||
export CM_OWN_CLIPBOARD=1
|
||||
export CM_DIR="$HOME/.cache"
|
||||
|
||||
# NNN settings
|
||||
export NNN_FIFO="/tmp/nnn.fifo"
|
||||
export NNN_PLUG="s:!zsh -i*;u:nmount;c:chksum;r:gitroot;v:imgview;m:mtpmount;d:xdgdefault;x:togglex"
|
||||
export NNN_COLORS="2136"
|
||||
export NNN_SSHFS="sshfs -o follow_symlinks"
|
||||
|
||||
# Catppuccin colors nnn
|
||||
BLK="03" CHR="03" DIR="04" EXE="02" REG="07" HARDLINK="05" SYMLINK="05" MISSING="08" ORPHAN="01" FIFO="06" SOCK="03" UNKNOWN="01"
|
||||
export NNN_COLORS="#04020301;4231"
|
||||
export NNN_FCOLORS="$BLK$CHR$DIR$EXE$REG$HARDLINK$SYMLINK$MISSING$ORPHAN$FIFO$SOCK$UNKNOWN"
|
||||
|
||||
# clean up
|
||||
export XDG_STATE_HOME="$HOME/.local/state"
|
||||
export XDG_CONFIG_HOME="$HOME/.config"
|
||||
|
|
@ -48,6 +59,9 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=1
|
|||
export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc"
|
||||
export NUGET_PACKAGES="$XDG_CACHE_HOME/NuGetPackages"
|
||||
export PARALLEL_HOME="$XDG_CONFIG_HOME/parallel"
|
||||
export XCURSOR_PATH=/usr/share/icons:$XDG_DATA_HOME/icons
|
||||
export MYPY_CACHE_DIR="$XDG_CACHE_HOME"/mypy
|
||||
export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc
|
||||
|
||||
# fzf catppuccin theme
|
||||
export FZF_DEFAULT_OPTS=" \
|
||||
|
|
@ -64,3 +78,4 @@ export BEMENU_OPTS='-H 24 --fb "#303446" --ff "#81c8be" \
|
|||
|
||||
# bat theme
|
||||
export BAT_THEME="Catppuccin-mocha"
|
||||
. "/home/crony/.local/share/cargo/env"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue