diff --git a/.config/btop/btop.conf b/.config/btop/btop.conf index 4b77e40..4ebbde5 100644 --- a/.config/btop/btop.conf +++ b/.config/btop/btop.conf @@ -50,7 +50,7 @@ graph_symbol_net = "default" graph_symbol_proc = "default" #* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace. -shown_boxes = "cpu mem proc" +shown_boxes = "proc" #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs. update_ms = 500 @@ -169,7 +169,7 @@ show_swap = True swap_disk = True #* If mem box should be split to also show disks info. -show_disks = True +show_disks = False #* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar. only_physical = True diff --git a/.config/btop/btop.log b/.config/btop/btop.log new file mode 100644 index 0000000..361c961 --- /dev/null +++ b/.config/btop/btop.log @@ -0,0 +1,41 @@ + +2024/11/26 (16:33:37) | ===> btop++ v.1.3.2 +2024/11/26 (16:33:37) | WARNING: Failed to get disk/partition stats for mount "/home/foton/nas" with statvfs error code: 19. Ignoring... + +2024/11/26 (18:42:02) | ===> btop++ v.1.3.2 +2024/11/26 (18:42:02) | WARNING: Failed to get disk/partition stats for mount "/home/foton/nas" with statvfs error code: 19. Ignoring... + +2025/01/06 (16:03:24) | ===> btop++ v.1.4.0 +2025/01/06 (16:03:24) | WARNING: Failed to get disk/partition stats for mount "/home/foton/home" with statvfs error code: 11. Ignoring... +2025/01/06 (16:03:24) | WARNING: Failed to get disk/partition stats for mount "/home/foton/media" with statvfs error code: 11. Ignoring... + +2025/01/16 (10:50:45) | ===> btop++ v.1.4.0 +2025/01/16 (10:50:45) | WARNING: Failed to get disk/partition stats for mount "/home/foton/media" with statvfs error code: 11. Ignoring... +2025/01/16 (10:50:45) | WARNING: Failed to get disk/partition stats for mount "/home/foton/home" with statvfs error code: 11. Ignoring... + +2025/04/03 (19:38:39) | ===> btop++ v.1.4.0 +2025/04/03 (19:38:39) | WARNING: Failed to get disk/partition stats for mount "/home/foton/media" with statvfs error code: 112. Ignoring... +2025/04/03 (19:38:39) | WARNING: Failed to get disk/partition stats for mount "/home/foton/home" with statvfs error code: 112. Ignoring... + +2025/04/24 (16:55:09) | ===> btop++ v.1.4.0 +2025/04/24 (16:55:09) | WARNING: Failed to join _runner thread on exit! + +2025/04/27 (12:09:36) | ===> btop++ v.1.4.0 +2025/04/27 (12:09:36) | WARNING: Failed to get disk/partition stats for mount "/home/foton/home" with statvfs error code: 2. Ignoring... +2025/04/27 (12:09:36) | WARNING: Failed to join _runner thread on exit! + +2025/04/28 (12:40:51) | ===> btop++ v.1.4.0 +2025/04/28 (12:40:51) | WARNING: Failed to join _runner thread on exit! + +2025/04/29 (13:06:26) | ===> btop++ v.1.4.0 +2025/04/29 (13:06:26) | WARNING: Failed to join _runner thread on exit! + +2025/04/30 (11:00:00) | ===> btop++ v.1.4.0 +2025/04/30 (11:00:00) | WARNING: Failed to get disk/partition stats for mount "/home/foton/media" with statvfs error code: 11. Ignoring... +2025/04/30 (11:00:00) | WARNING: Failed to get disk/partition stats for mount "/home/foton/home" with statvfs error code: 11. Ignoring... + +2025/05/12 (15:04:31) | ===> btop++ v.1.4.0 +2025/05/12 (15:04:31) | WARNING: Failed to join _runner thread on exit! + +2025/05/15 (11:43:30) | ===> btop++ v.1.4.0 +2025/05/15 (11:43:30) | WARNING: Failed to join _runner thread on exit! diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 4650951..7fd56a9 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -51,4 +51,4 @@ SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dbrblack SETUVAR fish_pager_color_selected_completion:\x1d SETUVAR fish_pager_color_selected_description:\x1d SETUVAR fish_pager_color_selected_prefix:\x1d -SETUVAR fish_user_paths:/opt/ghostty\x1e/opt/keymapp\x1e/opt/zen\x1e/home/foton/\x2ebin/stylua\x1e/home/foton/\x2ebin/lua\x2dlsp/bin\x1e/home/foton/\x2escripts\x1e/home/foton/\x2ebin\x1e/opt/Obsidian\x1e/home/foton/go/bin\x1e/home/foton/code/dart\x2dsdk/bin\x1e/home/greg/\x2elocal/bin\x1e/home/greg/\x2ebin\x1e/home/greg/\x2ecargo/bin\x1e/home/greg/go/bin\x1e/usr/local/go/bin +SETUVAR fish_user_paths:/home/foton/\x2elocal/bin\x1e/opt/ghostty\x1e/opt/keymapp\x1e/opt/zen\x1e/home/foton/\x2ebin/stylua\x1e/home/foton/\x2ebin/lua\x2dlsp/bin\x1e/home/foton/\x2escripts\x1e/home/foton/\x2ebin\x1e/opt/Obsidian\x1e/home/foton/go/bin\x1e/home/foton/code/dart\x2dsdk/bin\x1e/home/greg/\x2elocal/bin\x1e/home/greg/\x2ebin\x1e/home/greg/\x2ecargo/bin\x1e/home/greg/go/bin\x1e/usr/local/go/bin diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index b80c5d1..e4c32d5 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,4 +1,4 @@ -require('options') -require('config.lazy') -require('keymaps') -require('autocmd') +require("options") +require("config.lazy") +require("keymaps") +require("autocmd") diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 3f09a69..3a92e83 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,18 +1,22 @@ { - "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" }, + "blink.cmp": { "branch": "main", "commit": "4f38ce99a472932d5776337f08f7a8180f1f571a" }, "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, - "friendly-snippets": { "branch": "main", "commit": "fc8f183479a472df60aa86f00e295462f2308178" }, + "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "github-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" }, "js-i18n.nvim": { "branch": "main", "commit": "124f22f91d51e85641ba10e9a32f3b858394c2dd" }, "lackluster.nvim": { "branch": "main", "commit": "d2519d14b2b6e9eef05752d5d4486ed5c48d6178" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, + "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, - "nvim-lspconfig": { "branch": "master", "commit": "88d0824d85c0f74a012521d25678a5b01c76feb1" }, + "nvim-lspconfig": { "branch": "master", "commit": "4bc481b6f0c0cf3671fc894debd0e00347089a4e" }, "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" }, - "nvim-treesitter": { "branch": "master", "commit": "3b308861a8d7d7bfbe9be51d52e54dcfd9fe3d38" }, + "nvim-treesitter": { "branch": "master", "commit": "28d480e0624b259095e56f353ec911f9f2a0f404" }, + "nvim-web-devicons": { "branch": "master", "commit": "2c2b4eafce6cdd0cb165036faa17396eff18f847" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "smear-cursor.nvim": { "branch": "main", "commit": "8820b313e49a018c7d56fc309c51363c0e9ae653" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, diff --git a/.config/nvim/lua/autocmd.lua b/.config/nvim/lua/autocmd.lua index 20e77b4..b41acd2 100644 --- a/.config/nvim/lua/autocmd.lua +++ b/.config/nvim/lua/autocmd.lua @@ -5,41 +5,51 @@ -- Try it with `yap` in normal mode -- See `:help vim.highlight.on_yank()` vim.api.nvim_create_autocmd("TextYankPost", { - desc = "Highlight when yanking (copying) text", - group = vim.api.nvim_create_augroup("highlight-yank", { clear = true }), - callback = function() vim.hl.on_yank() end, + desc = "Highlight when yanking (copying) text", + group = vim.api.nvim_create_augroup("highlight-yank", { clear = true }), + callback = function() + vim.hl.on_yank() + end, }) - vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, { - desc = "diagnostics on hold", - group = vim.api.nvim_create_augroup("diagnostics", { clear = true }), - callback = function() vim.diagnostic.open_float(nil, { focus = false }) end, + desc = "diagnostics on hold", + group = vim.api.nvim_create_augroup("diagnostics", { clear = true }), + callback = function() + vim.diagnostic.open_float(nil, { focus = false }) + end, }) -- TODO: check if it interferes with C-s shortcut vim.api.nvim_create_autocmd({ "BufWritePre" }, { - desc = "create parent folders automatically", - group = vim.api.nvim_create_augroup("create-parent-automatically", { clear = true }), - callback = function() - vim.cmd ":silent !mkdir -p %:p:h" - end, + desc = "create parent folders automatically", + group = vim.api.nvim_create_augroup("create-parent-automatically", { clear = true }), + callback = function() + vim.cmd(":silent !mkdir -p %:p:h") + end, }) - vim.api.nvim_create_autocmd("BufReadPost", { - pattern = { "*" }, - desc = "When editing a file, always jump to the last known cursor position", - group = vim.api.nvim_create_augroup("last-location", { clear = true }), - callback = function() - local line = vim.fn.line "'\"" - if - line >= 1 - and line <= vim.fn.line "$" - and vim.bo.filetype ~= "commit" - and vim.fn.index({ "xxd", "gitrebase" }, vim.bo.filetype) == -1 - then - vim.cmd 'normal! g`"' - end - end, + pattern = { "*" }, + desc = "When editing a file, always jump to the last known cursor position", + group = vim.api.nvim_create_augroup("last-location", { clear = true }), + callback = function() + local line = vim.fn.line("'\"") + if + line >= 1 + and line <= vim.fn.line("$") + and vim.bo.filetype ~= "commit" + and vim.fn.index({ "xxd", "gitrebase" }, vim.bo.filetype) == -1 + then + vim.cmd('normal! g`"') + end + end, +}) + +vim.api.nvim_create_autocmd("VimEnter", { + desc = "Clear jump list when vim starts", + group = vim.api.nvim_create_augroup("clear-jumps", { clear = true }), + callback = function() + vim.cmd.clearjumps() + end, }) diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua index ddac892..3a1fc1a 100644 --- a/.config/nvim/lua/keymaps.lua +++ b/.config/nvim/lua/keymaps.lua @@ -7,8 +7,8 @@ vim.keymap.set("n", "q", ":bd", { desc = "close buffer" }) vim.keymap.set("n", "Q", ":%bd", { desc = "close all buffers" }) vim.keymap.set("n", "d", '"_d', { desc = "delete without cut" }) vim.keymap.set("v", "d", '"_d', { desc = "delete without cut" }) -vim.keymap.set({"v", "n"}, "vv", "", { desc = "vv for visual block" }) - +vim.keymap.set({ "v", "n" }, "vv", "", { desc = "vv for visual block" }) +vim.keymap.set("i", "jj", "", { silent = true, desc = "back to normal with jj" }) -- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier -- for people to discover. Otherwise, you normally need to pres , which -- is not what someone will guess without a bit more experience. @@ -17,14 +17,12 @@ vim.keymap.set({"v", "n"}, "vv", "", { desc = "vv for visual block" }) -- or just use to exit terminal mode vim.keymap.set("t", "", "", { desc = "Exit terminal mode" }) - -- TIP: Disable arrow keys in normal mode vim.keymap.set("n", "", 'echo "Use h to move!!"') vim.keymap.set("n", "", 'echo "Use l to move!!"') vim.keymap.set("n", "", 'echo "Use k to move!!"') vim.keymap.set("n", "", 'echo "Use j to move!!"') - -- Keybindings to make split navigation easier. -- Use CTRL+ to switch between windows -- @@ -33,3 +31,20 @@ vim.keymap.set("n", "", "", { desc = "Move focus to the left wind vim.keymap.set("n", "", "", { desc = "Move focus to the right window" }) vim.keymap.set("n", "", "", { desc = "Move focus to the lower window" }) vim.keymap.set("n", "", "", { desc = "Move focus to the upper window" }) + +vim.keymap.set("v", "", function() + -- get contents of visual selection + -- handle unpack deprecation + table.unpack = table.unpack or unpack + function get_visual() + local _, ls, cs = table.unpack(vim.fn.getpos("v")) + local _, le, ce = table.unpack(vim.fn.getpos(".")) + return vim.api.nvim_buf_get_text(0, ls - 1, cs - 1, le - 1, ce, {}) + end + + local pattern = table.concat(get_visual()) + -- escape regex and line endings + pattern = vim.fn.substitute(vim.fn.escape(pattern, "^$.*\\/~[]"), "\n", "\\n", "g") + -- send parsed substitution command to command line + vim.api.nvim_input(":%s/" .. pattern .. "//") +end) diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua index 76440be..1f9baeb 100644 --- a/.config/nvim/lua/options.lua +++ b/.config/nvim/lua/options.lua @@ -77,3 +77,8 @@ vim.opt.foldtext = "" -- vim.opt.foldnestmax = 3 vim.opt.foldlevel = 99 vim.opt.foldlevelstart = 99 + +vim.opt.splitright = true +vim.opt.splitbelow = true + +vim.opt.cmdheight = 0 diff --git a/.config/nvim/lua/plugins/blink.lua b/.config/nvim/lua/plugins/blink.lua index 969e924..3f2be65 100644 --- a/.config/nvim/lua/plugins/blink.lua +++ b/.config/nvim/lua/plugins/blink.lua @@ -3,6 +3,18 @@ return { dependencies = { "rafamadriz/friendly-snippets" }, version = "1.*", opts = { + fuzzy = { + implementation = "rust", + use_frecency = true, + use_proximity = true, + use_unsafe_no_lock = false, + sorts = { + -- (optionally) always prioritize exact matches + "exact", + "score", + "sort_text", + }, + }, keymap = { preset = "super-tab", [""] = { "show", "show_documentation", "hide_documentation" }, @@ -18,11 +30,13 @@ return { auto_show_delay_ms = 500, window = { border = "rounded", + scrollbar = false, }, }, menu = { border = "rounded", draw = { gap = 2 }, + scrollbar = false, }, }, sources = { diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua new file mode 100644 index 0000000..c08bb95 --- /dev/null +++ b/.config/nvim/lua/plugins/lualine.lua @@ -0,0 +1,45 @@ +return { + "nvim-lualine/lualine.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + opts = { + options = { + icons_enabled = true, + theme = "auto", + component_separators = { left = "", right = "" }, + section_separators = { left = "", right = "" }, + disabled_filetypes = { + statusline = {}, + winbar = {}, + }, + ignore_focus = {}, + always_divide_middle = true, + always_show_tabline = true, + globalstatus = false, + refresh = { + statusline = 100, + tabline = 100, + winbar = 100, + }, + }, + sections = { + lualine_a = { "mode" }, + lualine_b = { "branch", "diff", "diagnostics" }, + lualine_c = { "filename" }, + lualine_x = { "encoding", "fileformat", "filetype" }, + lualine_y = { "progress" }, + lualine_z = { "location" }, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { "filename" }, + lualine_x = { "location" }, + lualine_y = {}, + lualine_z = {}, + }, + tabline = {}, + winbar = {}, + inactive_winbar = {}, + extensions = {}, + }, +} diff --git a/.config/nvim/lua/plugins/luckluster.lua b/.config/nvim/lua/plugins/luckluster.lua deleted file mode 100644 index 410566f..0000000 --- a/.config/nvim/lua/plugins/luckluster.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - "slugbyte/lackluster.nvim", - lazy = false, - priority = 1000, - init = function() - -- vim.cmd.colorscheme("lackluster") - -- vim.cmd.colorscheme("lackluster-hack") -- my favorite - -- vim.cmd.colorscheme("lackluster-mint") - end, -} diff --git a/.config/nvim/lua/plugins/snacks.lua b/.config/nvim/lua/plugins/snacks.lua index 7311f18..2eea760 100644 --- a/.config/nvim/lua/plugins/snacks.lua +++ b/.config/nvim/lua/plugins/snacks.lua @@ -12,7 +12,21 @@ return { enabled = true, timeout = 3000, }, - picker = { enabled = true }, + picker = { + matcher = { + fuzzy = true, -- use fuzzy matching + smartcase = true, -- use smartcase + ignorecase = true, -- use ignorecase + sort_empty = false, -- sort results when the search string is empty + filename_bonus = true, -- give bonus for matching file names (last part of the path) + file_pos = true, -- support patterns like `file:line:col` and `file:line` + -- the bonusses below, possibly require string concatenation and path normalization, + -- so this can have a performance impact for large lists and increase memory usage + cwd_bonus = false, -- give bonus for matching files in the cwd + frecency = true, -- frecency bonus + history_bonus = false, -- give more weight to chronological order + }, + }, quickfile = { enabled = true }, scroll = { enabled = false }, statuscolumn = { enabled = true }, @@ -49,7 +63,9 @@ return { { "sf", function() - Snacks.picker.files() + Snacks.picker.files({ + layout = "vscode", + }) end, desc = "Find Files", }, @@ -74,14 +90,6 @@ return { end, desc = "Grep Open Buffers", }, - { - "sw", - function() - Snacks.picker.grep_word() - end, - desc = "Visual selection or word", - mode = { "n", "x" }, - }, { "sp", function() @@ -99,7 +107,14 @@ return { { "sd", function() - Snacks.picker.diagnostics() + Snacks.picker.diagnostics({ + layout = "bottom", + matcher = { + fuzzy = true, + ignorecase = false, + smartcase = true, + }, + }) end, desc = "Diagnostics", }, @@ -213,13 +228,31 @@ return { { "ss", function() + -- require("aerial").snacks_picker({ + -- filter_kind = { + -- "Class", + -- "Constructor", + -- "Enum", + -- "Function", + -- "Interface", + -- "Module", + -- "Method", + -- "Struct", + -- "Variable", + -- }, + -- layout = { + -- preset = "dropdown", + -- preview = true, + -- }, + -- }) Snacks.picker.lsp_symbols({ + layout = "left", filter = { default = { "Class", "Constructor", "Enum", - "Field", + -- "Field", "Function", "Interface", "Method", diff --git a/.config/nvim/lua/plugins/tokyonight.lua b/.config/nvim/lua/plugins/tokyonight.lua index f239fe6..91dfb50 100644 --- a/.config/nvim/lua/plugins/tokyonight.lua +++ b/.config/nvim/lua/plugins/tokyonight.lua @@ -5,9 +5,9 @@ return { -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme("tokyonight-storm") + vim.cmd.colorscheme("tokyonight-night") -- You can configure highlights by doing something like: - vim.cmd.hi("Comment gui=none") + -- vim.cmd.hi("Comment gui=none") end, } diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi index a6564ef..07b1fac 100644 --- a/.config/rofi/config.rasi +++ b/.config/rofi/config.rasi @@ -5,6 +5,7 @@ configuration { window-format: "{t}"; display-window: ""; display-combi: ""; + monitor: -5; timeout { action: "kb-cancel"; diff --git a/.config/rofi/squared-nord.rasi b/.config/rofi/squared-nord.rasi index a195a6b..9279305 100644 --- a/.config/rofi/squared-nord.rasi +++ b/.config/rofi/squared-nord.rasi @@ -5,13 +5,13 @@ *******************************************************************************/ * { - font: "FiraCode Nerd Font Medium 12"; + font: "Iosevka Nerd Font 10"; bg0: #2E3440; bg1: #3B4252; fg0: #D8DEE9; - accent-color: #88C0D0; + accent-color: #5e81ac; urgent-color: #EBCB8B; background-color: transparent; @@ -84,7 +84,7 @@ element alternate active { } element selected { - text-color: @bg0; + text-color: @fg0; } element selected normal, element selected active { diff --git a/.config/sway/config b/.config/sway/config index fc1e142..4f130e0 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -3,10 +3,10 @@ ## Window decoration # class border backgr. text indicator child_border -client.focused #88c0d0 #434c5e #eceff4 #8fbcbb #88c0d0 -client.focused_inactive #88c0d0 #2e3440 #d8dee9 #4c566a #4c566a -client.unfocused #88c0d0 #2e3440 #d8dee9 #4c566a #4c566a -client.urgent #ebcb8b #ebcb8b #2e3440 #8fbcbb #ebcb8b +client.focused #5e81ac #5e81ac #eceff4 #5e81ac #5e81ac +client.focused_inactive #4c566a #2e3440 #d8dee9 #4c566a #2e3440 +client.unfocused #4c566a #2e3440 #d8dee9 #4c566a #2e3440 +client.urgent #bf616a #bf616a #2e3440 #5e81ac #bf616a workspace_layout tabbed # default_border normal @@ -14,9 +14,10 @@ workspace_layout tabbed font "Iosevka NF" 10 # titlebar_padding 1 # titlebar_border_thickness 1 -# smart_borders off -gaps inner 5 -gaps outer 5 +smart_borders on +# gaps inner 0 +# gaps outer 0 +gaps top 10 for_window [app_id="kitty_shell"] floating enable, move center @@ -33,7 +34,8 @@ set $browser firefox set $menu fish -c 'rofi -show run -terminal $term' set $windows fish -c 'rofi -show window' set $laptop eDP-1 -set $external DP-1 +set $typecmonitor DP-1 +set $hdmi HDMI-A-1 ### Output @@ -41,36 +43,39 @@ set $external DP-1 output * bg ~/.config/sway/bg.jpg fill -output $external { - mode 3840x2160@60.0Hz - pos 1381 2007 +output $hdmi { + mode 3840x2160@59.940Hz + pos 0 0 + transform 270 + scale 2.0 + adaptive_sync on +} + + +output $typecmonitor { + mode 3840x2160@59.940Hz + pos 0 0 transform 270 scale 2.0 - scale_filter nearest adaptive_sync on - dpms on } output $laptop { mode 2560x1600@240.0Hz - pos 2461 3127 + pos 1080 1120 transform normal scale 2.0 - scale_filter nearest - adaptive_sync off - dpms on + adaptive_sync on } bindswitch --reload --locked lid:on output $laptop disable bindswitch --reload --locked lid:off output $laptop enable -workspace 1 output $external +workspace 1 output $typecmonitor focus_on_window_activation focus - ### Input configuration -# input "type:touchpad" { dwt enabled @@ -88,7 +93,7 @@ input "type:keyboard" { repeat_delay 400 repeat_rate 50 xkb_layout us,ru,ua - xkb_options "grp:ctrl_space_toggle" + xkb_options "grp:caps_toggle" } @@ -100,15 +105,14 @@ input "type:keyboard" { # # Basics: # - bindsym --to-code $mod+g exec $term fish -c y + bindsym --to-code $mod+g exec $term -e fish -i -C y bindsym --to-code $mod+Return exec $term bindsym --to-code $mod+Shift+q kill - bindsym --to-code $mod+Space exec $menu + bindsym --to-code Menu exec $menu bindsym --to-code $mod+Tab exec $windows bindsym --to-code $mod+Backspace exec ~/.scripts/kitty_shell.fish ~/.scripts/power.fish bindsym --to-code $mod+Slash exec ~/.scripts/kitty_shell.fish ~/.scripts/switcher.fish - bindsym --to-code $mod+grave exec ~/.scripts/shot.fish - bindsym --to-code $mod+backslash exec KS_WIDTH=30c KS_HEIGHT=1c ~/.scripts/kitty_shell.fish ~/.scripts/search.fish + bindsym --to-code $mod+Apostrophe exec ~/.scripts/shot.fish # Drag floating windows by holding down $mod and left mouse button. # Resize them with right mouse button + $mod. diff --git a/.config/waybar/nord.css b/.config/waybar/nord.css index 29a66bb..0241595 100644 --- a/.config/waybar/nord.css +++ b/.config/waybar/nord.css @@ -22,4 +22,4 @@ @define-color nord12 #d08770; @define-color nord13 #ebcb8b; @define-color nord14 #a3be8c; -@define-color nord15 #b48ead; \ No newline at end of file +@define-color nord15 #b48ead; diff --git a/.config/waybar/style.css b/.config/waybar/style.css index e67486a..1deb31f 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -31,8 +31,8 @@ window { } #workspaces button.focused { - color: @nord0; - background-color: @nord8; + color: @nord6; + background-color: @nord10; } #window { diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua index 2f5de57..10203c1 100644 --- a/.config/wezterm/wezterm.lua +++ b/.config/wezterm/wezterm.lua @@ -7,9 +7,10 @@ local config = wezterm.config_builder() -- This is where you actually apply your config choices -- For example, changing the color scheme: -config.color_scheme = "Tokyo Night Storm" +config.color_scheme = "tokyonight_night" -config.font = wezterm.font("Iosevka Nerd Font") +config.font = wezterm.font({ family = "Iosevka Nerd Font", weight = "Regular", style = "Italic" }) +config.font_size = 11 config.use_fancy_tab_bar = false config.hide_tab_bar_if_only_one_tab = true