dots

commit f0159e04aaf01ed57782532898913ad20dfe87a9
parent 2d0612f108772bb7a224ffbd54443d3df9e52c7c
Author: Chris Kiriakou <chris@kiriakou.net>
Date:   Thu, 13 Aug 2026 14:12:49 +0200

Resolve merge conflicts

Diffstat:
M
fontconfig/dot-config/fontconfig/fonts.conf
 | 
4
++--
M
nvim/dot-config/nvim/init.lua
 | 
13
+++++--------
M
sway/dot-config/sway/config
 | 
4
++--
M
zsh/dot-zshrc
 | 
11
-----------

4 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/fontconfig/dot-config/fontconfig/fonts.conf b/fontconfig/dot-config/fontconfig/fonts.conf
@@ -3,11 +3,11 @@
 <fontconfig>
   <alias>
     <family>serif</family>
-    <prefer><family>FreeSerif</family></prefer>
+    <prefer><family>Free Sans</family></prefer>
   </alias>
   <alias>
     <family>sans-serif</family>
-    <prefer><family>FreeSans</family></prefer>
+    <prefer><family>Free Seirf</family></prefer>
   </alias>
   <alias>
     <family>monospace</family>
diff --git a/nvim/dot-config/nvim/init.lua b/nvim/dot-config/nvim/init.lua
@@ -24,6 +24,9 @@ vim.opt.hlsearch = true
 vim.opt.incsearch = true
 vim.opt.signcolumn = 'no'
 vim.opt.background = 'light'
+vim.opt.modeline = true
+vim.opt.modelines = 2
+vim.opt.modelineexpr = false
 
 vim.opt.smarttab = true
 vim.opt.shiftwidth = 4
@@ -168,7 +171,7 @@ vim.cmd("let g:llama_config = { 'show_info': 0 }")
 -- language formatting --------------------------------------------------------
 
 vim.api.nvim_create_autocmd("FileType", {
-  pattern = "java,c,sh,python,perl",
+  pattern = "c,sh,python,tex,json",
   command = "setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab",
 })
 
@@ -178,7 +181,7 @@ vim.api.nvim_create_autocmd("FileType", {
 })
 
 vim.api.nvim_create_autocmd("FileType", {
-  pattern = "html,css,javascript,lua,markdown,yaml,toml",
+  pattern = "html,css,lua,markdown,yaml,toml",
   command = "setlocal tabstop=2 shiftwidth=2 softtabstop=2 expandtab",
 })
 
@@ -188,9 +191,3 @@ vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, {
     vim.bo.filetype = "tex"
   end,
 })
-
--- styling ---------------------------------------------------------------------
-
-vim.cmd.colorscheme("quiet")
-
-vim.api.nvim_set_hl(0, "Normal", { bg = "#ffffff", })
diff --git a/sway/dot-config/sway/config b/sway/dot-config/sway/config
@@ -10,12 +10,12 @@ set $opm_off 'swaymsg "output * power off"'
 set $opm_on 'swaymsg "output * power on"'
 # Options ######################################################################
 floating_modifier $mod
-font pango:Sans-serif 10
 # Autostart apps ###############################################################
 exec swayidle -w \
     timeout 1200 'swaylock -f' \
     timeout 1260 $opm_off resume $opm_on \
-    before-sleep 'swaylock -f' >/dev/null 2>&1
+    before-sleep 'swaylock -f' \
+    timeout 1260 $opm_off resume $opm_on /dev/null 2>&1
 exec dconf write /org/gnome/desktop/interface/color-scheme '"prefer-light"'
 exec gsettings set org.gnome.desktop.interface gtk-theme '' >/dev/null 2>&1
 exec gsettings set org.gnome.desktop.interface icon-theme '' >/dev/null 2>&1
diff --git a/zsh/dot-zshrc b/zsh/dot-zshrc
@@ -53,16 +53,5 @@ bindkey -M menuselect 'j' vi-down-line-or-history
 bindkey -M vicmd '/' history-incremental-search-backward
 
 # Aliases
-alias neovim="${EDITOR}"
 alias nano="${EDITOR}"
 alias open="xdg-open"
-
-open-file-manager() {
-    pcmanfm . >/dev/null 2>&1 &!
-}
-
-zle -N open-file-manager
-
-bindkey '^O' open-file-manager
-
-. "$HOME/.local/share/../bin/env"