misc before reinstall

Author: timon-sue

.bashrc

@@ -73,14 +73,6 @@ alias tmux='tmux -2'
 export SRC="~/src"
 export SEC="mnt/sec/src"
 
-# pyenv
-if [ -x "$(command -v pyenv)" ]; then
-	echo "pyenv found.."
-	export PATH="$HOME/.pyenv/bin:$PATH"
-	command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
-	eval "$(pyenv init -)"
-fi
-
 if command -v fzf-share >/dev/null; then
   source "$(fzf-share)/key-bindings.bash"
   source "$(fzf-share)/completion.bash"

.config/nvim/init.vim

@@ -8,5 +8,5 @@ lua require('binds')
 lua require('opts.slime')
 lua require('theme')
 lua require('lualine_conf')
-lua require('snippets')
+lua require('treesitter')
 lua require('fzf')

.config/nvim/lua/language.lua

@@ -80,17 +80,10 @@ lspconfig.lua_ls.setup {
 	}
 }
 
--- luasnip setup
-local luasnip = require 'luasnip'
 
 -- nvim-cmp setup
 local cmp = require 'cmp'
 cmp.setup {
-	snippet = {
-		expand = function(args)
-			luasnip.lsp_expand(args.body)
-		end,
-	},
 	mapping = cmp.mapping.preset.insert({
 		['<C-d>'] = cmp.mapping.scroll_docs(-4),
 		['<C-f>'] = cmp.mapping.scroll_docs(4),
@@ -102,25 +95,20 @@ cmp.setup {
 		['<Tab>'] = cmp.mapping(function(fallback)
 			if cmp.visible() then
 				cmp.select_next_item()
-			elseif luasnip.expand_or_jumpable() then
-				luasnip.expand_or_jump()
 			else
 				fallback()
 			end
 		end, { 'i', 's' }),
 		['<S-Tab>'] = cmp.mapping(function(fallback)
 			if cmp.visible() then
 				cmp.select_prev_item()
-			elseif luasnip.jumpable(-1) then
-				luasnip.jump(-1)
 			else
 				fallback()
 			end
 		end, { 'i', 's' }),
 	}),
 	sources = {
 		{ name = 'nvim_lsp' },
-		{ name = 'luasnip' },
 	},
 }
 
@@ -133,17 +121,17 @@ vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
 vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
 
 -- Filetype detection overrides
-require("filetype").setup({
-	overrides = {
-		literal = {
-			["CMakeLists_src.txt"] = "cmake",
-			["global-config"] = "bitbake",
-		},
-		extensions = {
-			bbappend = "bitbake",
-			bb = "bitbake",
-		}
-	},
-})
+-- require("filetype").setup({
+-- 	overrides = {
+-- 		literal = {
+-- 			["CMakeLists_src.txt"] = "cmake",
+-- 			["global-config"] = "bitbake",
+-- 		},
+-- 		extensions = {
+-- 			bbappend = "bitbake",
+-- 			bb = "bitbake",
+-- 		}
+-- 	},
+-- })
 
 require('toggle_lsp_diagnostics').init()

.config/nvim/lua/plugins.lua

@@ -44,14 +44,7 @@ return require('packer').startup(function(use)
 	use 'solarnz/thrift.vim' -- thrift syntax
 	use 'MTDL9/vim-log-highlighting' -- generic log hightighter
 	use 'kergoth/vim-bitbake' -- syntax for bb files
-	use 'nathom/filetype.nvim' -- customize filetype detection
---	use {
---		"folke/trouble.nvim",
---		requires = "kyazdani42/nvim-web-devicons",
---		config = function()
---			require("trouble").setup {}
---		end
---	}
+	-- use 'nathom/filetype.nvim' -- customize filetype detection
 	use 'LnL7/vim-nix' -- nix language support
 	use 'psf/black'
 
@@ -68,9 +61,9 @@ return require('packer').startup(function(use)
 	 use 'tpope/vim-unimpaired'
 	 use 'WhoIsSethDaniel/toggle-lsp-diagnostics.nvim'
 	 use {
-		'nvim-treesitter/nvim-treesitter',
-		run = ':TSUpdate'
-	}
+		 'nvim-treesitter/nvim-treesitter',
+		 run = ':TSUpdate'
+	 }
 	 use { -- complete
 		'gelguy/wilder.nvim',
 		config = function()
@@ -83,9 +76,12 @@ return require('packer').startup(function(use)
 	}
 
 	 -- THEME
-	 use 'sainnhe/gruvbox-material'
-	 use 'https://gitlab.com/protesilaos/tempus-themes-vim.git'
-	 use 'projekt0n/github-nvim-theme'
+	use 'sainnhe/gruvbox-material'
+	use 'https://gitlab.com/protesilaos/tempus-themes-vim.git'
+	use 'projekt0n/github-nvim-theme'
+	use 'catppuccin/nvim'
+	use 'rebelot/kanagawa.nvim'
+	use 'EdenEast/nightfox.nvim'
 
 	-- BOOTSTRAP
 	if packer_bootstrap then

.config/nvim/lua/theme.lua

@@ -1,7 +1,7 @@
 -- set the color scheme
 vim.cmd [[ set termguicolors ]]
 vim.cmd [[ set background=light]]
-local ok, _ = pcall(vim.cmd, 'colorscheme gruvbox-material')
+local ok, _ = pcall(vim.cmd, 'colorscheme kanagawa-lotus')
 if not ok then
 	vim.cmd [[ colorscheme default ]]
 end

.config/nvim/lua/treesitter.lua

@@ -1,7 +1,7 @@
 require 'nvim-treesitter.configs'.setup {
 	-- A list of parser names, or "all" (the four listed parsers should always be installed)
-	ensure_installed = { "c", "cpp", "lua", "vim", "help", "devicetree", "diff", "bash", "gitcommit", "gitignore",
-		"javascript", "typescript", "json", "make", "markdown", "tsx", "python" },
+	ensure_installed = { "c", "cpp", "lua", "vim", "devicetree", "diff", "bash", "gitcommit", "gitignore",
+		"javascript", "typescript", "json", "make", "markdown", "tsx", "python", "cmake" },
 
 	-- Install parsers synchronously (only applied to `ensure_installed`)
 	sync_install = false,

.tmux.conf

@@ -37,7 +37,7 @@ set -g @resurrect-strategy-nvim 'session'
 set -g @resurrect-capture-pane-contents 'on'
 
 # increase history limit 
-set -g history-limit 500000
+set -g history-limit 5000000
 
 # config tmux-logging plugin
 set -g @logging-path "$HOME/Documents/logs/"
@@ -55,6 +55,7 @@ set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @plugin 'tmux-plugins/tmux-continuum'
 set -g @plugin 'tmux-plugins/tmux-pain-control'
 set -g @plugin 'tmux-plugins/tmux-fpp'
+# set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin 'brennanfee/tmux-paste'
 set -g @plugin 'tmux-plugins/tmux-logging'
 set -g @plugin 'lljbash/tmux-update-display'

script/create-update-json.sh

@@ -0,0 +1,78 @@
+#!/bin/bash
+
+# Define the file name
+file="image.swu"
+url=""
+json_file="info.json"
+forced_update=false
+
+# Parse command line arguments using a loop
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --file=*)
+            file="${1#*=}"
+            ;;
+        --url=*)
+            url="${1#*=}"
+            ;;
+        --force=*)
+            forced_update="${1#*=}"
+            if [[ "$forced_update" != "true" && "$forced_update" != "false" ]]; then
+                echo "Error: Invalid argument for --force. Please use 'true' or 'false'."
+                exit 1
+            fi
+            ;;
+        --mac=*)
+            mac="${1#*=}"
+            ;;
+        *)
+            echo "Error: Invalid argument: $1"
+            exit 1
+            ;;
+    esac
+    shift
+done
+
+# Check if the --url argument is provided and not empty
+if [ -z "$url" ]; then
+    echo "Error: Missing or empty --url argument. Please provide a valid URL."
+    exit 1
+fi
+
+# Use sed to extract the third line of the file
+third_line=$(sed -n '3p' "$file")
+
+# Use grep and regular expressions to extract the version variable
+if [[ $third_line =~ version\ =\ \"([^\"]+)\" ]]; then
+    version="${BASH_REMATCH[1]}"
+    echo "Found version in $file: $version"
+else
+    echo "Error: Unable to extract version from the third line of $file."
+    exit 1
+fi
+
+# Use stat to get the size of the file
+file_size=$(stat -c %s "$file")
+echo "File size of $file is $file_size bytes."
+
+# If a MAC address is provided, append it to the file name (after extracting the info)
+if [ -n "$mac" ]; then
+    json_file="info.json_mac_$mac"
+fi
+
+# Generate the JSON content
+json_content=$(cat <<EOF
+{
+    "version": "$version",
+    "url": "$url",
+    "imageSize": $file_size,
+    "forcedUpdate": $forced_update
+}
+EOF
+)
+
+# Write the JSON content to the JSON file
+echo "$json_content" > "$json_file"
+
+echo "JSON file '$json_file' created with the following content:"
+cat "$json_file"