Compare commits

..

6 Commits

Author SHA1 Message Date
fbachus 8be9fe6370 add bat config, unify niri column width to 4 digit precision 2026-05-18 14:02:31 +02:00
fbachus 5fc2791c94 remove fish_variables and add that to gitignore 2026-05-11 19:51:23 +02:00
fbachus 42cf9e0713 add thunderbird to niri windowrules 2026-05-11 19:50:25 +02:00
fbachus d7cd63f349 update config, add dms, more niri windowrules 2026-05-08 12:54:55 +02:00
fbachus 73ff335427 update gitignore 2026-05-08 12:53:43 +02:00
fbachus cc368399ef feat/cleanup: some january updates
- do not commit lock files
- add script connection to waybar (script not yet in this repo)
- delay some loading in nvim
- update niri to use swaylock and swayidle
- add some niri windowrules for default window widths
- update paru to offer choice for what to update
2026-02-02 00:09:11 +01:00
26 changed files with 199 additions and 70 deletions
+3 -2
View File
@@ -1,6 +1,7 @@
[colors]
# make ALL background colors transparent -- looks bad with nvim lualine
transparent_background_colors = false
# transparent_background_colors = false
transparent_background_colors = true
[debug]
render_timer = false
@@ -52,7 +53,7 @@ program = "/usr/bin/fish"
[window]
decorations = "none"
dynamic_padding = false
# opacity = 0.20
# opacity = 0.50
blur = true
opacity = 1
+27
View File
@@ -0,0 +1,27 @@
# This is `bat`s configuration file. Each line either contains a comment or
# a command-line option that you want to pass to `bat` by default. You can
# run `bat --help` to get a list of all possible configuration options.
# Specify desired highlighting theme (e.g. "TwoDark"). Run `bat --list-themes`
# for a list of all available themes
#--theme="TwoDark"
#--theme="OneHalfDark"
--theme="Catppuccin Mocha"
# Enable this to use italic text on the terminal. This is not supported on all
# terminal emulators (like tmux, by default):
#--italic-text=always
# Uncomment the following line to disable automatic paging:
#--paging=never
# Uncomment the following line if you are using less version >= 551 and want to
# enable mouse scrolling support in `bat` when running inside tmux. This might
# disable text selection, unless you press shift.
#--pager="less --RAW-CONTROL-CHARS --quit-if-one-screen --mouse"
# Syntax mappings: map a certain filename pattern to a language.
# Example 1: use the C++ syntax for Arduino .ino files
# Example 2: Use ".gitignore"-style highlighting for ".ignore" files
#--map-syntax "*.ino:C++"
#--map-syntax ".ignore:Git Ignore"
-28
View File
@@ -1,28 +0,0 @@
# This file contains fish universal variable definitions.
# VERSION: 3.0
SETUVAR --export BAT_THEME:OneHalfDark
SETUVAR DISPLAY:\x3a0
SETUVAR --export EDITOR:nvim
SETUVAR --export ELECTRON_OZONE_PLATFORM_HINT:wayland
SETUVAR FLASK_ENV:development
SETUVAR --export --path GODOT_ADDON_PATH:\x7e/\x2elocal/share/godot/addons
SETUVAR GTK_THEME:adwaita
SETUVAR LANG:en_GB\x2eUTF\x2d8
SETUVAR LANGUAGE:en_GB\x2eUTF\x2d8
SETUVAR --export LAST_DIR:/home/felix/Code/side/advent_of_code_2024
SETUVAR --export MY_GITLAB_TOKEN:glpat\x2dJRJxEXxRxznVHLzHuuPc
SETUVAR --export RUSTC_WRAPPER:\x1d
SETUVAR --export SUDO_ASKPASS:/usr/bin/ksshaskpass
SETUVAR TERMINAL_FONT_SIZE:14
SETUVAR --export VISUAL_EDITOR:nvim
SETUVAR __fish_initialized:4300
SETUVAR _fish_abbr_audio_2D_switch:\x7e/Code/scripts/alsa\x2dfp\x2dswitch\x2esh
SETUVAR _fish_abbr_clera:clear
SETUVAR _fish_abbr_current_2D_project:vim\x20Code/side/first_rust_gui
SETUVAR _fish_abbr_secscreen:\x2e/Code/scripts/act_second_monitor\x2esh
SETUVAR _fish_abbr_uin:sudo\x20pacman\x20\x2dRuscn
SETUVAR _fisher_nickeb96_2F_puffer_2D_fish_files:\x7e/\x2econfig/fish/functions/_puffer_fish_expand_bang\x2efish\x1e\x7e/\x2econfig/fish/functions/_puffer_fish_expand_dots\x2efish\x1e\x7e/\x2econfig/fish/functions/_puffer_fish_expand_lastarg\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/puffer_fish_key_bindings\x2efish
SETUVAR _fisher_plugins:nickeb96/puffer\x2dfish
SETUVAR _fisher_upgraded_to_4_4:\x1d
SETUVAR fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell\x0aType\x20\x60help\x60\x20for\x20instructions\x20on\x20how\x20to\x20use\x20fish
SETUVAR fish_user_paths:/home/felix/\x2ecargo/bin
+2 -2
View File
@@ -20,8 +20,8 @@ monitor=desc:LG Electronics LG HDR 4K 0x0007E545, 2560x1440,auto-up,1 #4k on HDM
## Variant 3
monitor=eDP-1,1920x1080,auto-down,1,vrr, 1
monitor=desc:Iiyama North America PL2492H 1151164104155,highres@highrr,auto-left, auto, vrr, 0
monitor=desc:Iiyama North America PL2492H 11511811A1794,highres@highrr,0x0, auto, vrr, 1
monitor=desc:Iiyama North America PL2492H 11511811A1794,highres@highrr,auto-left, auto, vrr, 0
monitor=desc:Iiyama North America PL2492H 1151164104155,highres@highrr,0x0, auto, vrr, 1
# ---
monitor=desc:Philips Consumer Electronics Company PHL 272B8Q UK01945026658,highres@highrr,auto-up,auto, bitdepth, 10, vrr, 1
+4 -4
View File
@@ -6,11 +6,11 @@ include current-theme.conf
# BEGIN_COLOR_SCHEME
# background #1e1e1e
# ↓↓same as nvim Everforest↓↓
# background #2E383C
background #2D353B
background #2E383C
# background #2D353B
# ↑↑----------↑↑
# background_opacity 0.25
background_opacity 1
background_opacity 0.60
# background_opacity 1
background_blur 1
background_tint 0.0
transparent_background_colors #22262D #2D313B #303030 #000 #2D353B #343F44 #3D484D #2E383C
+1 -1
View File
@@ -24,7 +24,7 @@ binds {
Mod+Alt+B { spawn "~/.config/hypr/tofi_scripts/brightnessmenu.sh"; }
// Super+Alt+L { spawn "swaylock"; }
Mod+Shift+F11 { toggle-windowed-fullscreen; }
Mod+F12 { spawn "hyprlock"; }
Mod+F12 { spawn-sh "swaylock --grace 10 --ignore-empty-password --indicator --clock --timestr %H:%M --datestr '' --screenshot --effect-blur 5x3 --font hurmit-nf --inside-color 00000000 --line-color 00000000 --ring-color 00ff99 --key-hl-color 066dff"; }
Mod+E { spawn "dolphin"; }
// You can also use a shell. Do this if you need pipes, multiple commands, etc.
+18 -7
View File
@@ -1,11 +1,15 @@
spawn-at-startup "waybar"
spawn-sh-at-startup "swaybg -m fit -i ~/Pictures/backgrounds/hibiscus-flowers-5k-5120x2880-16240.jpg"
// spawn-sh-at-startup "swaybg -m fit -i ~/Pictures/backgrounds/hibiscus-flowers-5k-5120x2880-16240.jpg"
spawn-sh-at-startup "swaybg -m fit -i ~/Pictures/backgrounds/NASA/earth-1.jpg"
spawn-sh-at-startup "swaydidle -w -C ~/.config/swayidle.conf"
spawn-sh-at-startup "amixer set 'Mic Boost (+20dB)' on"
spawn-sh-at-startup "scx_lavd"
spawn-at-startup "dunst"
spawn-at-startup "kwalletd6"
spawn-at-startup "polkit-kde-authentication-agent-1"
spawn-at-startup "plasma-polkit-agent"
spawn-sh-at-startup "wl-paste --watch cliphist store"
spawn-at-startup "NetworkManager"
//spawn-at-startup "NetworkManager"
spawn-at-startup "nm-applet"
spawn-at-startup "nextcloud" "--background"
spawn-at-startup "syncthing"
@@ -85,6 +89,13 @@ input {
// Setting max-scroll-amount="0%" makes it work only on windows already fully on screen.
// focus-follows-mouse max-scroll-amount="0%"
}
blur {
//off
passes 2
offset 3.0
noise 0.02
saturation 1.5
}
// Settings that influence how windows are positioned and sized.
// Find more information on the wiki:
@@ -110,9 +121,9 @@ layout {
// For example, you can perfectly fit four windows sized "proportion 0.25" on an output.
// The default preset widths are 1/3, 1/2 and 2/3 of the output.
// proportion 0.25
proportion 0.33333
proportion 0.3333
proportion 0.5
proportion 0.66667
proportion 0.6667
// Fixed sets the width in logical pixels exactly.
// fixed 1920
@@ -127,7 +138,7 @@ layout {
}
// You can change the default width of the new windows.
default-column-width { proportion 0.667; }
default-column-width { proportion 0.5; }
// If you leave the brackets empty, the windows themselves will decide their initial width.
// default-column-width {}
@@ -241,7 +252,7 @@ layout {
// layer-shell panels and regular gaps.
struts {
left 1
right -2
right 1
top -2
bottom -2
}
@@ -263,7 +274,7 @@ prefer-no-csd
// You can change the path where screenshots are saved.
// A ~ at the front will be expanded to the home directory.
// The path is formatted with strftime(3) to give you the screenshot date and time.
screenshot-path "~/Pictures/Screenshots/Screenshot_%Y-%m-%d_%H-%M-%S.png"
screenshot-path "~/Pictures/Screenshots/%Y-%m-%d_%H%M%S_Screenshot.png"
// You can also set this to null to disable saving screenshots to disk.
// screenshot-path null
View File
View File
+11 -3
View File
@@ -54,10 +54,18 @@ output "Advanced Micro Peripherals Ltd ES07D03 EVE213400622" {
// }
}
}
// // half display - actually it stretches
// // output "Iiyama North America PLG2888UH 0x01010101" {
// // mode "1920x2160"
// // position x=-3840 y=0
// // scale 1.3333
// // }
output "Iiyama North America PLG2888UH 0x01010101" {
"off"
mode "3840x2160"
position x=-3840 y=0
scale 1.333333
scale 1.3333
variable-refresh-rate
}
output "Iiyama North America PLG2888UH 1141664500247" {
@@ -65,13 +73,13 @@ output "Iiyama North America PLG2888UH 1141664500247" {
position x=0 y=-360
}
// work monitor left
output "Iiyama North America PL2492H 1151164104155" {
output "Iiyama North America PL2492H 11511811A1794" {
mode "1920x1080"
scale 1
position x=-1920 y=0
}
// work monitor right
output "Iiyama North America PL2492H 11511811A1794" {
output "Iiyama North America PL2492H 1151164104155" {
mode "1920x1080"
scale 1
position x=0 y=0
+50 -2
View File
@@ -13,6 +13,7 @@ window-rule {
match title="^Volume Control$"
match title="^Network Connections$"
match title="Bitwarden"
match title="^Extension: (Bitwarden Password Manager) - Bitwarden — Zen Browser$"
match title="Extension: (Bitwarden Password Manager) - Bitwarden — Zen Browser"
match title="^Extension:"
match app-id="^org.kde.kwalletd6$"
@@ -29,25 +30,71 @@ window-rule {
window-rule {
match app-id=r#"kitty"#
match app-id="^Alacritty$"
// opacity 0.95
draw-border-with-background false
focus-ring {
on
}
background-effect {
blur true
}
}
// browsers in full width
window-rule {
match app-id="^zen$"
match app-id="^vivaldi-stable$"
exclude title="^Vivaldi$"
exclude title="^Vivaldi - login - Vivaldi$"
exclude title="^Bitwarden - Vivaldi$"
exclude title=r#"^Extension:"#
default-column-width { proportion 1.0; }
}
// terminal doesn't need to be big
window-rule {
match app-id="^Alacritty$"
default-column-width { proportion 0.3333; }
}
window-rule {
match app-id="^Thunderbird$"
default-column-width { proportion 0.9; }
open-on-workspace "2"
}
window-rule {
match app-id="^Slack$"
match app-id="^discord$"
match app-id="^org.telegram.desktop$"
match app-id="^ZapZap$"
match app-id="^discord$"
open-focused false
block-out-from "screencast"
open-on-workspace "Comms"
}
window-rule {
match app-id="^discord$"
default-column-width { proportion 0.667; }
}
window-rule {
match app-id="^Slack$"
match app-id="^org.telegram.desktop$"
match app-id="^ZapZap$"
default-column-display "tabbed"
default-column-width { proportion 0.5; }
}
window-rule {
match app-id="^spotify$"
match app-id="^Spotify$"
match app-id="^com.sayonara-player.Sayonara$"
default-column-width { proportion 0.9; }
open-on-workspace "Music"
}
@@ -67,7 +114,8 @@ window-rule {
window-rule {
match title="^Friends List$"
default-window-height { proportion 0.666; }
default-column-width { proportion 0.2; }
default-window-height { proportion 0.667; }
open-focused false
open-on-workspace "Gaming"
+1 -1
View File
@@ -4,5 +4,5 @@ vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead", "BufEnter" }, {
})
vim.api.nvim_create_autocmd({ "BufRead", "BufEnter" }, {
pattern = { "*.md", "*.txt" },
command = "set wrap",
command = "set wrap | setlocal foldmethod=expr | setlocal foldexpr=v:lua.vim.treesitter.foldexpr() | norm zR",
})
+1 -1
View File
@@ -7,9 +7,9 @@ require("lazy").setup({
checker = { enabled = true },
})
require("everforest").load()
require("plug_init.mini_init")
require("plug_init.ft_autocmds")
require("plug_init.godot_editor")
require("plug_init.mini_init")
--require("plug_init.lsp_init")
--require("plug_init.which_key_init")
+2 -1
View File
@@ -27,6 +27,7 @@ return {
enable = true,
},
ensure_installed = {
"bash",
"html",
"javascript",
"gdscript",
@@ -127,7 +128,7 @@ return {
vim.keymap.set("n", "<leader>K", vim.lsp.buf.hover, opts)
vim.keymap.set("n", "<leader>wa", vim.lsp.buf.add_workspace_folder, opts)
vim.keymap.set("n", "<leader>wr", vim.lsp.buf.remove_workspace_folder, opts)
vim.keymap.set("n", "<leader>F", function() vim.lsp.buf.format({ async = true }) end, opts)
-- vim.keymap.set("n", "<leader>F", function() vim.lsp.buf.format({ async = true }) end, opts)
end,
})
end,
+15 -1
View File
@@ -111,6 +111,12 @@ return {
{ "<leader>u", function() require("undotree").toggle() end, desc = "toggle undotree" },
},
},
-- {
-- "neovim/undotree",
-- keys = {
-- { "<leader>u", function() require("undotree").toggle() end, desc = "toggle undotree" }
-- },
-- },
{
"saecki/crates.nvim",
lazy = true,
@@ -127,7 +133,7 @@ return {
},
{
"lewis6991/gitsigns.nvim",
lazy = false,
event = "UIEnter",
opts = {
signs = {
add = { text = "" },
@@ -178,5 +184,13 @@ return {
{
"ibhagwan/fzf-lua",
opts = {},
event = "VeryLazy",
config = {
fzf_colors = true,
borderless,
skim,
telescope,
},
-- keys = { "<c-l>", mode = { "n" }, "<cmd>FzfLua<cr>", desc = "FzfLua" },
},
}
+21
View File
@@ -0,0 +1,21 @@
return {
"folke/snacks.nvim",
priority = 1000,
lazy = false,
---@type snacks.Config
opts = {
animate = { enabled = true },
bigfile = { enabled = false },
dashboard = { enabled = false },
explorer = { enabled = false },
indent = { enabled = false },
input = { enabled = false },
notifier = { enabled = true, timeout = 3000 },
picker = { enabled = false },
quickfile = { enabled = true },
scope = { enabled = false },
scroll = { enabled = true },
statuscolumn = { enabled = true },
words = { enabled = false },
},
}
+1 -1
View File
@@ -1,7 +1,6 @@
return {
{
"nvim-telescope/telescope.nvim",
tag = "0.1.2",
lazy = true,
keys = {
{ "<leader><leader>", mode = { "n" }, "<cmd>Telescope smart_open<cr>", desc = "smart_open" },
@@ -72,6 +71,7 @@ return {
-- faster and better matching than fzf
{
"nvim-telescope/telescope-fzy-native.nvim",
event = "VeryLazy",
config = function() require("telescope").load_extension("fzy_native") end,
},
{ "kkharji/sqlite.lua", lazy = true },
+4
View File
@@ -48,6 +48,10 @@ return {
{ "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Open Recent File", remap = true },
{ "<leader>fs", "<cmd>Telescope live_grep<cr>", desc = "Live Grep" },
{ "<leader>fw", "<cmd>Telescope grep_string<cr>", desc = "Find string under cursor" },
{ "<leader>F", mode = { "n" }, "<cmd>FzfLua<cr>", desc = "FzfLua" },
-- { "<c-l>", mode = { "n" }, "<cmd>FzfLua<cr>", desc = "FzfLua" },
{
"<leader><leader>",
function() require("telescope").extensions.smart_open.smart_open() end,
+4 -3
View File
@@ -8,10 +8,11 @@
BottomUp
Devel
DevelSuffixes = -git -cvs -svn -bzr -darcs -always -hg -fossil
Limit = 50
NewsOnUpgrade
# NewsOnUpgrade
PgpFetch
Provides
# Provides
SaveChanges
UpgradeMenu
UseAsk
Limit = 50
+3 -3
View File
@@ -1,12 +1,12 @@
[Appearance]
color_scheme_path=/usr/share/color-schemes/BreezeDark.colors
color_scheme_path=/usr/share/qt6ct/colors/darker.conf
custom_palette=true
standard_dialogs=xdgdesktopportal
style=Breeze
[Fonts]
fixed="monospace,9,-1,2,400,0,0,0,0,0,0,0,0,0,0,1"
general="Sans Serif,9,-1,5,400,0,0,0,0,0,0,0,0,0,0,1"
fixed="monospace,9,-1,2,400,0,0,0,0,0,0,0,0,0,0,1,,0,0"
general="Sans Serif,9,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,,0,0"
[Interface]
activate_item_on_single_click=1
+4
View File
@@ -0,0 +1,4 @@
[ColorScheme]
active_colors=#ffd3dae3, #ff263034, #ff222b2e, #ff222b2e, #ff1b2224, #ff1b2224, #ffd3dae3, #ffffffff, #ffd3dae3, #ff222b2e, #ff1b2224, #ff000000, #ff2eb398, #ffffffff, #ff0057ae, #ff452886, #ff222b2e, #ff000000, #ff000000, #ffd3dae3, #80d3dae3, #ff308cc6
disabled_colors=#78d3dae3, #ff263034, #ff222b2e, #ff222b2e, #ff1b2224, #ff1b2224, #78d3dae3, #ffffffff, #78d3dae3, #ff222b2e, #ff1b2224, #ff000000, #ff2eb398, #ffffffff, #ff0057ae, #ff452886, #ff222b2e, #ff000000, #ff000000, #ffd3dae3, #80d3dae3, #ff919191
inactive_colors=#ffd3dae3, #ff263034, #ff222b2e, #ff222b2e, #ff1b2224, #ff1b2224, #ffd3dae3, #ffffffff, #ffd3dae3, #ff222b2e, #ff1b2224, #ff000000, #ff2eb398, #ffffffff, #ff0057ae, #ff452886, #ff222b2e, #ff000000, #ff000000, #ffd3dae3, #80d3dae3, #ff308cc6
+6
View File
@@ -0,0 +1,6 @@
timeout 300 'swaylock --grace 10 --ignore-empty-password --indicator --clock --timestr %H:%M --datestr "" --screenshot --effect-blur 5x3 --font hurmit-nf --inside-color 00000000 --line-color 00000000 --ring-color 00ff99 --key-hl-color 066dff'
timeout 600 'niri msg action power-off-monitors'
after-resume 'niri msg action power-on-monitors'
before-sleep 'swaylock --grace 10 --ignore-empty-password --indicator --clock --timestr %H:%M --datestr "" --screenshot --effect-blur 5x3 --font hurmit-nf --inside-color 00000000 --line-color 00000000 --ring-color 00ff99 --key-hl-color 066dff'
+1 -1
View File
@@ -60,7 +60,7 @@ font-size = 17
# Maximum number of results to display.
# If 0, tofi will draw as many results as it can fit in the window.
num-results = 7
num-results = 5
# Spacing between results in pixels. Can be negative.
result-spacing = 6
+17 -7
View File
@@ -1,12 +1,12 @@
{
"layer": "bottom", // Waybar at top layer
// "position": "bottom", // Waybar position (top|bottom|left|right)
//"height": 30, // Waybar height (to be removed for auto height)
"layer": "bottom", // Waybar at top layer
// "position": "bottom", // Waybar position (top|bottom|left|right)
//"height": 30, // Waybar height (to be removed for auto height)
"height": 25,
"mode": "dock", // (dock|hide|invisible|overlay)
"exclusive": "false",
"exclusive": "true",
// "width": 1280, // Waybar width
"spacing": 4, // Gaps between modules (4px)
"spacing": 0, // Gaps between modules (4px)
// Choose the order of the modules
"modules-left": ["hyprland/workspaces", "niri/workspaces", "niri/window"],
"modules-center": ["clock"],
@@ -18,19 +18,28 @@
"format": "{name}",
"show-special": true,
"persistent-workspaces": {
"*": 5,
"*": 3,
}
},
"niri/workspaces": {
"disable-scroll": false,
"warp-on-scroll": true,
"format": "{name}",
"persistent-workspaces": {
"*": 3,
},
},
"niri/window": {
"format": "{title}"
},
"hyprland/window": {
"format": "{title}"
},
"hyprland/language": {
"niri/layout": {
"format-en": "UK",
"format-de": "DE",
"format-eu": "EU",
"format-ja": "JP",
"on-click": "hyprctl switchxkblayout at-translated-set-2-keyboard next"
},
"keyboard-state": {
@@ -141,6 +150,7 @@
},
"on-click": "pavucontrol-qt -t 3",
"on-click-middle": "amixer set Master Playback Switch toggle --quiet",
"on-click-right": "~/Code/scripts/pipewire-switch-outputs-templar",
},
"idle_inhibitor": {
"format": "{icon}",
+2 -2
View File
@@ -9,8 +9,8 @@ tab_size = 2
image_delay = 100
image_filter = "triangle"
[[confirm.quit]]
enabled = true
[confirm.quit]
enabled = false
origin = "center"
[confirm.trash]
+1
View File
@@ -11,3 +11,4 @@ history.txt
.env*
*typrstats
*-lock*
fish_variables