Fixed merge & leftwm stuff

leftwm/.config/leftwm/autostart.sh

@@ -34,6 +34,3 @@ export SSH_AUTH_SOCK
 
 # Emacs daemon
 # emacs --daemon &
-
-# LeftWM theme
-leftwm-command "LoadTheme $HOME/.config/leftwm/themes/current/theme.toml"

leftwm/.config/leftwm/config.ron

@@ -76,32 +76,34 @@
         (command: CloseWindow, value: "", modifier: ["modkey", "Shift"], key: "q"),
         (command: SoftReload, value: "", modifier: ["modkey", "Shift"], key: "x"),
         // (command: Execute, value: "loginctl kill-session $XDG_SESSION_ID", modifier: ["modkey", "Shift"], key: "x"),
-        (command: Execute, value: "betterlockscreen --lock", modifier: ["modkey"], key: "l"),
+        (command: Execute, value: "betterlockscreen --lock", modifier: ["modkey", "Shift"], key: "l"),
+        (command: Execute, value: "flameshot gui", modifier: ["modkey"], key: "Print"),
         (command: MoveToLastWorkspace, value: "", modifier: ["modkey", "Shift"], key: "w"),
         (command: SwapTags, value: "", modifier: ["modkey"], key: "w"),
+
         (command: MoveWindowUp, value: "", modifier: ["modkey", "Shift"], key: "k"),
         (command: MoveWindowDown, value: "", modifier: ["modkey", "Shift"], key: "j"),
         (command: MoveWindowTop, value: "", modifier: ["modkey", "Shift"], key: "Return"),
+
+        (command: FocusWorkspaceNext, value: "", modifier: ["modkey"], key: "e"),
+        (command: FocusWorkspacePrevious, value: "", modifier: ["modkey"], key: "q"),
         (command: FocusWindowUp, value: "", modifier: ["modkey"], key: "k"),
         (command: FocusWindowDown, value: "", modifier: ["modkey"], key: "j"),
+
+        (command: IncreaseMainWidth, value: "2", modifier: ["modkey"], key: "l"),
+        (command: DecreaseMainWidth, value: "2", modifier: ["modkey"], key: "h"),
+
         (command: NextLayout, value: "", modifier: ["modkey", "Control"], key: "k"),
         (command: PreviousLayout, value: "", modifier: ["modkey", "Control"], key: "j"),
-        (command: FocusWorkspaceNext, value: "", modifier: ["modkey"], key: "l"),
+
-        (command: FocusWorkspacePrevious, value: "", modifier: ["modkey"], key: "h"),
-        (command: MoveWindowUp, value: "", modifier: ["modkey", "Shift"], key: "Up"),
-        (command: MoveWindowDown, value: "", modifier: ["modkey", "Shift"], key: "Down"),
-        (command: FocusWindowUp, value: "", modifier: ["modkey"], key: "Up"),
-        (command: FocusWindowDown, value: "", modifier: ["modkey"], key: "Down"),
-        (command: NextLayout, value: "", modifier: ["modkey", "Control"], key: "Up"),
-        (command: PreviousLayout, value: "", modifier: ["modkey", "Control"], key: "Down"),
-        (command: FocusWorkspaceNext, value: "", modifier: ["modkey"], key: "Right"),
-        (command: FocusWorkspacePrevious, value: "", modifier: ["modkey"], key: "Left"),
         (command: ToggleScratchPad, value: "Qalc", modifier: ["modkey"], key: "c"),
         (command: ToggleFloating, modifier: ["modkey"], key: "f"),
 	(command: ToggleFullScreen, modifier: ["modkey", "Shift"], key: "f"),
+
 	(command: SetLayout, value: "Monocle", modifier: ["modkey"], key: "m"),
 	(command: SetLayout, value: "MainAndVertStack", modifier: ["modkey"], key: "t"),
 	(command: SetLayout, value: "LeftWiderRightStack", modifier: ["modkey", "Shift"], key: "t"),
+
         (command: GotoTag, value: "1", modifier: ["modkey"], key: "1"),
         (command: GotoTag, value: "2", modifier: ["modkey"], key: "2"),
         (command: GotoTag, value: "3", modifier: ["modkey"], key: "3"),

leftwm/.config/leftwm/themes/gruv/down

@@ -1,4 +1,4 @@
 #!/usr/bin/bash
 
 export SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
-leftwm-command "UnloadTheme $SCRIPTPATH/theme.toml"
+leftwm-command "UnloadTheme $SCRIPTPATH/theme.ron"

leftwm/.config/leftwm/themes/gruv/theme.ron

@@ -0,0 +1,8 @@
+#![enable(implicit_some)]
+(
+	border_width: 1,
+	margin: 16,
+	default_border_color: "#282828",
+	focused_border_color: "#484848",
+	floating_border_color: "#000000",
+)

leftwm/.config/leftwm/themes/gruv/theme.toml

@@ -1,5 +0,0 @@
-border_width = 1
-margin = 16
-default_border_color = "#282828"
-focused_border_color = "#484848"
-floating_border_color = "#142f5a"

leftwm/.config/leftwm/themes/gruv/up

@@ -1,4 +1,4 @@
 #!/usr/bin/bash
 
 export SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
-leftwm-command "LoadTheme $SCRIPTPATH/theme.toml"
+leftwm-command "LoadTheme $SCRIPTPATH/theme.ron"