diff --git a/.config/keyb/bindings/librewolf.yml b/.config/keyb/bindings/librewolf.yml index ee8d009d..916d8e93 100644 --- a/.config/keyb/bindings/librewolf.yml +++ b/.config/keyb/bindings/librewolf.yml @@ -77,7 +77,7 @@ - name: Cycle Tabs key: Ctrl + Tab -- name: Windows & Tabs +- name: Other keybinds: - name: Downloads key: Ctrl + Shift + Y @@ -98,4 +98,6 @@ - name: Page Info key: Ctrl + I - name: History - key: Ctrl + H \ No newline at end of file + key: Ctrl + H + - name: Bitwarden Menu + key: Ctrl + Alt + P \ No newline at end of file diff --git a/.config/keyb/bindings/nvim.yml b/.config/keyb/bindings/nvim.yml index 78ed0684..ff304d05 100644 --- a/.config/keyb/bindings/nvim.yml +++ b/.config/keyb/bindings/nvim.yml @@ -230,8 +230,6 @@ key: Space + s + S - name: (Nor) Spell Suggestions key: z= - - name: (Nor) Zen Mode - key: Space + z - name: Diagnostics keybinds: diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 815ea1c5..0f298de7 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { "LazyVim": { "branch": "main", "commit": "a72a84972d85e5bbc6b9d60a0983b37efef21b8a" }, "LuaSnip": { "branch": "master", "commit": "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b" }, - "SchemaStore.nvim": { "branch": "main", "commit": "9d7b4c8d1c2ad029234d531871a55c075a116b7d" }, + "SchemaStore.nvim": { "branch": "main", "commit": "df8bece94cf1ac036262bba7411b3cdda52f025c" }, "alpha-nvim": { "branch": "main", "commit": "331d55eb18d6e42bda4a183863a681be3ee11370" }, "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" }, "bufferline.nvim": { "branch": "main", "commit": "9961d87bb3ec008213c46ba14b3f384a5f520eb5" }, @@ -19,7 +19,7 @@ "dressing.nvim": { "branch": "master", "commit": "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504" }, "flash.nvim": { "branch": "main", "commit": "8a8e74922a383c253b7f92e042b749150140c8d1" }, "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" }, - "gitsigns.nvim": { "branch": "main", "commit": "bf6b0bbc527c546ecd6af2bb9fcd06864ae0852c" }, + "gitsigns.nvim": { "branch": "main", "commit": "983f1a216cca1a079399ba050bc4b9ce130de83a" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, "highlight-undo.nvim": { "branch": "main", "commit": "d9e674a2eb4d95ee16cd477d47eab7ddc586e336" }, "import-cost.nvim": { "branch": "main", "commit": "d2c93deee35fa4042fde28719ddcbad664544fcf" }, @@ -37,8 +37,8 @@ "mini.indentscope": { "branch": "main", "commit": "f60e9b51a6214c73a170ffc5445ce91560981031" }, "mini.pairs": { "branch": "main", "commit": "dfa9f6e2576bb8853be277d96b735af59d9be7c2" }, "mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "9b5b4c874b13e372500f07c37187ba06c0c1ac0a" }, - "neoconf.nvim": { "branch": "main", "commit": "9873bc90d7e6bee70ec8f552b4663c3ff51ec7f6" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "2d89ca96e08eb6e9c8e50e1bb4738bc5125c9f12" }, + "neoconf.nvim": { "branch": "main", "commit": "19bcb10508d9ea7672185587c6e69aebffeec9cc" }, "neodev.nvim": { "branch": "main", "commit": "dcd34653b0f1d3e7ea9aeb3e37dc7c8da445c4fe" }, "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" }, "neotest": { "branch": "master", "commit": "bec7be0f13ee19c85561943fc5f7b8daa4f4d465" }, @@ -50,7 +50,7 @@ "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, - "nvim-dap": { "branch": "master", "commit": "31e1ece773e10448dcb616d5144290946a6264b7" }, + "nvim-dap": { "branch": "master", "commit": "0e6b7c47dd70e80793ed39271b2aa712d9366dbc" }, "nvim-dap-go": { "branch": "main", "commit": "1b508e9db330108d3b5d62a6d9cc01fe6bbdd4e0" }, "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, @@ -62,7 +62,7 @@ "nvim-regexplainer": { "branch": "main", "commit": "4250c8f3c1307876384e70eeedde5149249e154f" }, "nvim-scrollview": { "branch": "main", "commit": "b0737d036cfbb39e066d144702197eda0a4b6cf1" }, "nvim-spectre": { "branch": "master", "commit": "411cee67fe3f8242023eb8d9edafefbbfb2d06f1" }, - "nvim-treesitter": { "branch": "master", "commit": "cc56e1f093868892fc7fea68ac3a51f5ffc38728" }, + "nvim-treesitter": { "branch": "master", "commit": "80b4fa7970ee159e5c2c715bbcd386143c48dcb1" }, "nvim-treesitter-context": { "branch": "master", "commit": "b6c763db8cc486215ba96e0a67418848a710ab25" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, @@ -89,7 +89,7 @@ "twilight.nvim": { "branch": "main", "commit": "a4843e6e67092a1e6fa9666f02bf0ab59174c1df" }, "typescript.nvim": { "branch": "main", "commit": "4de85ef699d7e6010528dcfbddc2ed4c2c421467" }, "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" }, - "venv-selector.nvim": { "branch": "main", "commit": "343058bcec7e47f27a08755f6185d6f805a2c64b" }, + "venv-selector.nvim": { "branch": "main", "commit": "14d6e866070f759e9014a8053954f835294f56f9" }, "vim-floaterm": { "branch": "master", "commit": "eeb3f6b5c98bde26752ebe0fbe1359fc974cbdcd" }, "vim-illuminate": { "branch": "master", "commit": "76f28e858f1caae87bfa45fb4fd09e4b053fc45b" }, "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, diff --git a/.config/waybar/config b/.config/waybar/config index 5ffcf8b2..21fcc768 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -12,7 +12,7 @@ "margin-right": 17, "modules-left": [ "custom/arch", - "wlr/workspaces" + "hyprland/workspaces" ], "modules-center": [ "custom/music" @@ -64,7 +64,7 @@ "on-click-right": "swaync-client -d -sw", "escape": true }, - "wlr/workspaces": { + "hyprland/workspaces": { "disable-scroll": true, "all-outputs": false, "enable-bar-scroll": true, @@ -104,8 +104,8 @@ "focused": " ", "default": " " }, - "on-scroll-up": "hyprctl dispatch workspace m-1", - "on-scroll-down": "hyprctl dispatch workspace m+1", + "on-scroll-up": "hyprctl dispatch workspace r-1", + "on-scroll-down": "hyprctl dispatch workspace r+1", "on-click": "activate", "sort-by-number": true }, @@ -246,7 +246,7 @@ "margin-right": 17, "modules-left": [ "custom/arch", - "wlr/workspaces" + "hyprland/workspaces" ], "modules-center": [ "custom/music" @@ -288,7 +288,7 @@ "on-click-right": "swaync-client -d -sw", "escape": true }, - "wlr/workspaces": { + "hyprland/workspaces": { "disable-scroll": true, "all-outputs": false, "enable-bar-scroll": true, @@ -328,8 +328,8 @@ "focused": "", "default": "" }, - "on-scroll-up": "hyprctl dispatch workspace m-1", - "on-scroll-down": "hyprctl dispatch workspace m+1", + "on-scroll-up": "hyprctl dispatch workspace r-1", + "on-scroll-down": "hyprctl dispatch workspace r+1", "on-click": "activate", "sort-by-number": true }, @@ -475,7 +475,7 @@ "margin-right": 17, "modules-left": [ "custom/arch", - "wlr/workspaces" + "hyprland/workspaces" ], "modules-center": [ "custom/music" @@ -520,7 +520,7 @@ "on-click-right": "swaync-client -d -sw", "escape": true }, - "wlr/workspaces": { + "hyprland/workspaces": { "disable-scroll": true, "active-only": false, "all-outputs": false, @@ -561,8 +561,8 @@ "focused": "", "default": "" }, - "on-scroll-up": "hyprctl dispatch workspace m-1", - "on-scroll-down": "hyprctl dispatch workspace m+1", + "on-scroll-up": "hyprctl dispatch workspace r-1", + "on-scroll-down": "hyprctl dispatch workspace r+1", "on-click": "activate", "sort-by-number": true }, @@ -708,4 +708,4 @@ "restart-interval": 10 } } -] \ No newline at end of file +] diff --git a/.gitconfig b/.gitconfig index 01615785..faac529b 100644 --- a/.gitconfig +++ b/.gitconfig @@ -19,28 +19,13 @@ helper = libsecret [core] editor = nvim - pager = delta + pager = diff-so-fancy | less --tabs=4 -RFX [interactive] - diffFilter = delta --color-only -[delta] - navigate = true # use n and N to move between diff sections - light = false - dark = true - side-by-side = true - line-numbers = true - features = decorations - line-numbers-minus-style = "#ed8796" - line-numbers-plus-style = "#a6da95" - line-numbers-zero-style = "#cad3f5" - minus-style = "#24273a" bold "#aa4b59" - minus-emph-style = "#24273a" bold "#ed8796" - file-style = "#b7bdf8" - plus-style = "#24273a" bold "#478a37" - plus-emph-style = "#24273a" bold "#a6da95" + diffFilter = diff-so-fancy --patch [merge] conflictstyle = diff3 [pager] - blame = delta + blame = diff-so-fancy | less --tabs=4 -RFX [diff] colorMoved = default [gpg]