Changed colorscheme.

Added icons to lf.
Some more changes.

6 files changed, 59 insertions, 53 deletions

diff --git a/alacritty/default.nix b/alacritty/default.nix
index 5dee8ee..eb3825e 100644
--- a/alacritty/default.nix
+++ b/alacritty/default.nix
@@ -33,7 +33,6 @@
 				background = "0x${base00}";
 				foreground = "0x${base05}";
 			};
-
 			normal = {
 				black = "0x${base00}";
 				red = "0x${base08}";
@@ -44,7 +43,6 @@
 				cyan = "0x${base0C}";
 				white = "0x${base05}";
 			};
-
 			bright = {
 				black = "0x${base03}";
 				red = "0x${base08}";
@@ -55,12 +53,11 @@
 				cyan = "0x${base0C}";
 				white = "0x${base07}";
 			};
-
 			dim = {
 				black = "0x${base01}";
 				red = "0x${base08}";
 				green = "0x${base0B}";
-				yellow	= "0x${base0A}";
+				yellow = "0x${base0A}";
 				blue = "0x${base0D}";
 				magenta = "0x${base0E}";
 				cyan = "0x${base0C}";
diff --git a/bspwm/default.nix b/bspwm/default.nix
index e31662d..ad06514 100644
--- a/bspwm/default.nix
+++ b/bspwm/default.nix
@@ -12,14 +12,14 @@
 		focus_follows_pointer = true;
 		pointer_follows_focus = false;
 		pointer_motion_interval = 60;
-		pointer_modifier = "mod4";
-		pointer_action1 = "move";
-		pointer_action2 = "resize_side";
+		pointer_modifier = "mod1"; # alt key
+		pointer_action1 = "resize_side";
+		pointer_action2 = "move";
 		pointer_action3 = "resize_corner";
 	};
 
 	xsession.windowManager.bspwm.rules = {
-		"File Explorer" = {
+		"popup" = {
 			state = "floating";
 			sticky = true;
 		};
diff --git a/lf/default.nix b/lf/default.nix
index bd16b02..804b121 100644
--- a/lf/default.nix
+++ b/lf/default.nix
@@ -1,8 +1,15 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
 	programs.lf.enable = true;
 	programs.lf.settings = {
 		hidden = true;
 	};
+
+	programs.lf.extraConfig = "set icons";
+
+	xdg.configFile."lf/icons".source = builtins.fetchurl {
+		url = "https://raw.githubusercontent.com/gokcehan/lf/master/etc/icons.example";
+		sha256 = "sha256:12cwy6kfa2wj7nzffaxn5bka21yjqa5sx38nzdhyg1dq0c6jnjkk";
+	};
 }
diff --git a/polybar/default.nix b/polybar/default.nix
index 832bffd..038a28d 100644
--- a/polybar/default.nix
+++ b/polybar/default.nix
@@ -2,7 +2,6 @@
 
 {
 	services.polybar.enable = true;
-
 	services.polybar.script = "polybar main &";
 
 	services.polybar.config = with config.lib.stylix.colors.withHashtag; {
diff --git a/stylix/default.nix b/stylix/default.nix
index 166aa3f..99f3b39 100644
--- a/stylix/default.nix
+++ b/stylix/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-	stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/classic-dark.yaml";
+	stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/ayu-dark.yaml";
 
 	stylix.polarity = "dark";
 }
diff --git a/sxhkd/default.nix b/sxhkd/default.nix
index cdb012a..00621bf 100644
--- a/sxhkd/default.nix
+++ b/sxhkd/default.nix
@@ -1,61 +1,64 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
 	services.sxhkd.enable = true;
 
 	services.sxhkd.keybindings =
 	let
-		withDescription = keybinding: description: "# ${description}\n${keybinding}";
+		modKey = "alt";
+		createKeybinding = keybinding: description: "# ${description}\n${modKey} + ${keybinding}";
 	in {
-		${(withDescription
-			"super + h"
-			"Show keybindings.")} = ''awk '/^#/{desc=substr($0, 3)} /^[a-z]/ { cmd=$0; print cmd " : " desc }' ~/.config/sxhkd/sxhkdrc | rofi -dmenu -i -p "Keybindings"'';
+		# TODO: Currently not working properly
+		${(createKeybinding
+			"i"
+			"Show keybindings.")}
+				= ''awk '/^#/{desc=substr($0, 3)} /^[a-z]/ { cmd=$0; print cmd " : " desc }' ~/.config/sxhkd/sxhkdrc | rofi -dmenu -i -p "Keybindings"'';
 
-		${(withDescription
-			"super + r"
-			"Launch rofi.")} = "rofi -show run";
+		${(createKeybinding
+			"r"
+			"Launch rofi.")}
+				= "rofi -show run";
 
-		${(withDescription
-			"super + t"
-			"Launch terminal.")} = "alacritty";
+		${(createKeybinding
+			"t"
+			"Launch terminal.")}
+				= "alacritty";
 
-		${(withDescription
-			"super + f"
-			"Launch File Explorer.")} = "alacritty -t 'File Explorer' --class 'File Explorer' -e lf";
+		${(createKeybinding
+			"f"
+			"Launch File Explorer.")}
+				= "alacritty -t 'File Explorer' --class 'popup' -e lf";
 
-		${(withDescription
-			"super + q"
-			"Kill current window.")} = "bspc node -c";
+		${(createKeybinding
+			"q"
+			"Kill current window.")}
+				= "bspc node -c";
 
-		# switch desktops
-		${(withDescription
-			"super + {1-9,0}"
-			"Switch workspace.")} = "bspc desktop -f {1-9,10}";
+		${(createKeybinding
+			"{1-9,0}"
+			"Switch workspace.")}
+				= "bspc desktop -f {1-9,10}";
 
-		# move window to desktop
-		${(withDescription
-			"super + shift + {1-9,0}"
-			"Move window to workspace.")} = "bspc node -d {1-9,10} --follow";
+		${(createKeybinding
+			"shift + {1-9,0}"
+			"Move window to workspace.")}
+				= "bspc node -d {1-9,10} --follow";
 
-		# tiled
-		${(withDescription
-			"super + n"
-			"Set current window to tiled mode.")} = "bspc node focused -t tiled";
+		${(createKeybinding
+			"{n,d,m}"
+			"Set current window mode (tiled, floating, fullscreen).")}
+				= "bspc node focused -t {tiled,floating,fullscreen}";
 
-		# floating
-		${(withDescription
-			"super + d"
-			"Set current window to floating mode.")} = "bspc node focused -t floating";
+		${(createKeybinding
+			"{_,shift + }{h,j,k,l}"
+			"Navigate between windows.")}
+				= "bspc node --{focus,swap} {west,south,north,east}";
 
-		# fullscreen
-		${(withDescription
-			"super + m"
-			"Set current window to full screen mode.")} = "bspc node focused -t fullscreen";
-
-		# resize windows (the indentation for each line is required to work with the help prompt)
-		${(withDescription
-			"super + alt + {h,j,k,l}"
-			"Resize current window.")} = ''
+		# the indentation for each line is required to work with the help prompt
+		${(createKeybinding
+			"ctrl + {h,j,k,l}"
+			"Resize current window.")}
+				= ''
 				{bspc node @parent/second -z left -20 0; \
 				bspc node @parent/first -z right -20 0, \
 				bspc node @parent/second -z top 0 +20; \