fix(nvim): elegant fold configuration

fedora.sh

@@ -24,9 +24,13 @@ replace_config_line "/etc/dnf/dnf.conf" "keepcache" "True"
 replace_config_line "/etc/dnf/dnf.conf" "max_parallel_downloads" "5"
 
 ensure_installed () {
-  for dep in !*; do
+    for dep in $*; do
-    dnf list --installed "$dep" 2>&1 | grep -q "$dep" || sudo dnf install "$dep" --assumeyes --allowerasing
+        if $(dnf list --installed "$dep" 2>&1 | grep -q "$dep") ; then
-  done
+            echo "${dep} already installed"
+        else
+            sudo dnf install "$dep" --assumeyes --allowerasing
+        fi
+    done
 }
 
 # Enable extra repos
@@ -47,11 +51,11 @@ printf "You'll need to reboot to have selinux disabled\n"
 
 # set up ZSH
 ensure_installed zsh fzf sqlite3
-replace_config_line '/etc/zshenv' 'export ZDOTDIR' '${HOME}/.config/zsh'
+replace_config_line '/etc/zshenv' 'export ZDOTDIR' '"$XDG_CONFIG_HOME"/zsh'
 mkdir -p ~/.local/state/zsh/
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 mv ~/.oh-my-zsh ~/.local/share/oh-my-zsh/   # TODO: figure out how to contol install location of script above. Maybe reboot/relog after xgd_user_dirs is installed?
-git clone https://github.com/Aloxaf/fzf-tab ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}
+git clone https://github.com/Aloxaf/fzf-tab ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/fzf-tab
 curl -O -fsSL https://github.com/ryanoasis/nerd-fonts/releases/download/v3.3.0/FiraCode.zip && unzip FiraCode.zip *.ttf -d ~/.local/share/fonts/
 printf "You'll need to relog to have your default shell changed\n"
 
@@ -66,6 +70,7 @@ ensure_installed swaync
 set_unit swaync.service
 ensure_installed waybar fontawesome4-fonts
 set_unit waybar.service
+ensure_installed cliphist
 set_unit cliphist.service
 
 # Install ReGreet
@@ -96,15 +101,14 @@ sudo plymouth-set-default-theme -R fedora-mac-style && sudo dracut --regenerate-
 
 # install gnome's stuff
 ensure_installed gnome-keying nautilus dconf gedit
-set_unit gnome-keying.service
+dconf load /org/gtk/gtk4/ < ~/.config/dconf-export/gtk4.dconf
-dconf load /org/gtk/gtk4 < ~/.config/dconf-export/gtk4.dconf
+dconf load /org/gnome/desktop/ < ~/.config/dconf-export/gnome-desktop.dconf
-dconf load /org/gnome/desktop < ~/.config/dconf-export/gnome-desktop.dconf
+dconf load /org/gnome/nautilus/ < ~/.config/dconf-export/nautilus.dconf
-dconf load /org/gnome/nautilus < ~/.config/dconf-export/nautilus.dconf
+dconf load /org/gnome/gedit/ < ~/.config/dconf-export/gedit.dconf
-dconf load /org/gnome/gedit < ~/.config/dconf-export/gedit.dconf
 
 # rofi & rofi-calc (compilation, because why not)
 ensure_installed rofi-wayland rofi-devel qalculate automake libtool
-git clone https://github.com/svenstaro/rofi-calc "~/.local/bin/build_stage/" && cd "~/.local/bin/build_stage/rofi-calc" && mkdir m4 && autoreconf -i && mkdir build && cd build && ../configure && make && sudo make install 
+git clone https://github.com/svenstaro/rofi-calc "~/.local/bin/build_stage/rofi-calc" && cd "~/.local/bin/build_stage/rofi-calc" && mkdir m4 && autoreconf -i && mkdir build && cd build && ../configure && make && sudo make install 
 cd
 
 # kdeconnect

gtk-3.0/settings.ini

@@ -1,8 +1,8 @@
 [Settings]
 gtk-theme-name=adw-gtk3-dark
-gtk-icon-theme-name=Pop
+gtk-icon-theme-name=Adwaita
 gtk-font-name=Roboto 11
-gtk-cursor-theme-name=Adwaita
+gtk-cursor-theme-name=default
 gtk-cursor-theme-size=24
 gtk-toolbar-style=GTK_TOOLBAR_ICONS
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR

gtk-4.0/settings.ini

@@ -1,4 +1,7 @@
 [Settings]
-gtk-application-prefer-dark-theme=0
+gtk-theme-name=adw-gtk3-dark
+gtk-icon-theme-name=Adwaita
+gtk-font-name=Roboto 11
+gtk-cursor-theme-name=default
 gtk-cursor-theme-size=24
-property gtk-cursor-theme-name=Adwaita
+gtk-application-prefer-dark-theme=1

hypr/keybinds.conf

@@ -4,11 +4,11 @@
 $mainMod = SUPER
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, BACKSPACE, killactive
+bind = $mainMod, BACKSPACE, killactive,
 bind = $mainMod CTRL ALT, BACKSPACE, exec, uwsm stop
-#bind = $mainMod CTRL, BACKSPACE, exec, sh ~/.config/swaylock.sh
+bind = $mainMod CTRL, BACKSPACE, exec, /usr/bin/hyprlock
-#bind = $mainMod, PAUSE, killactive
+#bind = $mainMod, PAUSE, killactive,
-bind = $mainMod, Y, togglefloating
+bind = $mainMod, Y, togglefloating,
 bind = $mainMod SHIFT, Y, workspaceopt, allfloat
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod SHIFT, P, pin
@@ -23,6 +23,9 @@ binde = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
 binde = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
 binde = , XF86MonBrightnessUp, exec, brightnessctl set '12.75+'
 binde = , XF86MonBrightnessDown, exec, brightnessctl set '12.75-'
+binde = , XF86AudioPlay, exec, playerctl play-pause
+binde = , XF86AudioNext, exec, playerctl next
+binde = , XF86AudioPrev, exec, playerctl previous
 
 #bind = $mainMod ALT, SPACE, exec, hyprctl switchxkblayout
 
@@ -43,10 +46,10 @@ bind = $mainMod SHIFT, right, movewindow, r
 bind = $mainMod SHIFT, up, movewindow, u
 bind = $mainMod SHIFT, down, movewindow, d
 
-bind = $mainMod SHIFT, H, movetoworkspace, l
+bind = $mainMod SHIFT, H, movewindow, l
 bind = $mainMod SHIFT, J, movetoworkspace, r+1
 bind = $mainMod SHIFT, K, movetoworkspace, r-1
-bind = $mainMod SHIFT, L, movetoworkspace, r
+bind = $mainMod SHIFT, L, movewindow, r
 
 
 # Resize commands

kitty/kitty.conf

@@ -2653,6 +2653,7 @@ font_family      family='FiraCode Nerd Font' features=+ss05
 bold_font        auto
 italic_font      auto
 bold_italic_font auto
+font_size        12
 # END_KITTY_FONTS
 
 map ctrl+shift+r no_op

nvim/lua/configs/lspconfig.lua

@@ -1,14 +1,7 @@
 local on_attach = require("nvchad.configs.lspconfig").on_attach
 local capabilities = require("nvchad.configs.lspconfig").capabilities
 
-local lspconfig = require "lspconfig"
-
 -- if you just want default config for the servers then put them in a table
-local servers = { "html", "cssls", "ts_ls", "clangd", "pyright", "vhdl_ls" }
+local servers = { "hyprls", "lua-language-server", "clangd", "basedpyright", "vhdl_ls" }
 
-for _, lsp in ipairs(servers) do
+vim.lsp.enable(servers)
-  lspconfig[lsp].setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-  }
-end

nvim/lua/mappings.lua

@@ -116,3 +116,13 @@ map("v", "<leader>r", ":<C-u>MoltenEvaluateVisual<CR>gv")
 map("n", "<leader>os", ":noautocmd MoltenEnterOutput<CR>")
 map("n", "<leader>oh", ":MoltenHideOutput<CR>")
 map("n", "<leader>md", ":MoltenDelete<CR>")
+
+map({"n", "v", "x"}, "<leader>ts", function()
+    if vim.o.shiftwidth == 4 then
+        vim.o.shiftwidth = 2
+        vim.o.tabstop = 2
+    else
+        vim.o.shiftwidth = 4
+        vim.o.tabstop = 4
+    end
+end, {desc = 'toggle shiftwidth (between 2 and 4)'})

nvim/lua/myinit.lua

@@ -6,8 +6,27 @@ local autocmd = vim.api.nvim_create_autocmd
 --   command = "tabdo wincmd =",
 -- })
 
--- Auto unfold all when entering a buffer
+autocmd({ "FileType" }, {
-autocmd("BufWinEnter", { pattern = "*", command = "silent! :%foldopen!" })
+    callback = function()
+
+        -- check if treesitter has parser
+        if require("nvim-treesitter.parsers").has_parser() then
+
+            -- use treesitter folding
+            vim.opt.foldmethod = "expr"
+            vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
+        else
+
+            -- use alternative foldmethod
+            vim.opt.foldmethod = "syntax"
+        end
+    end,
+})
+
+-- disable folding on startup
+vim.opt.foldenable = false
+-- disable folding on loading
+vim.opt.foldlevel = 20
 
 -- Hyrplang filetype
 vim.filetype.add({

rofi/applets/bin/volume.sh

@@ -22,11 +22,11 @@ amixer get Master | grep '\[on\]' &>/dev/null
 if [[ "$?" == 0 ]]; then
 	active="-a 1"
 	stext='Unmute'
-	sicon=''
+	sicon='󰕾'
 else
 	urgent="-u 1"
 	stext='Mute'
-	sicon=''
+	sicon='󰸈'
 fi
 
 # Microphone Info
@@ -34,11 +34,11 @@ amixer get Capture | grep '\[on\]' &>/dev/null
 if [[ "$?" == 0 ]]; then
     [ -n "$active" ] && active+=",3" || active="-a 3"
 	mtext='Unmute'
-	micon=''
+	micon='󰍬'
 else
     [ -n "$urgent" ] && urgent+=",3" || urgent="-u 3"
 	mtext='Mute'
-	micon=''
+	micon=''
 fi
 
 # Theme Elements

waybar/config

@@ -4,7 +4,7 @@
   "include": [
     "~/.config/waybar/modules.jsonc"
   ],
-	"height": 20,
+	"height": 40,
   "margin-left": 3, 
   "margin-right": 3,
   "margin-top": 3,

waybar/style.css

@@ -17,6 +17,7 @@ button {
   box-shadow: inset 0 -3px transparent;
   border: none;
   border-radius: 10px;
+  color: @text;
 }
 
 
@@ -71,7 +72,7 @@ button {
   border-radius: 0px 10px 10px 0px; /* Adjust as needed */
   padding: 3px 10px;
   color: @text;
-  min-width: 130px;
+  min-width: 80px;
 }
 
 #backlight {
@@ -108,6 +109,7 @@ button {
   border-radius: 10px;
   padding: 3px 5px;
   margin-left: 3px;
+  color: @text;
 }
 
 #battery {

xsettingsd/xsettingsd.conf

@@ -1,6 +1,6 @@
 Net/ThemeName "adw-gtk3-dark"
-Net/IconThemeName "Pop"
+Net/IconThemeName "Adwaita"
-Gtk/CursorThemeName "Adwaita"
+Gtk/CursorThemeName "default"
 Net/EnableEventSounds 1
 EnableInputFeedbackSounds 0
 Xft/Antialias 1

zsh/.zshrc

@@ -1,5 +1,5 @@
 # If you come from bash you might have to change your $PATH.
-export PATH=$HOME/.local/bin:/usr/local/bin:$PATH:/home/lacko/Programs
+export PATH=$HOME/.local/bin:/usr/local/bin:$PATH
 
 # XDG compliance
 XDG_DATA_HOME="$HOME/.local/share"
@@ -7,8 +7,6 @@ XDG_CONFIG_HOME="$HOME/.config"
 XDG_STATE_HOME="$HOME/.local/state"
 XDG_CACHE_HOME="$HOME/.cache"
 export XDG_DATA_HOME XDG_CONFIG_HOME XDG_STATE_HOME XDG_CACHE_HOME
-# android-studio
-export ANDROID_HOME="$XDG_DATA_HOME"/android
 # gnupg
 export GNUPGHOME="$XDG_DATA_HOME"/gnupg
 # less
@@ -156,6 +154,8 @@ export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
 # use yosys ghdl plugin
 #alias yosys="yosys -m ghdl.so"
 
+export VUNIT_MODELSIM_PATH="/home/laszlo.parkanyi/.local/bin/modelsim_dlx/bin/"
+
 # virtualenv automation functions
 # usage
 # $ mkvenv myvirtualenv # creates venv under $XDG_STATE_HOME/virtualenvs/