general

4 files changed, 34 insertions, 4 deletions

diff --git a/Common/bashrc.m4 b/Common/bashrc.m4
index 2340348..b1d8c67 100644
--- a/Common/bashrc.m4
+++ b/Common/bashrc.m4
@@ -153,3 +153,4 @@ source "$SSH_DIR/ssh-agent.env" > /dev/null
 
 # Enable FZF history
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
+source /usr/share/fzf/shell/key-bindings.bash
diff --git a/Makefile.m4 b/Makefile.m4
index aa913f8..4eea0c2 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -194,3 +194,32 @@ update_packages:
 	sudo apt-get upgrade -y $(DPKG_DEPENDENCIES)
 )m4_dnl
 
+m4_ifelse(DT_DISTRO, `fedora', m4_dnl
+DPKG_DEPENDENCIES := m4_dnl
+m4_ifelse(DT_TOOLS, `yes', `highlight atool w3m mediainfo curl zsh vim git python3-pip zsh tmux nodejs catimg ripgrep the_silver_searcher',) m4_dnl
+m4_ifelse(DT_GREETD_TUIGREET', `yes', `greetd',) m4_dnl
+m4_ifelse(DT_TLP, `yes', `tlp',) m4_dnl
+m4_dnl
+m4_ifelse(DT_SWAY, `yes', `sway swayidle alacritty blueman wob wlogout wofi brightnessctl clipman seahorse fcitx5 imsettings',) m4_dnl
+m4_dnl
+m4_ifelse(DT_QTILE, `yes', `python3-cffi python3-cairocffi pango pango-devel python3-dbus-next',) m4_dnl qtile core
+m4_ifelse(DT_QTILE, `yes', `python3-xcffib xsecurelock',) m4_dnl qtile x11
+m4_ifelse(DT_QTILE, `yes', `wlroots python3-pywayland python3-xkbcommon',) m4_dnl qtile wayland
+
+
+install_packages:
+	@missing_packages=""; \
+	for pkg in $(DPKG_DEPENDENCIES); do \
+		if ! dpkg -s "$$pkg" >/dev/null 2>&1; then \
+			missing_packages="$$missing_packages $$pkg"; \
+		fi; \
+	done; \
+	if [ -n "$$missing_packages" ]; then \
+		echo "Installing missing packages: $$missing_packages"; \
+		sudo dnf install -y $$missing_packages; \
+	fi
+
+update_packages:
+	@echo "Updating all packages..."
+	sudo dnf upgrade -y $(DPKG_DEPENDENCIES)
+)m4_dnl
diff --git a/linux/qtile/config/keys.m4.py b/linux/qtile/config/keys.m4.py
index 3e57667..77e4f9b 100644
--- a/linux/qtile/config/keys.m4.py
+++ b/linux/qtile/config/keys.m4.py
@@ -44,7 +44,7 @@ keys = [
     Key([mod, "control", "shift"], "c", lazy.restart(), desc="Restart QTile"),
     Key([mod, "control"], "q", lazy.shutdown(), desc="Shutdown Qtile"),
     Key([mod], "r", lazy.spawncmd(), desc="Spawn a command using a prompt widget"),
-    Key([mod], "l", lazy.spawn("xsecurelock"), desc="Toggle floating on the focused window"),
+    Key([mod1], "l", lazy.spawn("xsecurelock"), desc="Toggle floating on the focused window"),
     #Key([mod], 'd', lazy.run_extension(extension.DmenuRun(
     #    dmenu_ignorecase=True,
     #    dmenu_font="Andika-8",
diff --git a/linux/tmux.conf.m4 b/linux/tmux.conf.m4
index f88153a..29848d4 100644
--- a/linux/tmux.conf.m4
+++ b/linux/tmux.conf.m4
@@ -42,9 +42,9 @@ set-option -s set-clipboard off
 bind P paste-buffer
 bind-key -T copy-mode-vi 'v' send -X begin-selection
 bind-key -T copy-mode-vi 'r' send -X rectangle-toggle
-#bind-key -T copy-mode-vi 'y' send -X copy-pipe-and-cancel 'xclip -sel clip -i'
-#unbind -T copy-mode-vi Enter
-#bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel 'xclip -se c -i'
+bind-key -T copy-mode-vi 'y' send -X copy-pipe-and-cancel 'xclip -sel clip -i'
+unbind -T copy-mode-vi Enter
+bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel 'xclip -se c -i'
 #bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel 'xclip -se c -ind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel 'xclip -se c -i'
 #bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel 'xclip -se c -i''