aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/alacritty/alacritty.linux.toml43
-rw-r--r--config/alacritty/alacritty.linux.yml6
-rw-r--r--config/fish/config.fish4
-rw-r--r--config/rofi/config.rasi3
-rwxr-xr-xconfig/x11/xinitrc10
-rw-r--r--config/xmonad/xmonad.hs20
-rw-r--r--config/zsh/.zshenv1
7 files changed, 71 insertions, 16 deletions
diff --git a/config/alacritty/alacritty.linux.toml b/config/alacritty/alacritty.linux.toml
new file mode 100644
index 0000000..2bb62cb
--- /dev/null
+++ b/config/alacritty/alacritty.linux.toml
@@ -0,0 +1,43 @@
+[env]
+TERM = "xterm-256color"
+WINIT_X11_SCALE_FACTOR = "1"
+
+[font]
+size = 9.0
+offset = { x = 0, y = 0 }
+normal = { family = "Fira Code", style = "Regular" }
+bold = { family = "Fira Code", style = "Bold" }
+italic = { family = "Fira Code", style = "Light" }
+
+[keyboard]
+bindings = [
+ { key = "J", mods = "Alt", chars = "\u001B[B" },
+ { key = "K", mods = "Alt", chars = "\u001B[A" },
+ { key = "J", mods = "Alt|Shift", action = "ScrollHalfPageDown" },
+ { key = "K", mods = "Alt|Shift", action = "ScrollHalfPageUp" },
+ { key = "Plus", mods = "Alt|Shift", action = "IncreaseFontSize" },
+ { key = "Minus", mods = "Alt", action = "DecreaseFontSize" },
+ { key = "Key0", mods = "Alt", action = "ResetFontSize" },
+]
+
+[colors.primary]
+background = "0x282828"
+foreground = "0xebdbb2"
+[colors.bright]
+black = "0x928374"
+blue = "0x83a598"
+cyan = "0x8ec07c"
+green = "0xb8bb26"
+magenta = "0xd3869b"
+red = "0xfb4934"
+white = "0xebdbb2"
+yellow = "0xfabd2f"
+[colors.normal]
+black = "0x282828"
+blue = "0x458588"
+cyan = "0x689d6a"
+green = "0x98971a"
+magenta = "0xb16286"
+red = "0xcc241d"
+white = "0xa89984"
+yellow = "0xd79921"
diff --git a/config/alacritty/alacritty.linux.yml b/config/alacritty/alacritty.linux.yml
index 5a9140c..74111be 100644
--- a/config/alacritty/alacritty.linux.yml
+++ b/config/alacritty/alacritty.linux.yml
@@ -14,13 +14,13 @@ font:
x: 0
y: 0
normal:
- family: FiraCode
+ family: Fira Code
style: Regular
italic:
- family: FiraCode
+ family: Fira Code
style: Light
bold:
- family: FiraCode
+ family: Fira Code
style: Bold
diff --git a/config/fish/config.fish b/config/fish/config.fish
index ac67f57..65b477f 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -94,6 +94,8 @@ set -gx GPG_TTY "$(tty)"
# valgrind requires this to work on arch linux (from: https://bbs.archlinux.org/viewtopic.php?id=276422)
set -gx DEBUGINFOD_URLS 'https://debuginfod.archlinux.org'
+set -gx HOST "$(cat /etc/hostname)" # for compatibility with Xmonad.Layout.OnHost
+set -gx LD_LIBRARY_PATH "$LD_LIBRARY_PATH:/usr/local/lib" # https://github.com/rust-lang/rust/issues/24677
if status is-interactive
fish_vi_key_bindings
@@ -231,6 +233,6 @@ if status is-login
# setting the keyrepeat delay and interval here as the default ones
# since some applications reset the those if we use xset r rate 200 30 instead
startx "$XDG_CONFIG_HOME/x11/xinitrc" -- -ardelay 200 -arinterval 30
- poweroff
+ #poweroff
end
end
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
index e47b052..dd5755f 100644
--- a/config/rofi/config.rasi
+++ b/config/rofi/config.rasi
@@ -5,8 +5,9 @@ configuration {
kb-row-up: "Control+k";
}
-@theme "gruvbox-light"
+//@theme "gruvbox-light"
window {
width: 900px;
}
+@theme "/usr/share/rofi/themes/gruvbox-dark.rasi"
diff --git a/config/x11/xinitrc b/config/x11/xinitrc
index 136fe0f..ecc8170 100755
--- a/config/x11/xinitrc
+++ b/config/x11/xinitrc
@@ -35,9 +35,15 @@ case "$(cat /etc/hostname)" in
xrandr --output DP-2 --mode 3840x1080 --primary --left-of HDMI-1 \
--output HDMI-1 --mode 1920x1080
fi
+ # fix screen tearing
+ nvidia-settings --assign CurrentMetaMode="nvidia-auto-select +0+0 { ForceFullCompositionPipeline = On }"
+ ;;
+ charles-cleveron)
+ if xrandr | grep 'HTMI1 connected'
+ then
+ xrandr --output eDP1 --primary --bellow HDMI1
+ fi
esac
-# fix screen tearing
-nvidia-settings --assign CurrentMetaMode="nvidia-auto-select +0+0 { ForceFullCompositionPipeline = On }"
# awesome
xmonad || { xmonad --recompile; xmonad; }
diff --git a/config/xmonad/xmonad.hs b/config/xmonad/xmonad.hs
index 57f8d74..7862565 100644
--- a/config/xmonad/xmonad.hs
+++ b/config/xmonad/xmonad.hs
@@ -19,6 +19,7 @@ import XMonad.Layout.Spacing (Border (..), spacingRaw)
import XMonad.Layout.Grid (Grid (..))
import XMonad.Layout.ThreeColumns (ThreeCol (ThreeColMid))
import XMonad.Layout.CenteredIfSingle (centeredIfSingle)
+import XMonad.Layout.OnHost (onHost)
-- Hooks
import XMonad.Hooks.InsertPosition (Focus (..), Position (..),
@@ -33,9 +34,9 @@ import XMonad.StackSet (swapUp)
import XMonad.Layout.LayoutScreens
import XMonad.Layout.TwoPane
-
myTerminal = "alacritty"
+
-- xmonad :: XConfig -> IO ()
-- https://hackage.haskell.org/package/xmonad-0.15/docs/XMonad-Core.html#t:XConfig
main = xmonad $ desktopConfig
@@ -53,14 +54,15 @@ main = xmonad $ desktopConfig
} `additionalKeysP` keys'
-layoutHook' = spacing' 4 $ centeredIfSingle (1/2) (95/100) (ThreeColMid 1 (3/100) (1/2))
- ||| reflectHoriz tiledVerticalBigMaster -- main monitor is slighly to the left
- ||| tiledVerticalBigMaster -- bigger master for code and smaller slave for compiling
- ||| noBorders Full -- disable borders for fullscreen layout
- ||| Mirror tiledHorizontalEven -- 50/50 horizontal split
- ||| Grid
- -- ||| layoutScreens 2 (TwoPane 0.5 0.5)
- where tiledVerticalBigMaster = Tall 1 (3 / 100) (3 / 5)
+layoutHook' = spacing' 4 $ onHost "charles-fractal" (threeColMid ||| commonLayout) commonLayout
+ where commonLayout = reflectHoriz tiledVerticalBigMaster -- main monitor is slighly to the left
+ ||| tiledVerticalBigMaster -- bigger master for code and smaller slave for compiling
+ ||| noBorders Full -- disable borders for fullscreen layout
+ ||| Mirror tiledHorizontalEven -- 50/50 horizontal split
+ ||| Grid
+ -- ||| layoutScreens 2 (TwoPane 0.5 0.5)
+ threeColMid = centeredIfSingle (1/2) (95/100) (ThreeColMid 1 (3/100) (1/2))
+ tiledVerticalBigMaster = Tall 1 (3 / 100) (3 / 5)
tiledHorizontalEven = Tall 1 (3 / 100) (1 / 2)
spacing' x = spacingRaw True (Border x x x x) False (Border x x x x) True
diff --git a/config/zsh/.zshenv b/config/zsh/.zshenv
index 94910be..84286f0 100644
--- a/config/zsh/.zshenv
+++ b/config/zsh/.zshenv
@@ -1,6 +1,7 @@
if [ "$(uname)" = 'Linux' ]
then
export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/.local/bin"
+ export PATH="$PATH:$HOME/.local/share/go/bin"
export MAIL='me@cacharle.xyz'
export SUDO='doas'
elif [ "$(uname)" = 'Darwin' ]