diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index 75e2e33..28b4dce 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -1,153 +1,173 @@
+// vim: filetype=c
+// get dumps via -dump-config and -dump-theme
configuration {
-modi: "window,drun,ssh,run";
-/* width: 50;*/
-/* lines: 15;*/
-/* columns: 2;*/
-/* font: "mono 12";*/
-/* bw: 1;*/
-/* location: 0;*/
-/* padding: 5;*/
-/* yoffset: 0;*/
-/* xoffset: 0;*/
-/* fixed-num-lines: true;*/
-/* show-icons: false;*/
-/* terminal: "rofi-sensible-terminal";*/
-/* ssh-client: "ssh";*/
-/* ssh-command: "{terminal} -e {ssh-client} {host} [-p {port}]";*/
-/* run-command: "{cmd}";*/
-/* run-list-command: "";*/
-/* run-shell-command: "{terminal} -e {cmd}";*/
-/* window-command: "wmctrl -i -R {window}";*/
-/* window-match-fields: "all";*/
-/* icon-theme: ;*/
-/* drun-match-fields: "name,generic,exec,categories,keywords";*/
-/* drun-categories: ;*/
-/* drun-show-actions: false;*/
-/* drun-display-format: "{name} [({generic})]";*/
-/* drun-url-launcher: "xdg-open";*/
-/* disable-history: false;*/
-/* ignored-prefixes: "";*/
-/* sort: false;*/
-/* sorting-method: "normal";*/
-/* case-sensitive: false;*/
-/* cycle: true;*/
-/* sidebar-mode: false;*/
-/* eh: 1;*/
-/* auto-select: false;*/
-/* parse-hosts: false;*/
-/* parse-known-hosts: true;*/
-/* combi-modi: "window,run";*/
-/* matching: "normal";*/
-/* tokenize: true;*/
-/* m: "-5";*/
-/* line-margin: 2;*/
-/* line-padding: 1;*/
-/* filter: ;*/
-/* separator-style: "dash";*/
-/* hide-scrollbar: false;*/
-/* fullscreen: false;*/
-/* fake-transparency: false;*/
-/* dpi: -1;*/
-/* threads: 0;*/
-/* scrollbar-width: 8;*/
-/* scroll-method: 0;*/
-/* fake-background: "screenshot";*/
-/* window-format: "{w} {c} {t}";*/
-/* click-to-exit: true;*/
-/* show-match: true;*/
-/* color-normal: ;*/
-/* color-urgent: ;*/
-/* color-active: ;*/
-/* color-window: ;*/
-/* max-history-size: 25;*/
-/* combi-hide-mode-prefix: false;*/
-/* matching-negate-char: '-' /* unsupported */;*/
-/* cache-dir: ;*/
-/* window-thumbnail: false;*/
-/* drun-use-desktop-cache: false;*/
-/* drun-reload-desktop-cache: false;*/
-/* normalize-match: false;*/
-/* pid: "/run/user/1000/rofi.pid";*/
-/* display-window: ;*/
-/* display-windowcd: ;*/
-/* display-run: ;*/
-/* display-ssh: ;*/
-/* display-drun: ;*/
-/* display-combi: ;*/
-/* display-keys: ;*/
-/* display-file-browser: ;*/
-/* kb-primary-paste: "Control+V,Shift+Insert";*/
-/* kb-secondary-paste: "Control+v,Insert";*/
-/* kb-clear-line: "Control+w";*/
-/* kb-move-front: "Control+a";*/
-/* kb-move-end: "Control+e";*/
-/* kb-move-word-back: "Alt+b,Control+Left";*/
-/* kb-move-word-forward: "Alt+f,Control+Right";*/
-/* kb-move-char-back: "Left,Control+b";*/
-/* kb-move-char-forward: "Right,Control+f";*/
-/* kb-remove-word-back: "Control+Alt+h,Control+BackSpace";*/
-/* kb-remove-word-forward: "Control+Alt+d";*/
-/* kb-remove-char-forward: "Delete,Control+d";*/
-/* kb-remove-char-back: "BackSpace,Shift+BackSpace,Control+h";*/
-/* kb-remove-to-eol: "Control+k";*/
-/* kb-remove-to-sol: "Control+u";*/
-/* kb-accept-entry: "Control+j,Control+m,Return,KP_Enter";*/
-/* kb-accept-custom: "Control+Return";*/
-/* kb-accept-alt: "Shift+Return";*/
-/* kb-delete-entry: "Shift+Delete";*/
-/* kb-mode-next: "Shift+Right,Control+Tab";*/
-/* kb-mode-previous: "Shift+Left,Control+ISO_Left_Tab";*/
-/* kb-row-left: "Control+Page_Up";*/
-/* kb-row-right: "Control+Page_Down";*/
-/* kb-row-up: "Up,Control+p,ISO_Left_Tab";*/
-/* kb-row-down: "Down,Control+n";*/
-/* kb-row-tab: "Tab";*/
-/* kb-page-prev: "Page_Up";*/
-/* kb-page-next: "Page_Down";*/
-/* kb-row-first: "Home,KP_Home";*/
-/* kb-row-last: "End,KP_End";*/
-/* kb-row-select: "Control+space";*/
-/* kb-screenshot: "Alt+S";*/
-/* kb-ellipsize: "Alt+period";*/
-/* kb-toggle-case-sensitivity: "grave,dead_grave";*/
-/* kb-toggle-sort: "Alt+grave";*/
-/* kb-cancel: "Escape,Control+g,Control+bracketleft";*/
-/* kb-custom-1: "Alt+1";*/
-/* kb-custom-2: "Alt+2";*/
-/* kb-custom-3: "Alt+3";*/
-/* kb-custom-4: "Alt+4";*/
-/* kb-custom-5: "Alt+5";*/
-/* kb-custom-6: "Alt+6";*/
-/* kb-custom-7: "Alt+7";*/
-/* kb-custom-8: "Alt+8";*/
-/* kb-custom-9: "Alt+9";*/
-/* kb-custom-10: "Alt+0";*/
-/* kb-custom-11: "Alt+exclam";*/
-/* kb-custom-12: "Alt+at";*/
-/* kb-custom-13: "Alt+numbersign";*/
-/* kb-custom-14: "Alt+dollar";*/
-/* kb-custom-15: "Alt+percent";*/
-/* kb-custom-16: "Alt+dead_circumflex";*/
-/* kb-custom-17: "Alt+ampersand";*/
-/* kb-custom-18: "Alt+asterisk";*/
-/* kb-custom-19: "Alt+parenleft";*/
-/* kb-select-1: "Super+1";*/
-/* kb-select-2: "Super+2";*/
-/* kb-select-3: "Super+3";*/
-/* kb-select-4: "Super+4";*/
-/* kb-select-5: "Super+5";*/
-/* kb-select-6: "Super+6";*/
-/* kb-select-7: "Super+7";*/
-/* kb-select-8: "Super+8";*/
-/* kb-select-9: "Super+9";*/
-/* kb-select-10: "Super+0";*/
-/* ml-row-left: "ScrollLeft";*/
-/* ml-row-right: "ScrollRight";*/
-/* ml-row-up: "ScrollUp";*/
-/* ml-row-down: "ScrollDown";*/
-/* me-select-entry: "MousePrimary";*/
-/* me-accept-entry: "MouseDPrimary";*/
-/* me-accept-custom: "Control+MouseDPrimary";*/
+ modes: "combi";
+ font: "mono 12";
+/* location: 0;*/
+/* yoffset: 0;*/
+/* xoffset: 0;*/
+ fixed-num-lines: true;
+ show-icons: true;
+ terminal: "alacritty";
+/* ssh-client: "ssh";*/
+/* ssh-command: "{terminal} -e {ssh-client} {host} [-p {port}]";*/
+/* run-command: "{cmd}";*/
+/* run-list-command: "";*/
+/* run-shell-command: "{terminal} -e {cmd}";*/
+/* window-command: "wmctrl -i -R {window}";*/
+/* window-match-fields: "all";*/
+/* icon-theme: ;*/
+/* drun-match-fields: "name,generic,exec,categories,keywords";*/
+/* drun-categories: ;*/
+/* drun-show-actions: false;*/
+/* drun-display-format: "{name} [({generic})]";*/
+/* drun-url-launcher: "xdg-open";*/
+/* disable-history: false;*/
+/* ignored-prefixes: "";*/
+/* sort: false;*/
+/* sorting-method: "normal";*/
+/* case-sensitive: false;*/
+/* cycle: true;*/
+/* sidebar-mode: false;*/
+/* hover-select: false;*/
+/* eh: 1;*/
+/* auto-select: false;*/
+/* parse-hosts: false;*/
+/* parse-known-hosts: true;*/
+ combi-modes: "drun,window,ssh";
+/* matching: "normal";*/
+/* tokenize: true;*/
+/* m: "-5";*/
+/* filter: ;*/
+/* dpi: -1;*/
+/* threads: 0;*/
+/* scroll-method: 0;*/
+/* window-format: "{w} {c} {t}";*/
+/* click-to-exit: true;*/
+/* max-history-size: 25;*/
+ combi-hide-mode-prefix: true;
+/* combi-display-format: "{mode} {text}";*/
+/* matching-negate-char: '-' /* unsupported */;*/
+/* cache-dir: ;*/
+/* window-thumbnail: false;*/
+/* drun-use-desktop-cache: false;*/
+/* drun-reload-desktop-cache: false;*/
+/* normalize-match: false;*/
+/* steal-focus: false;*/
+/* application-fallback-icon: ;*/
+/* refilter-timeout-limit: 8192;*/
+/* xserver-i300-workaround: false;*/
+ pid: "/run/user/1000/rofi.pid";
+/* display-window: ;*/
+/* display-windowcd: ;*/
+/* display-run: ;*/
+/* display-ssh: ;*/
+/* display-drun: ;*/
+/* display-combi: ;*/
+/* display-keys: ;*/
+/* display-filebrowser: ;*/
+/* kb-primary-paste: "Control+V,Shift+Insert";*/
+/* kb-secondary-paste: "Control+v,Insert";*/
+/* kb-clear-line: "Control+w";*/
+/* kb-move-front: "Control+a";*/
+/* kb-move-end: "Control+e";*/
+/* kb-move-word-back: "Alt+b,Control+Left";*/
+/* kb-move-word-forward: "Alt+f,Control+Right";*/
+/* kb-move-char-back: "Left,Control+b";*/
+/* kb-move-char-forward: "Right,Control+f";*/
+/* kb-remove-word-back: "Control+Alt+h,Control+BackSpace";*/
+/* kb-remove-word-forward: "Control+Alt+d";*/
+/* kb-remove-char-forward: "Delete,Control+d";*/
+/* kb-remove-char-back: "BackSpace,Shift+BackSpace,Control+h";*/
+/* kb-remove-to-eol: "Control+k";*/
+/* kb-remove-to-sol: "Control+u";*/
+/* kb-accept-entry: "Control+j,Control+m,Return,KP_Enter";*/
+/* kb-accept-custom: "Control+Return";*/
+/* kb-accept-custom-alt: "Control+Shift+Return";*/
+/* kb-accept-alt: "Shift+Return";*/
+/* kb-delete-entry: "Shift+Delete";*/
+/* kb-mode-next: "Shift+Right,Control+Tab";*/
+/* kb-mode-previous: "Shift+Left,Control+ISO_Left_Tab";*/
+/* kb-mode-complete: "Control+l";*/
+/* kb-row-left: "Control+Page_Up";*/
+/* kb-row-right: "Control+Page_Down";*/
+/* kb-row-up: "Up,Control+p";*/
+/* kb-row-down: "Down,Control+n";*/
+/* kb-row-tab: "";*/
+/* kb-element-next: "Tab";*/
+/* kb-element-prev: "ISO_Left_Tab";*/
+/* kb-page-prev: "Page_Up";*/
+/* kb-page-next: "Page_Down";*/
+/* kb-row-first: "Home,KP_Home";*/
+/* kb-row-last: "End,KP_End";*/
+/* kb-row-select: "Control+space";*/
+/* kb-screenshot: "Alt+S";*/
+/* kb-ellipsize: "Alt+period";*/
+/* kb-toggle-case-sensitivity: "grave,dead_grave";*/
+/* kb-toggle-sort: "Alt+grave";*/
+/* kb-cancel: "Escape,Control+g,Control+bracketleft";*/
+/* kb-custom-1: "Alt+1";*/
+/* kb-custom-2: "Alt+2";*/
+/* kb-custom-3: "Alt+3";*/
+/* kb-custom-4: "Alt+4";*/
+/* kb-custom-5: "Alt+5";*/
+/* kb-custom-6: "Alt+6";*/
+/* kb-custom-7: "Alt+7";*/
+/* kb-custom-8: "Alt+8";*/
+/* kb-custom-9: "Alt+9";*/
+/* kb-custom-10: "Alt+0";*/
+/* kb-custom-11: "Alt+exclam";*/
+/* kb-custom-12: "Alt+at";*/
+/* kb-custom-13: "Alt+numbersign";*/
+/* kb-custom-14: "Alt+dollar";*/
+/* kb-custom-15: "Alt+percent";*/
+/* kb-custom-16: "Alt+dead_circumflex";*/
+/* kb-custom-17: "Alt+ampersand";*/
+/* kb-custom-18: "Alt+asterisk";*/
+/* kb-custom-19: "Alt+parenleft";*/
+/* ml-row-left: "ScrollLeft";*/
+/* ml-row-right: "ScrollRight";*/
+/* ml-row-up: "ScrollUp";*/
+/* ml-row-down: "ScrollDown";*/
+/* me-select-entry: "MousePrimary";*/
+/* me-accept-entry: "MouseDPrimary";*/
+/* me-accept-custom: "Control+MouseDPrimary";*/
+ kb-custom-1: "";
+ kb-custom-2: "";
+ kb-custom-3: "";
+ kb-custom-4: "";
+ kb-custom-5: "";
+ kb-custom-6: "";
+ kb-custom-7: "";
+ kb-custom-8: "";
+ kb-custom-9: "";
+ kb-custom-10: "";
+ kb-custom-11: "";
+ kb-custom-12: "";
+ kb-custom-13: "";
+ kb-custom-14: "";
+ kb-custom-15: "";
+ kb-custom-16: "";
+ kb-custom-17: "";
+ kb-custom-18: "";
+ kb-custom-19: "";
+ kb-select-1: "Alt+1";
+ kb-select-2: "Alt+2";
+ kb-select-3: "Alt+3";
+ kb-select-4: "Alt+4";
+ kb-select-5: "Alt+5";
+ kb-select-6: "Alt+6";
+ kb-select-7: "Alt+7";
+ kb-select-8: "Alt+8";
+ kb-select-9: "Alt+9";
+ kb-select-10:"Alt+0";
+ timeout {
+ action: "kb-cancel";
+ delay: 0;
+ }
+ filebrowser {
+ directories-first: true;
+ sorting-method: "name";
+ }
}
-@theme "/usr/share/rofi/themes/android_notification.rasi"
-/* window { fullscreen: true; } */
\ No newline at end of file
+@theme "theme" // read theme in ./theme.rasi
diff --git a/.config/sway/config.d/default b/.config/sway/config.d/default
index 6d3cb16..9e9445b 100644
--- a/.config/sway/config.d/default
+++ b/.config/sway/config.d/default
@@ -1,5 +1,8 @@
+# vim: filetype=i3config
# Logo key. Use Mod1 for Alt.
set $mod Mod4
+bindsym $mod+F12 reload
+focus_follows_mouse no
# Variables to set
set $terminal alacritty
@@ -7,14 +10,6 @@ set $browser firefox
set $files thunar
set $editor code
-# Your preferred application launcher
-# Note: pass the final command to swaymsg so that the resulting window can be opened
-# on the original workspace that the command was run on.
-set $smallmenu rofi -no-config -no-lazy-grab -show drun -modi drun -theme ~/.config/sway/rofi/launcher1.rasi
-
-set $grandmenu rofi -no-config -no-lazy-grab -show drun -modi drun -theme ~/.config/sway/rofi/launcher2.rasi
-
-set $cheat kitty -e micro ~/.config/sway/cheatsheet.md
### Idle configuration
@@ -50,17 +45,13 @@ bindsym $mod+F8 exec $files
bindsym $mod+F9 exec lollypop
bindsym $mod+F10 exec spotify
bindsym $mod+F11 exec rofi -show drun
-bindsym $mod+F12 exec rofi -show drun
## xfce4-terminal
bindsym f12 exec xfce4-terminal --drop-down
-bindsym $mod+Shift+Return exec thunar
# Start a terminal
-bindsym $mod+Return exec kitty
-bindsym $mod+t exec kitty
-bindsym Ctrl+Alt+Return exec foot
-bindsym Ctrl+Alt+t exec $terminal
+bindsym $mod+Return exec "rofi -show"
+bindsym $mod+Shift+Space exec $terminal
# archlinux tweak tool
bindsym Ctrl+Alt+e archlinux-tweak-tool
@@ -72,18 +63,7 @@ bindsym $mod+Shift+x exec archlinux-logout
## Lock Screen
bindsym Ctrl+Alt+l exec ~/.config/sway/scripts/lockman.sh
-# Kill focused window
bindsym $mod+q kill
-bindsym $mod+Shift+q kill
-
-# Launcher menu
-bindsym $mod+d exec $grandmenu
-
-# Launcher menu
-bindsym $mod+Shift+d exec $smallmenu
-
-# Cheatsheet
-bindsym $mod+Shift+i exec $cheat
# Drag floating windows by holding down $mod and left mouse button.
# Resize them with right mouse button + $mod.
@@ -92,8 +72,6 @@ bindsym $mod+Shift+i exec $cheat
# mouse button for dragging.
floating_modifier $mod normal
-# Reload the configuration file
-bindsym $mod+Shift+r reload
# conky
bindsym $mod+c exec conky-toggle
@@ -137,16 +115,16 @@ bindsym Ctrl+Alt+s exec spotify
# Moving around:
#
# Move your focus around
- bindsym $mod+Left focus left
- bindsym $mod+Down focus down
- bindsym $mod+Up focus up
- bindsym $mod+Right focus right
+ bindsym $mod+h focus left
+ bindsym $mod+j focus down
+ bindsym $mod+k focus up
+ bindsym $mod+l focus right
# Move the focused window with the same, but add Shift
- bindsym $mod+Shift+Left move left
- bindsym $mod+Shift+Down move down
- bindsym $mod+Shift+Up move up
- bindsym $mod+Shift+Right move right
+ bindsym $mod+Shift+h move left
+ bindsym $mod+Shift+j move down
+ bindsym $mod+Shift+k move up
+ bindsym $mod+Shift+l move right
#
# Workspaces:
#
@@ -175,33 +153,18 @@ bindsym Ctrl+Alt+s exec spotify
bindsym $mod+Shift+0 move container to workspace number 10
# Note: workspaces can have any name you want, not just numbers.
# We just use 1-10 as the default.
+ bindsym $mod+Prior container prev
+ bindsym $mod+Shift+Prior move container to workspace prev
+ bindsym $mod+Next workspace next
+ bindsym $mod+Shift+Next move container to workspace next
+ bindsym $mod+Tab workspace back_and_forth
- # Azerty
- # Switch to workspace
- #bindsym $mod+Ampersand workspace number 1
- #bindsym $mod+Eacute workspace number 2
- #bindsym $mod+Quotedbl workspace number 3
- #bindsym $mod+Apostrophe workspace number 4
- #bindsym $mod+Parenleft workspace number 5
- #bindsym $mod+Section workspace number 6
- #bindsym $mod+Egrave workspace number 7
- #bindsym $mod+Exclam workspace number 8
- #bindsym $mod+ccedilla workspace number 9
- #bindsym $mod+agrave workspace number 10
+ # moving workspaces between screens:
+ bindsym $mod+Left move workspace to output left
+ bindsym $mod+Up move workspace to output up
+ bindsym $mod+Right move workspace to output right
+ bindsym $mod+Down move workspace to output down
- # Move focused container to workspace
- #bindsym $mod+Shift+Ampersand move container to workspace number 1
- #bindsym $mod+Shift+Eacute move container to workspace number 2
- #bindsym $mod+Shift+Quotedbl move container to workspace number 3
- #bindsym $mod+Shift+Apostrophe move container to workspace number 4
- #bindsym $mod+Shift+Parenleft move container to workspace number 5
- #bindsym $mod+Shift+Section move container to workspace number 6
- #bindsym $mod+Shift+Egrave move container to workspace number 7
- #bindsym $mod+Shift+Exclam move container to workspace number 8
- #bindsym $mod+Shift+ccedilla move container to workspace number 9
- #bindsym $mod+Shift+agrave move container to workspace number 10
- # Note: workspaces can have any name you want, not just numbers.
- # We just use 1-10 as the default.
#
# Layout stuff:
@@ -215,13 +178,13 @@ bindsym Ctrl+Alt+s exec spotify
# Switch the current container between different layout styles
bindsym $mod+s layout stacking
bindsym $mod+w layout tabbed
- bindsym $mod+e layout toggle split
+ bindsym $mod+t layout toggle split
# Make the current focus fullscreen
bindsym $mod+f fullscreen
# Toggle the current focus between tiling and floating mode
- bindsym $mod+Shift+space floating toggle
+ bindsym $mod+d floating toggle
# Swap focus between the tiling area and the floating area
bindsym $mod+space focus mode_toggle
diff --git a/.config/sway/config.d/input b/.config/sway/config.d/input
index d5df32a..1037f0d 100644
--- a/.config/sway/config.d/input
+++ b/.config/sway/config.d/input
@@ -27,5 +27,5 @@ exec_always {
}
input "5824:10203:MoErgo_Glove80_Left_Keyboard" {
- xkb_layout "us"
+ xkb_layout "eu"
}
diff --git a/.config/sway/rofi/colors.rasi b/.config/sway/rofi/colors.rasi
deleted file mode 100644
index 1255159..0000000
--- a/.config/sway/rofi/colors.rasi
+++ /dev/null
@@ -1,10 +0,0 @@
-/* colors */
-
-* {
- al: #00000000;
- bg: #1F1F1FFF;
- bga: #ffb30033;
- bar: #1F1F1FFF;
- fg: #FFFFFFFF;
- ac: #f15495ff;
-}
diff --git a/.config/sway/rofi/config.rasi b/.config/sway/rofi/config.rasi
deleted file mode 100644
index bae4142..0000000
--- a/.config/sway/rofi/config.rasi
+++ /dev/null
@@ -1,98 +0,0 @@
-configuration{
- modi: "run,drun,window";
- lines: 5;
- font: "Iosevka 12";
- show-icons: true;
- icon-theme: "Paper Mono";
- terminal: "st";
- drun-display-format: "{icon} {name}";
- location: 0;
- disable-history: false;
- hide-scrollbar: true;
- display-drun: " Apps ";
-}
-
-@theme "everblush"
-
-element-text, element-icon , mode-switcher {
- background-color: inherit;
- text-color: inherit;
-}
-
-window {
- height: 360px;
- border: 3px;
- border-color: @border-col;
- background-color: @bg-col;
-}
-
-mainbox {
- background-color: @bg-col;
-}
-
-inputbar {
- children: [prompt,entry];
- background-color: @bg-col;
- border-radius: 5px;
- padding: 2px;
-}
-
-prompt {
- background-color: @blue;
- padding: 6px;
- text-color: @bg-col;
- border-radius: 3px;
- margin: 20px 0px 0px 20px;
-}
-
-textbox-prompt-colon {
- expand: false;
- str: ":";
-}
-
-entry {
- padding: 6px;
- margin: 20px 0px 0px 10px;
- text-color: @fg-col;
- background-color: @bg-col;
-}
-
-listview {
- border: 0px 0px 0px;
- padding: 6px 0px 0px;
- margin: 10px 0px 0px 20px;
- columns: 2;
- background-color: @bg-col;
-}
-
-element {
- padding: 5px;
- background-color: @bg-col;
- text-color: @fg-col ;
-}
-
-element-icon {
- size: 25px;
-}
-
-element selected {
- background-color: @selected-col ;
- text-color: @fg-col2 ;
-}
-
-mode-switcher {
- spacing: 0;
- }
-
-button {
- padding: 10px;
- background-color: @bg-col-light;
- text-color: @grey;
- vertical-align: 0.5;
- horizontal-align: 0.5;
-}
-
-button selected {
- background-color: @bg-col;
- text-color: @blue;
-}
diff --git a/.config/sway/rofi/launcher1.rasi b/.config/sway/rofi/launcher1.rasi
deleted file mode 100644
index 120562c..0000000
--- a/.config/sway/rofi/launcher1.rasi
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *
- * Original Author : Aditya Shakya
- * Author : DN-debug
- *
- */
-
-configuration {
- font: "Noto sans 12";
- show-icons: true;
- icon-theme: "";
- display-drun: "";
- drun-display-format: "{name}";
- disable-history: true;
- fullscreen: false;
- hide-scrollbar: true;
- sidebar-mode: false;
-}
-
-@import "colors.rasi"
-
-* {
- background-color: @al;
- text-color: #eeeeee;
-}
-
-
-window {
- transparency: "real";
- background-color: #101010A9;
- text-color: #eeeeee;
- border: 0px;
- border-color: @ac;
- border-radius: 5px;
- height: 60%;
- width: 60%;
- location: northwest;
- x-offset: 20%;
- y-offset: 20%;
-}
-
-
-entry {
- background-color: #000000;
- text-color: white;
- expand: false;
- horizontal-align: 50%;
- placeholder: "Type to search";
- margin: 0% 0% 0% 20%;
- padding: 1.5% 5.5%;
- blink: true;
-}
-
-inputbar {
- children: [ entry ];
- background-color: #00000000;
- text-color: @bg;
- expand: false;
- border: 0% 0% 0% 0%;
- border-radius: 0px;
- border-color: @ac;
- margin: 0% 0% 0% 0%;
- padding: 1.5%;
-}
-
-listview {
- background-color: @al;
- padding: 0px;
- columns: 5;
- lines: 5;
- spacing: 0%;
- cycle: false;
- dynamic: true;
- layout: vertical;
-}
-
-mainbox {
- background-color: @al;
- border: 0% 0% 0% 0%;
- border-radius: 0% 0% 0% 0%;
- border-color: @al;
- children: [ inputbar, listview ];
- spacing: 0%;
- padding: 0%;
-}
-
-element {
- background-color: @al;
- text-color: #eeeeee;
- orientation: horizontal;
- border-radius: 5%;
- padding: 2% 1% 2% 1%;
-}
-
-element-icon {
- size: 48px;
- border: 0px;
-}
-
-element-text {
- expand: true;
- horizontal-align: 0.5;
- vertical-align: 0.5;
- margin: 0.5% 0.5% -0.5% 0.5%;
-}
-
-element selected {
- background-color: @sa;
- text-color: #ffffff;
- border: 0% 0% 0% 0%;
- border-radius: 12px;
- border-color: @al;
-}
-
-element-text selected {
- text-color: @ac;
-}
diff --git a/.config/sway/rofi/launcher2.rasi b/.config/sway/rofi/launcher2.rasi
deleted file mode 100644
index 011e631..0000000
--- a/.config/sway/rofi/launcher2.rasi
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *
- * Original Author : Aditya Shakya
- * Author : DN-debug
- *
- */
-
-configuration {
- font: "Noto sans 12";
- show-icons: true;
- icon-theme: "";
- display-drun: "";
- drun-display-format: "{name}";
- disable-history: true;
- fullscreen: false;
- hide-scrollbar: true;
- sidebar-mode: false;
-}
-
-@import "colors.rasi"
-
-* {
- background-color: @al;
- text-color: #eeeeee;
-}
-
-
-window {
- transparency: "real";
- background-color: #101010A9;
- text-color: #eeeeee;
- border: 0px;
- border-color: @ac;
- border-radius: 5px;
- height: 90%;
- width: 96%;
- location: northwest;
- x-offset: 2%;
- y-offset: 5%;
-}
-
-
-entry {
- background-color: #000000;
- text-color: white;
- expand: false;
- horizontal-align: 50%;
- placeholder: "Type to search";
- margin: 0% 0% 0% 37%;
- padding: 1.5% 5.5%;
- blink: true;
-}
-
-inputbar {
- children: [ entry ];
- background-color: #00000000;
- text-color: @bg;
- expand: false;
- border: 0% 0% 0% 0%;
- border-radius: 0px;
- border-color: @ac;
- margin: 0% 0% 0% 0%;
- padding: 1.5%;
-}
-
-listview {
- background-color: @al;
- padding: 0px;
- columns: 5;
- lines: 5;
- spacing: 0%;
- cycle: false;
- dynamic: true;
- layout: vertical;
-}
-
-mainbox {
- background-color: @al;
- border: 0% 0% 0% 0%;
- border-radius: 0% 0% 0% 0%;
- border-color: @al;
- children: [ inputbar, listview ];
- spacing: 0%;
- padding: 0%;
-}
-
-element {
- background-color: @al;
- text-color: #eeeeee;
- orientation: horizontal;
- border-radius: 5%;
- padding: 2% 1% 2% 1%;
-}
-
-element-icon {
- size: 48px;
- border: 0px;
-}
-
-element-text {
- expand: true;
- horizontal-align: 0.5;
- vertical-align: 0.5;
- margin: 0.5% 0.5% -0.5% 0.5%;
-}
-
-element selected {
- background-color: @sa;
- text-color: #ffffff;
- border: 0% 0% 0% 0%;
- border-radius: 12px;
- border-color: @al;
-}
-
-element-text selected {
- text-color: @ac;
-}
diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..f6f8d65
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,16 @@
+[user]
+ email = erikneller@gmx.de
+ name = eneller
+[alias]
+ diff-words = diff --color-words='[^[:space:]]|([[:alnum:]]|UTF_8_GUARD)+'
+ st = status
+ cm = commit
+ # TODO use git-delta
+ # the following aliases are defined as bash scripts, only here for completion
+ home = "!git-home"
+ root = "!git-root"
+ ignore = "!git-ignore"
+[color]
+ ui = auto
+[branch]
+ sort = -committerdate
diff --git a/.local/bin/git-home b/.local/bin/git-home
new file mode 100755
index 0000000..aa7c58e
--- /dev/null
+++ b/.local/bin/git-home
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# git script that will return the path of the current git project.
+# can be used to execute commands in the directory as well.
+# uses git >= 2.13 --show-superproject-working-tree
+path=$(git rev-parse --show-toplevel);
+[[ $? -ne 0 ]] && exit $?
+if [ $# -eq 0 ]; then
+ echo "$path";
+else
+ cd $path && exec "$@";
+fi
diff --git a/.local/bin/git-ignore b/.local/bin/git-ignore
new file mode 100755
index 0000000..e380a2e
--- /dev/null
+++ b/.local/bin/git-ignore
@@ -0,0 +1,122 @@
+#!/usr/bin/env bash
+
+GIT_DIR=$(git rev-parse --git-dir 2>/dev/null)
+
+function show_contents {
+ local file="${2/#~/$HOME}"
+ if [ -f "$file" ]; then
+ echo "$1 gitignore: $2" && cat "$file"
+ else
+ echo "There is no $1 .gitignore yet"
+ fi
+}
+
+function cd_to_git_root {
+ local error_level="$1"
+
+ if ! git rev-parse --git-dir &>/dev/null; then
+ if [ "$error_level" = '--warn' ]; then
+ echo "Warning: Not currently in a Git repository" >&2
+ elif [ "$error_level" = '--error' ]; then
+ echo "Error: Not currently in a Git repository" >&2
+ exit 1
+ fi
+ fi
+
+ local result=
+ if result=$(git rev-parse --show-toplevel 2>/dev/null); then
+ cd "$result" || exit
+ fi
+}
+
+function global_ignore() {
+ if ! git config --global core.excludesFile 2>/dev/null; then
+ if [ -f "$HOME/.gitignore" ]; then
+ echo "$HOME/.gitignore"
+ else
+ echo "${XDG_CONFIG_HOME:-$HOME/.config}/git/ignore"
+ fi
+ fi
+}
+
+function show_global {
+ show_contents Global "$(global_ignore)"
+}
+
+function add_global {
+ local global_gitignore
+ global_gitignore="$(global_ignore)"
+ if [ -z "$global_gitignore" ]; then
+ echo "Can't find global .gitignore."
+ echo ""
+ echo "Use 'git config --global --add core.excludesfile ~/.gitignore-global' to set the path to your global gitignore file to '~/.gitignore-global'."
+ echo ""
+ else
+ add_patterns "$global_gitignore" "$@"
+ fi
+}
+
+function show_local {
+ cd_to_git_root --warn
+ show_contents Local .gitignore
+}
+
+function add_local {
+ cd_to_git_root --warn
+ add_patterns .gitignore "$@"
+}
+
+function show_private {
+ cd_to_git_root --error
+ show_contents Private "${GIT_DIR}/info/exclude"
+}
+
+function add_private {
+ cd_to_git_root --error
+ test -d "${GIT_DIR}/info" || mkdir -p "${GIT_DIR}/info"
+ add_patterns "${GIT_DIR}/info/exclude" "$@"
+}
+
+function add_patterns {
+ echo "Adding pattern(s) to: $1"
+ local file="${1/#~/$HOME}"
+ dir_name=$(dirname "$file")
+ if [ ! -d "$dir_name" ]; then
+ mkdir -p "$dir_name"
+ fi
+ if [ -s "$file" ]; then
+ # If the content of $file doesn't end with a newline, add one
+ test "$(tail -c 1 "$file")" != "" && echo "" >> "$file"
+ fi
+ for pattern in "${@:2}"; do
+ echo "... adding '$pattern'"
+ (test -f "$file" && test "$pattern" && grep -q -F -x -- "$pattern" "$file") || echo "$pattern" >> "$file"
+ done
+}
+
+if test $# -eq 0; then
+ show_global
+ echo "---------------------------------"
+ show_local
+ echo "---------------------------------"
+ show_private
+else
+ case "$1" in
+ -l|--local)
+ test $# -gt 1 && add_local "${@:2}" && echo
+ show_local
+ ;;
+ -g|--global)
+ test $# -gt 1 && add_global "${@:2}" && echo
+ show_global
+ ;;
+ -p|--private)
+ test $# -gt 1 && add_private "${@:2}" && echo
+ show_private
+ ;;
+ *)
+ add_local "$@"
+ ;;
+ esac
+fi
+
diff --git a/.local/bin/git-root b/.local/bin/git-root
new file mode 100755
index 0000000..d91c1ef
--- /dev/null
+++ b/.local/bin/git-root
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# git script that will return the root path of a git project, even if currently in a submodule.
+# can be used to execute commands in the root directory as well.
+# uses git >= 2.13 --show-superproject-working-tree
+path=$(git rev-parse --show-superproject-working-tree)
+[[ $? -ne 0 ]] && exit $?
+if [ -z "$path" ]; then
+ path=$(git rev-parse --show-toplevel);
+fi
+if [ $# -eq 0 ]; then
+ echo "$path";
+else
+ cd $path && exec "$@";
+fi
diff --git a/.zshrc b/.zshrc
index 5f74e46..4f868f2 100644
--- a/.zshrc
+++ b/.zshrc
@@ -528,3 +528,4 @@ alias personal='cp -Rf /personal/* ~'
#cpufetch
#colorscript random
#hyfetch
+alias dotfiles='git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'