From 83413516e7afd9e32ec1ea2aee60d752c96c6312 Mon Sep 17 00:00:00 2001 From: MikeG Date: Fri, 29 Dec 2023 05:49:20 -0500 Subject: [PATCH 01/11] added some additional plugins for lsp stuff mostly --- .config/nvim/lua/user/plugins.lua | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua index aa52e3c..4365618 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -17,16 +17,26 @@ return require('packer').startup(function(use) 'williamboman/mason.nvim', run = ':MasonUpdate' -- :MasonUpdate updates registry contents } - use 'NvChad/nvim-colorizer.lua' + -- use 'NvChad/nvim-colorizer.lua' + use 'uga-rosa/ccc.nvim' use 'windwp/nvim-autopairs' use 'nvim-tree/nvim-tree.lua' use 'nvim-tree/nvim-web-devicons' + use 'williamboman/mason-lspconfig.nvim' + use 'neovim/nvim-lspconfig' use {'akinsho/bufferline.nvim', tag = "*", requires = 'nvim-tree/nvim-web-devicons'} -- use {'neoclide/coc.nvim', branch = 'release'} -- Themes use 'folke/tokyonight.nvim' + use 'numToStr/Comment.nvim' + + use 'mfussenegger/nvim-dap' + use { "rcarriga/nvim-dap-ui", requires = {"mfussenegger/nvim-dap"}} + use 'mfussenegger/nvim-lint' + use 'mhartington/formatter.nvim' + -- Automatically set up your configuration after cloning packer.nvim -- Put this at the end after all plugins if packer_bootstrap then @@ -37,7 +47,18 @@ return require('packer').startup(function(use) require 'mason'.setup() -- colorizer setup - require 'colorizer'.setup() + -- require 'colorizer'.setup() + + -- comment.nvim for toggling line comments + require 'Comment'.setup() + + -- ccc.nvim setup + require 'ccc'.setup({ + highlighter = { + auto_enable = true, + lsp = false, + }, + }) -- autopairs setup require 'nvim-autopairs'.setup() @@ -45,6 +66,11 @@ return require('packer').startup(function(use) -- nvim-tree setup require 'nvim-tree'.setup() + -- lspconfig + require 'mason-lspconfig'.setup() + require 'lspconfig'.cssls.setup{} + require 'lspconfig'.jsonls.setup{} + -- bufferline setup require 'bufferline'.setup() From d3336137a44fa7e48c44f17ee7c293c1cfff9796 Mon Sep 17 00:00:00 2001 From: MikeG Date: Fri, 29 Dec 2023 05:50:14 -0500 Subject: [PATCH 02/11] i don't remember what I changed here now --- .config/sway/config | 4 ++-- .config/sway/lockman.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/sway/config b/.config/sway/config index ecb903c..90988f1 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -33,7 +33,7 @@ bindsym $mod+Shift+n exec swaync-client -t -sw # output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill # output * bg ~/Wallpapers/orangeMountains.png fill # output * bg #c0caf5 solid_color -output * bg ~/Wallpapers/chillGruvboxStreet.png fill +output * bg ~/Wallpapers/orangeMountains.png fill # # Example configuration: # @@ -56,7 +56,7 @@ output eDP-1 resolution 1920x1080 position 0,0 # your displays after another 300 seconds, and turn your screens back on when # resumed. It will also lock your screen before your computer goes to sleep. -set $lock 'swaylock -e -F -i ~/Wallpapers/chillGruvboxStreet.png' +set $lock 'swaylock -e -F -i ~/Wallpapers/orangeMountains.png' exec swayidle -w \ timeout 300 $lock \ timeout 310 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ diff --git a/.config/sway/lockman.sh b/.config/sway/lockman.sh index deaf090..bb24d83 100644 --- a/.config/sway/lockman.sh +++ b/.config/sway/lockman.sh @@ -2,5 +2,5 @@ swayidle \ timeout 10 'swaymsg "output * power off"' \ resume 'swaymsg "output * power on"' & -swaylock -e -F -i ~/Wallpapers/chillGruvboxStreet.png +swaylock -e -F -i ~/Wallpapers/orangeMountains.png kill %% From 17e8c76c98f5ba40213e281c46af8e153b183c1c Mon Sep 17 00:00:00 2001 From: MikeG Date: Fri, 29 Dec 2023 05:50:49 -0500 Subject: [PATCH 03/11] added cpu temp to bar, need to clean up yet --- .config/waybar/config | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.config/waybar/config b/.config/waybar/config index cde59a3..6791e41 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -12,6 +12,8 @@ ], "modules-right": [ + "temperature", + "custom/temp2", "custom/notification", "custom/pacman", "backlight", @@ -169,6 +171,20 @@ }, "exec-if": "which waybar-updates", "exec": "waybar-updates" + }, + + "temperature": { + "thermal-zone": 0, + "critical-threshold": 80, + "formate-critical": "{temperatureC}°C", + "format": "{temperatureC}°C" + }, + + "custom/temp2": { + "hwmon-path": ["/sys/class/hwmon/hwmon2/temp1_input", "/sys/class/thermal/thermal_zone0/temp"], + "critical-threshold": 80, + "formate-critical": "{temperatureC}°C", + "format": "{temperatureC}°C" } } From c87a4853747313998ac72f50a091cf8860d66c1f Mon Sep 17 00:00:00 2001 From: MikeG Date: Sat, 30 Dec 2023 12:58:14 -0500 Subject: [PATCH 04/11] added telescope etc. to nvim --- .config/nvim/lua/user/keymaps.lua | 7 +++++++ .config/nvim/lua/user/plugins.lua | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua index b4d12c6..5b4035d 100644 --- a/.config/nvim/lua/user/keymaps.lua +++ b/.config/nvim/lua/user/keymaps.lua @@ -8,3 +8,10 @@ vim.keymap.set('n', '', 'j') vim.keymap.set('n', '', 'k') vim.keymap.set('n', '', 'h') vim.keymap.set('n', '', 'l') + +-- telescope keymaps +local builtin = require('telescope.builtin') +vim.keymap.set('n', 'ff', builtin.find_files, {}) +vim.keymap.set('n', 'fg', builtin.live_grep, {}) +vim.keymap.set('n', 'fb', builtin.buffers, {}) +vim.keymap.set('n', 'fh', builtin.help_tags, {}) diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua index 4365618..b7b65c2 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -36,6 +36,17 @@ return require('packer').startup(function(use) use { "rcarriga/nvim-dap-ui", requires = {"mfussenegger/nvim-dap"}} use 'mfussenegger/nvim-lint' use 'mhartington/formatter.nvim' + + use 'nvim-lua/plenary.nvim' + use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' } + use { + 'nvim-telescope/telescope.nvim', tag = '0.1.5', + requires = { {'nvim-lua/plenary.nvim'} } + } + use { + 'nvim-treesitter/nvim-treesitter', + run = ':TSUpdate' + } -- Automatically set up your configuration after cloning packer.nvim -- Put this at the end after all plugins From 97a4953abea584616107846e5e8e35c0966dda8b Mon Sep 17 00:00:00 2001 From: MikeG Date: Sat, 13 Jan 2024 18:19:54 -0500 Subject: [PATCH 05/11] added system tray to waybar, now my nextcloud sync icon shows --- .config/waybar/config | 7 ++++++- .config/waybar/style.css | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.config/waybar/config b/.config/waybar/config index 6791e41..efe4140 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -12,7 +12,7 @@ ], "modules-right": [ - "temperature", + "tray", "custom/temp2", "custom/notification", "custom/pacman", @@ -185,6 +185,11 @@ "critical-threshold": 80, "formate-critical": "{temperatureC}°C", "format": "{temperatureC}°C" + }, + + "tray": { + "icon-size": 18, + "spacing": 10 } } diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 4ff99fe..48b5025 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -150,3 +150,10 @@ tooltip label animation-name: blink-update; animation-duration: 3s; } + +#tray +{ + padding: 0 10px; + background-color: @primary_fg_color; + margin: 0 5px; +} From 22ed7b92eb23eb66e2d8c72eac0cf571cd7c0bd1 Mon Sep 17 00:00:00 2001 From: MikeG Date: Sun, 28 Apr 2024 08:24:51 -0400 Subject: [PATCH 06/11] added auto starts for protonmail bridge and nextcloud desktop --- .config/sway/config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.config/sway/config b/.config/sway/config index 90988f1..fd7e852 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -24,6 +24,12 @@ set $menu rofi -show drun # start notification deamon exec swaync +# start protonmail-bridge +exec sleep 5 && protonmail-bridge --no-window + +# start nextcloud-desktop +exec sleep 10 && nextcloud --background + # add keybinding to toggle swaync notification center bindsym $mod+Shift+n exec swaync-client -t -sw From b386781ab5952a9f49c2fe13d902c3fab369bb70 Mon Sep 17 00:00:00 2001 From: MikeG Date: Sun, 28 Apr 2024 08:32:05 -0400 Subject: [PATCH 07/11] added alias for systemctl --- .bash_aliases | 1 + 1 file changed, 1 insertion(+) diff --git a/.bash_aliases b/.bash_aliases index d2ff1d9..f1fb489 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -4,3 +4,4 @@ alias mountns="sudo mount -t nfs manjarodesktop:/mnt/TerraBeef/NetShare /mnt/man alias sshcloud="ssh -p 1919 emge@95.217.8.112" alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME" alias syncheavy="rsync -azP --no-perms --no-owner --no-group --no-times --delete /home/emge/Development/11ty-projects/heavy-rocks/_site/ emge@95.217.8.112:/var/www/heavy.rocks/" +alias s!="sudo systemctl" From 45878a6e7ed2402bdbf7c8dbd3d6731aad1ae9fa Mon Sep 17 00:00:00 2001 From: finner Date: Sun, 28 Apr 2024 14:39:55 +0200 Subject: [PATCH 08/11] trying to correct merges --- .bash_aliases | 4 ++++ .config/fish/config.fish | 2 ++ 2 files changed, 6 insertions(+) diff --git a/.bash_aliases b/.bash_aliases index f1fb489..ac1db2f 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -4,4 +4,8 @@ alias mountns="sudo mount -t nfs manjarodesktop:/mnt/TerraBeef/NetShare /mnt/man alias sshcloud="ssh -p 1919 emge@95.217.8.112" alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME" alias syncheavy="rsync -azP --no-perms --no-owner --no-group --no-times --delete /home/emge/Development/11ty-projects/heavy-rocks/_site/ emge@95.217.8.112:/var/www/heavy.rocks/" +<<<<<<< Updated upstream alias s!="sudo systemctl" +======= +alias portcheck="sudo lsof -i -P -n | grep LISTEN" +>>>>>>> Stashed changes diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 88f1009..f1e961b 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -15,3 +15,5 @@ starship init fish | source source ~/.bash_aliases set -gx EDITOR nvim + +set -gx DATABASE_URL user=miniflux password=Z5l3KVoEXY dbname=miniflux sslmode=disable From 3474d5490d97cb1ebfe4ace0de442b74647072b0 Mon Sep 17 00:00:00 2001 From: finner Date: Sun, 28 Apr 2024 14:41:44 +0200 Subject: [PATCH 09/11] fixed bash alias file after merging stashed changes --- .bash_aliases | 3 --- 1 file changed, 3 deletions(-) diff --git a/.bash_aliases b/.bash_aliases index ac1db2f..9d8a571 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -4,8 +4,5 @@ alias mountns="sudo mount -t nfs manjarodesktop:/mnt/TerraBeef/NetShare /mnt/man alias sshcloud="ssh -p 1919 emge@95.217.8.112" alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME" alias syncheavy="rsync -azP --no-perms --no-owner --no-group --no-times --delete /home/emge/Development/11ty-projects/heavy-rocks/_site/ emge@95.217.8.112:/var/www/heavy.rocks/" -<<<<<<< Updated upstream alias s!="sudo systemctl" -======= alias portcheck="sudo lsof -i -P -n | grep LISTEN" ->>>>>>> Stashed changes From 30b328c2d9efe6235495c75f02c082390efdd143 Mon Sep 17 00:00:00 2001 From: somewhat-heavy-rocks Date: Sun, 28 Apr 2024 08:55:07 -0400 Subject: [PATCH 10/11] fixed merges --- .bash_aliases | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.bash_aliases b/.bash_aliases index 9d8a571..2e79fb0 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -6,3 +6,6 @@ alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME" alias syncheavy="rsync -azP --no-perms --no-owner --no-group --no-times --delete /home/emge/Development/11ty-projects/heavy-rocks/_site/ emge@95.217.8.112:/var/www/heavy.rocks/" alias s!="sudo systemctl" alias portcheck="sudo lsof -i -P -n | grep LISTEN" +alias pubip="dig +short myip.opendns.com @resolver1.opendns.com" +alias piastart="sudo VPN_PROTOCOL=wireguard DISABLE_IPV6=yes DIP_TOKEN=no AUTOCONNECT=true PIA_PF=flase PIA_DNS=true PIA_USER=p7769426 PIA_PASS=2ZZtyE4Ujz ./run_setup.sh" +alias piastop="wg-quick down pia" From b66d940330efe078ac7177813a1af9e80743fd5a Mon Sep 17 00:00:00 2001 From: Mike G Date: Sat, 4 May 2024 22:35:58 -0400 Subject: [PATCH 11/11] blanked greeting in fish config, added gruvbox theme to nvim and switched to using it --- .config/fish/config.fish | 8 ++++---- .config/nvim/init.lua | 3 ++- .config/nvim/lua/user/options.lua | 1 + .config/nvim/lua/user/plugins.lua | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index f1e961b..e54576f 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -3,10 +3,10 @@ if status is-interactive end # set greeting to text -set -g fish_greeting 'Hey, sup?' -# function fish_greeting -# cowfortune -# end +set -g fish_greeting '' +#function fish_greeting +# cowfortune +#end # start starship prompt starship init fish | source diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 3a71d1b..c893d88 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,4 +1,5 @@ require("user.options") require("user.keymaps") require("user.plugins") -vim.cmd[[colorscheme Spacedust]] +--vim.cmd[[colorscheme Spacedust]] +vim.cmd([[colorscheme gruvbox]]) diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua index 4f303f8..dcfe10e 100644 --- a/.config/nvim/lua/user/options.lua +++ b/.config/nvim/lua/user/options.lua @@ -13,3 +13,4 @@ vim.opt.cursorlineopt = "screenline" -- hightlight line only vim.opt.termguicolors = true -- enables 24-bit color vim.opt.splitbelow = true -- new horizontal splits go below vim.opt.splitright = true -- new vertical splits go right +vim.opt.background = "dark" diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua index b7b65c2..f2838ef 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -30,6 +30,8 @@ return require('packer').startup(function(use) -- Themes use 'folke/tokyonight.nvim' + use { "ellisonleao/gruvbox.nvim" } + use 'numToStr/Comment.nvim' use 'mfussenegger/nvim-dap'