Compare commits

...

11 Commits

8 changed files with 89 additions and 67 deletions

View File

@ -51,22 +51,8 @@ size = 7.5
size = 5.5
{{- end }}
[font.bold]
style = "Bold"
[font.bold_italic]
style = "Bold Italic"
[font.italic]
style = "Italic"
[font.normal]
family = "Source Code Pro"
style = "Regular"
[font.offset]
x = 0
y = 0
offset = { x = 0, y = 0 }
normal = { family = "Source Code Pro", style = "Regular" }
[window]
dynamic_padding = true

View File

@ -194,8 +194,8 @@ bindsym $m+bracketright move right; resize set width 80 ppt
## Alacritty
bindsym $m+comma exec --no-startup-id launch-console; workspace $ws2
bindsym $m+$s+period exec --no-startup-id launch-console emacs; workspace $ws3
bindsym $m+$s+comma exec --no-startup-id launch-console tmp
bindsym $m+$s+period exec --no-startup-id launch-console emacs; workspace $ws3
@ -231,10 +231,11 @@ bindsym $m+$a+slash exec --no-startup-id nowplaying
# Browser
bindsym $m+m exec --no-startup-id open-brave; workspace $ws1
bindsym $m+$s+m exec --no-startup-id open-librewolf-private; workspace $ws1
bindsym $m+n exec --no-startup-id open-firefox-dev; workspace $ws1
bindsym $m+n exec --no-startup-id open-firefox-dev
# Calendar/Tasks/Mail
bindsym $m+period exec --no-startup-id open-emacs; workspace $ws3
bindsym $m+slash exec --no-startup-id open-emacs-org-capture; workspace $ws3
# File manager
bindsym $m+grave exec --no-startup-id pcmanfm
@ -336,11 +337,6 @@ for_window [class="org.remmina.Remmina"] floating enable, resize set 1000 750, m
## assign application to specific workspace
### Tips: Run `xprop` (command line tool) to retrieve class, instance and title.
# Browsers
assign [class="firefox"] $ws1
assign [class="librewolf"] $ws1
assign [class="Tor Browser"] $ws0
# Terminal
assign [title="Alacritty@tmux:default"] $ws2
assign [title="Alacritty@tmux:emacs"] $ws3
@ -380,6 +376,7 @@ assign [class="retroarch"] $ws_game
assign [class="steam_app_.*" instance="steam_app_.*"] $ws_game
for_window [class="steam_app_.*" instance="steam_app_.*"] move to workspace $ws_game
assign [class="Hexcells Infinite.x86_64" instance="Hexcells Infinite.x86_64" title="Hexcells Infinite"] $ws_game
assign [class="steam_app_1172470" instance="steam_app_1172470" title="Apex Legends"] $ws_game
## KEY_INSERT_GAME_ASSIGN # Don't change left string. See ~/.config/fish/function/i3-assign-games.fish
#######################################################

View File

@ -3,7 +3,7 @@ try
if exists('+termguicolors')
set termguicolors
endif
colorscheme yah
colorscheme catppuccin
catch
colorscheme desert
endtry
@ -27,6 +27,7 @@ vim.opt.gdefault = true vim.opt.autoread = true vim.opt.history = 1000
vim.opt.encoding = "utf-8"
vim.opt.number = true
vim.opt.relativenumber = true
vim.opt.scrolloff = 12
vim.opt.laststatus = 2
vim.opt.showcmd = true
vim.opt.showmatch = true
@ -57,3 +58,11 @@ vim.cmd([[ autocmd InsertLeave * call system("fcitx5-remote -c") ]])
vim.cmd("set clipboard+=unnamedplus")
-- folding
vim.opt.fillchars = { fold = " " }
vim.opt.foldmethod = "indent"
vim.opt.foldenable = false
vim.opt.foldlevel = 99
vim.g.markdown_folding = 1 -- enable markdown folding

View File

@ -0,0 +1,69 @@
return {
"catppuccin/nvim",
name = "catppuccin",
priority = 1000,
config = function()
require("catppuccin").setup({
color_overrides = {
mocha = {
rosewater = "#B294BB",
flamingo = "#B294BB",
pink = "#B294BB",
mauve = "#B294BB",
lavender = "#B294BB",
red = "#CC6666",
maroon = "#CC6666",
peach = "#de935f",
yellow = "#F0C674",
green = "#B5BD68",
teal = "#8ABEB7",
sky = "#8ABEB7",
sapphire = "#8ABEB7",
blue = "#81A2BE",
text = "#CCCCCC",
subtext1 = "#AAAAAA",
subtext0 = "#939393",
overlay2 = "#888888",
overlay1 = "#888888",
overlay0 = "#707880",
surface2 = "#525252",
surface1 = "#333333",
surface0 = "#242424",
base = "#121212",
mantle = "#1F1F1F",
crust = "#0E0E0E",
},
},
highlight_overrides = {
mocha = function(mocha)
return {
Whitespace = { fg = mocha.surface2 },
Comment = { fg = mocha.overlay2 },
CursorLineNr = { fg = mocha.pink },
Number = { fg = mocha.red },
-- ["@variable"] = { fg = mocha.lavender },
Statement = { fg = mocha.blue },
Keyword = { fg = mocha.blue },
Repeat = { fg = mocha.blue },
Conditional = { fg = mocha.blue },
Special = { fg = mocha.teal },
["@keyword.return"] = { fg = mocha.red },
["@keyword.operator"] = { fg = mocha.blue },
["@keyword.function"] = { fg = mocha.blue },
["@punctuation.bracket"] = { fg = mocha.sapphire },
Function = { fg = mocha.yellow },
["@function.builtin"] = { fg = mocha.red },
StatusLine = { fg = mocha.text },
StatusLineNC = { fg = mocha.overlay0 },
["@markup.raw"] = { fg = mocha.sapphire },
["@markup.raw.delimiter"] = { fg = mocha.sapphire, style = { "bold" }},
["@markup.raw.block"] = { fg = mocha.subtext1 },
["@markup.quote"] = { fg = mocha.green },
}
end,
},
})
vim.cmd[[colorscheme catppuccin]]
end
}

View File

@ -4,43 +4,7 @@ return {
config = function()
require'nvim-treesitter.configs'.setup {
-- A list of parser names, or "all" (the five listed parsers should always be installed)
ensure_installed = {
"bash",
"c",
"c_sharp",
"cmake",
"commonlisp",
"cpp",
"css",
"diff",
"dockerfile",
"fish",
"git_config",
"gitcommit",
"gitignore",
"go",
"html",
"javascript",
"jq",
"json",
"latex",
"lua",
"org",
"php",
"python",
"query",
"ruby",
"rust",
"scss",
"todotxt",
"toml",
"typescript",
"vim",
"vimdoc",
"vue",
"xml",
"yaml",
},
ensure_installed = "all",
-- Install parsers synchronously (only applied to `ensure_installed`)
sync_install = false,

View File

@ -1,7 +1,4 @@
return {
"inkch/vim-yah",
lazy = false,
config = function()
vim.cmd[[colorscheme yah]]
end,
}

View File

@ -1,10 +1,10 @@
# 256 color
{{- if eq .hosttype "desktop" "laptop" }}
set -g default-terminal "screen-256color"
set -g default-terminal "alacritty"
{{- else }}
set -g default-terminal "tmux-256color"
{{- end }}
set -ga terminal-overrides ',xterm-256color:RGB'
#set -ga terminal-overrides ',xterm-256color:RGB'
# increase limit of "scrollback buffer"
set -g history-limit 1000000

View File

@ -2,4 +2,4 @@
--prefer-free-formats
-o /mnt/hdd/vids/yt/%(uploader)s/%(title).250s.%(ext)s
--downloader 'aria2c'
--downloader-args 'aria2c:--console-log-level=warn -x 16 -s 32 -k 1M -U "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.45 Safari/537.36 Edg/96.0.1054.34"'
--downloader-args 'aria2c:--console-log-level=warn -j 16 -x 16 -s 16 -k 1M -U "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36"'