From 2a80731f4a5eb5b4e8b46386010d437c8a3ca4e1 Mon Sep 17 00:00:00 2001 From: Trevor Vallender Date: Tue, 23 Jul 2024 11:19:57 +0100 Subject: [PATCH] Many updates --- .bashrc | 4 +- .config/eww/scripts/get-active-workspace | 3 +- .config/hypr/hyprland.conf | 16 +++----- .config/nvim/lazy-lock.json | 48 ++++++++++++------------ .config/nvim/lua/options.lua | 31 ++++++++++++--- 5 files changed, 58 insertions(+), 44 deletions(-) diff --git a/.bashrc b/.bashrc index ef7378e..37d3390 100644 --- a/.bashrc +++ b/.bashrc @@ -7,10 +7,10 @@ XDG_STATE_HOME=$HOME/.state LC_ALL="en_GB.UTF-8" -DIP=false -HYPRSHOT_DIR=/home/tsv/img/screenshots LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/openssl-1.0.2u/lib XDG_DOWNLOAD_DIR=$HOME/downloads +XDG_PICTURES_DIR=$HOME/img +HYPRSHOT_DIR=$XDG_PICTURES_DIR/screenshots # Sane defaults for history HISTFILE=$XDG_STATE_HOME/.bash_history diff --git a/.config/eww/scripts/get-active-workspace b/.config/eww/scripts/get-active-workspace index 7bb8fe3..d12ef67 100755 --- a/.config/eww/scripts/get-active-workspace +++ b/.config/eww/scripts/get-active-workspace @@ -2,5 +2,4 @@ hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id' -socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | - stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}' +socat -u UNIX-CONNECT:/run/user/$UID/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}' diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 47c0efb..6607206 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -1,21 +1,19 @@ monitor=,preferred,auto,auto windowrule = workspace 1, alacritty -windowrule = workspace 2, firefox -windowrule = workspace 2, qutebrowser -windowrule = workspace 2, ^(.*)(Chrom)(.*)$ -windowrule = workspace 3, thunderbird -windowrule = workspace 3, "flatpak run com.spotify.Client" +windowrule = workspace 1, firefox +windowrule = workspace 2, thunderbird +windowrule = workspace 2, ^(.*)(potify)(.*)$ exec-once = eww daemon && eww open bar -exec-once = qutebrowser exec-once = firefox exec-once = thunderbird exec-once = dunst & hyprpaper & alacritty +exec-once = flatpak run com.spotify.Client $terminal = alacritty $menu = wofi --show drun -$browser = qutebrowser +$browser = firefox env = XCURSOR_SIZE,24 env = QT_QPA_PLATFORMTHEME,qt5ct # change to qt6ct if you have that @@ -73,10 +71,6 @@ dwindle { preserve_split = yes # you probably want this } -master { - new_is_master = true -} - gestures { workspace_swipe = off } diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index c2ba53b..6139bc8 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,38 +1,38 @@ { "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f0f53f704c08ea501f9d222b23491b0d354644b0" }, + "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f94f7ba948e32cd302caba1c2ca3f7c697fb4fcf" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, "cmp-treesitter": { "branch": "master", "commit": "958fcfa0d8ce46d215e19cc3992c542f576c4123" }, - "codeium.vim": { "branch": "main", "commit": "289eb724e5d6fab2263e94a1ad6e54afebefafb2" }, + "codeium.vim": { "branch": "main", "commit": "e0342fde9474fdd0a36ff9692fe0031b7611a19f" }, "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" }, - "go.nvim": { "branch": "master", "commit": "1423d5d0820eeefc97d6cdaf3ae8b554676619cc" }, - "gruvbox.nvim": { "branch": "main", "commit": "96a8ec336fb48a11cefbd57508888361431aac26" }, - "guihua.lua": { "branch": "master", "commit": "a53b76514ad42d92a821d75d712ef71e71898fcf" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, + "go.nvim": { "branch": "master", "commit": "033344ddfa3cd5cfd55037903264b2bb86691619" }, + "gruvbox.nvim": { "branch": "main", "commit": "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e" }, + "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" }, + "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "lazy.nvim": { "branch": "main", "commit": "839f9e78e78dc935b1188fb16583365991739c51" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, - "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, - "noice.nvim": { "branch": "main", "commit": "f119045f38792ad5311e5f9be7a879e4c1a95fe0" }, - "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, - "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, - "nvim-dap": { "branch": "master", "commit": "922ebc75c2fa9305e36402fbd8c984c8638770a0" }, - "nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" }, + "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "noice.nvim": { "branch": "main", "commit": "dd7363eae290ecdb9d6a2db6e0f59527df79edd6" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, + "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, + "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-html-css": { "branch": "main", "commit": "c514bd27ad560636ed39dea3e370b3103754e244" }, - "nvim-lspconfig": { "branch": "master", "commit": "d70633830acf605ec03d9728698d9e7232442eb4" }, - "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" }, - "nvim-tree.lua": { "branch": "master", "commit": "5a87ffe35c4739ffb6b62052572583ad277a20ae" }, - "nvim-treesitter": { "branch": "master", "commit": "ea2b137f35fb1e87a6471ec311805920fdf45745" }, + "nvim-lspconfig": { "branch": "master", "commit": "fa6c2a64100c6f692bbec29bbbc8ec2663c9e869" }, + "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, + "nvim-tree.lua": { "branch": "master", "commit": "4e396b26244444c911b73e9f2f40ae0115351fd1" }, + "nvim-treesitter": { "branch": "master", "commit": "9d252d00210ed8d43197ef048daa94e6dc821bd6" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" }, - "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, + "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "repl.nvim": { "branch": "master", "commit": "ec202eb5786b305c7d73b8cab5ee8fe69a2534a7" }, "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, - "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, - "vim-rails": { "branch": "master", "commit": "8972461e64c7c4bf049f2f86ea1bc571e8077b55" }, + "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, + "vim-rails": { "branch": "master", "commit": "2fba7907f585819a8653f0bc7dd7f437a822d9c6" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-wordmotion": { "branch": "master", "commit": "81d9bd298376ab0dc465c85d55afa4cb8d5f47a1" }, - "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" } -} \ No newline at end of file + "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" } +} diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua index 06e42fe..925f86e 100644 --- a/.config/nvim/lua/options.lua +++ b/.config/nvim/lua/options.lua @@ -1,9 +1,4 @@ local set = vim.opt -set.autoindent = true -set.tabstop = 2 -set.shiftwidth = 2 -set.softtabstop = 2 -set.expandtab = true set.number = true set.relativenumber = true set.cursorline = true @@ -16,6 +11,32 @@ vim.api.nvim_command("autocmd TermOpen * setlocal nonumber norelativenumber") vim.api.nvim_command("autocmd TermEnter * setlocal signcolumn=no") vim.keymap.set('t', '', "") +set.autoindent = true +set.expandtab = true +set.tabstop = 2 +set.shiftwidth = 2 +set.softtabstop = 2 +vim.keymap.set('n', 'qq', + function() + vim.opt.autoindent = not vim.opt.autoindent:get() + vim.opt.expandtab = not vim.opt.expandtab:get() + if vim.opt.tabstop:get() == 2 then + vim.opt.tabstop = vim.opt.tabstop._info.default + else + vim.opt.tabstop = 2 + end + if vim.opt.shiftwidth:get() == 2 then + vim.opt.shiftwidth = vim.opt.shiftwidth._info.default + else + vim.opt.shiftwidth = 2 + end + if vim.opt.softtabstop:get() == 2 then + vim.opt.softtabstop = vim.opt.softtabstop._info.default + else + vim.opt.softtabstop = 2 + end + end +) -- Strip trailing spaces on save vim.api.nvim_create_autocmd({"BufWritePre"}, { pattern = { "*" },