diff --git a/installed_packages/core/AUR b/installed_packages/core/AUR
index 03f5291..5a76969 100644
--- a/installed_packages/core/AUR
+++ b/installed_packages/core/AUR
@@ -1,9 +1,7 @@
azote
bitwarden-bin
-libspotify
nerd-fonts-source-code-pro
-nwg-launchers
-python-pyspotify
slack-desktop
spotify
-todoist-electron
+todoist-appimage
+ulauncher
diff --git a/installed_packages/core/Arch b/installed_packages/core/Arch
index b8a7fb1..4c3adab 100644
--- a/installed_packages/core/Arch
+++ b/installed_packages/core/Arch
@@ -18,9 +18,7 @@ flex
gcc
git
gnome-themes-extra
-grub
gtk-chtheme
-intel-ucode
kdeconnect
libtool
linux
@@ -33,9 +31,7 @@ mesa
ncmpcpp
neovim
newsboat
-ntfs-3g
openssh
-os-prober
patch
pkgconf
pulseaudio
@@ -43,7 +39,6 @@ pulseaudio-alsa
python-pip
python2
python2-pip
-ranger
sudo
sway
swayidle
diff --git a/symlinks/config/JetBrains/IdeaIC2020.3/.updated_plugins_list b/symlinks/config/JetBrains/IdeaIC2020.3/.updated_plugins_list
deleted file mode 100644
index d252f67..0000000
--- a/symlinks/config/JetBrains/IdeaIC2020.3/.updated_plugins_list
+++ /dev/null
@@ -1 +0,0 @@
-org.jetbrains.kotlin
diff --git a/symlinks/config/JetBrains/IdeaIC2020.3/codestyles/Default.xml b/symlinks/config/JetBrains/IdeaIC2020.3/codestyles/Default.xml
index 4ed4138..dcfd02e 100644
--- a/symlinks/config/JetBrains/IdeaIC2020.3/codestyles/Default.xml
+++ b/symlinks/config/JetBrains/IdeaIC2020.3/codestyles/Default.xml
@@ -1,5 +1,11 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/symlinks/config/JetBrains/IdeaIC2020.3/options/editor.xml b/symlinks/config/JetBrains/IdeaIC2020.3/options/editor.xml
index 6d09e85..e4864d2 100644
--- a/symlinks/config/JetBrains/IdeaIC2020.3/options/editor.xml
+++ b/symlinks/config/JetBrains/IdeaIC2020.3/options/editor.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/symlinks/config/JetBrains/IdeaIC2020.3/options/ui.lnf.xml b/symlinks/config/JetBrains/IdeaIC2020.3/options/ui.lnf.xml
new file mode 100644
index 0000000..457ce15
--- /dev/null
+++ b/symlinks/config/JetBrains/IdeaIC2020.3/options/ui.lnf.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/symlinks/config/nvim/lua/plugin/dap.lua b/symlinks/config/nvim/lua/plugin/dap.lua
index aea6df2..6b4d131 100644
--- a/symlinks/config/nvim/lua/plugin/dap.lua
+++ b/symlinks/config/nvim/lua/plugin/dap.lua
@@ -28,7 +28,7 @@ vim.g.dap_virtual_text = true
-- Keymaps
local function set_keymap(...) vim.api.nvim_set_keymap(...) end
-default_opts = {noremap = true, silent = true}
+local default_opts = {noremap = true, silent = true}
set_keymap('n', 'db', "lua require'dap'.toggle_breakpoint()", default_opts)
set_keymap('n', 'dc', "lua require'dap'.continue()", default_opts)
set_keymap('n', 'dso', "lua require'dap'.step_over()", default_opts)
diff --git a/symlinks/config/nwg-launchers/nwgbar/bar.json b/symlinks/config/nwg-launchers/nwgbar/bar.json
deleted file mode 100644
index a2189fc..0000000
--- a/symlinks/config/nwg-launchers/nwgbar/bar.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
- {
- "name": "Lock screen",
- "exec": "~/bin/lockscreen",
- "icon": "system-lock-screen"
- },
- {
- "name": "Logout",
- "exec": "swaymsg exit",
- "icon": "system-log-out"
- },
- {
- "name": "Reboot",
- "exec": "systemctl reboot",
- "icon": "system-reboot"
- },
- {
- "name": "Shutdown",
- "exec": "systemctl -i poweroff",
- "icon": "system-shutdown"
- }
-]
diff --git a/symlinks/config/nwg-launchers/nwgbar/style.css b/symlinks/config/nwg-launchers/nwgbar/style.css
deleted file mode 100644
index 871ec03..0000000
--- a/symlinks/config/nwg-launchers/nwgbar/style.css
+++ /dev/null
@@ -1,28 +0,0 @@
-#bar {
- margin: 30px /* affects top/bottom & left/right alignment */
-}
-
-button, image {
- background: none;
- border-style: none;
- box-shadow: none;
- color: #999
-}
-
-button {
- padding-left: 10px;
- padding-right: 10px;
- margin: 5px
-}
-
-button:hover {
- background-color: rgba (255, 255, 255, 0.1)
-}
-
-button:focus {
- box-shadow: 0 0 2px;
-}
-
-grid {
- /* e.g. for common background to all buttons */
-}
diff --git a/symlinks/config/nwg-launchers/nwgdmenu/style.css b/symlinks/config/nwg-launchers/nwgdmenu/style.css
deleted file mode 100644
index fd063d6..0000000
--- a/symlinks/config/nwg-launchers/nwgdmenu/style.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Don't delete, just in case: the menu anchor is a button */
-button {
- background: none;
- border-style: none;
- box-shadow: none;
-}
-
-box {
- /* Uncomment to set vertical margin
- margin-top: 30px;
- margin-bottom: 30px;
- */
-}
-
-#searchbox {
- /* Adjust to your taste */
-}
-
-/* Menu items */
-label {
- padding-left: 5px
-}
diff --git a/symlinks/config/nwg-launchers/nwggrid/style.css b/symlinks/config/nwg-launchers/nwggrid/style.css
deleted file mode 100644
index ba8c143..0000000
--- a/symlinks/config/nwg-launchers/nwggrid/style.css
+++ /dev/null
@@ -1,39 +0,0 @@
-button, label, image {
- background: none;
- border-style: none;
- box-shadow: none;
- color: #999;
-}
-
-button {
- padding: 5px;
- margin: 5px
-}
-
-button:hover {
- background-color: rgba (255, 255, 255, 0.1);
-}
-
-button:focus {
- box-shadow: 0 0 2px;
-}
-
-#searchbox {
- background: none;
- border-color: #999;
- color: #ccc;
- margin-top: 20px;
- margin-bottom: 20px
-}
-
-#separator {
- background-color: rgba(200, 200, 200, 0.5);
- margin-left: 500px;
- margin-right: 500px;
- margin-top: 10px;
- margin-bottom: 10px
-}
-
-#description {
- margin-bottom: 20px
-}
diff --git a/symlinks/config/nwg-launchers/nwggrid/terminal b/symlinks/config/nwg-launchers/nwggrid/terminal
deleted file mode 100644
index af3808e..0000000
--- a/symlinks/config/nwg-launchers/nwggrid/terminal
+++ /dev/null
@@ -1 +0,0 @@
-alacritty -e
\ No newline at end of file
diff --git a/symlinks/config/sway/conf.d/01_default_tools b/symlinks/config/sway/conf.d/01_default_tools
index bcb9b3f..fd04ad3 100644
--- a/symlinks/config/sway/conf.d/01_default_tools
+++ b/symlinks/config/sway/conf.d/01_default_tools
@@ -1,6 +1,6 @@
# Main tools mapping
set $term alacritty
-set $menu "wofi -G -modi drun,run --show drun"
+set $menu "ulauncher"
set $filemanager thunar
set $processviewer $term -e htop
diff --git a/symlinks/config/sway/conf.d/91_mediakeys b/symlinks/config/sway/conf.d/91_mediakeys
index a4389ac..b8e436e 100644
--- a/symlinks/config/sway/conf.d/91_mediakeys
+++ b/symlinks/config/sway/conf.d/91_mediakeys
@@ -5,5 +5,6 @@ bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
bindsym XF86MonBrightnessUp exec brightnessctl set +5%
bindsym XF86AudioPlay exec playerctl play-pause
+bindsym XF86AudioStop exec playerctl play-pause
bindsym XF86AudioNext exec playerctl next
bindsym XF86AudioPrev exec playerctl previous
diff --git a/symlinks/config/sway/config b/symlinks/config/sway/config
index fc42510..77e089f 100644
--- a/symlinks/config/sway/config
+++ b/symlinks/config/sway/config
@@ -1,6 +1,5 @@
# Read `man 5 sway` for a complete reference.
-# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
exec ~/.azotebg
# Font for window titles. Will also be used by the bar unless a different font
@@ -21,6 +20,7 @@ for_window [window_role="Preferences"] floating enable
for_window [window_type="dialog"] floating enable
for_window [window_type="menu"] floating enable
for_window [window_role="About"] floating enable
+for_window [app_id="ulauncher"] border none
include ~/.config/sway/conf.d/*
include /etc/sway/config.d/*
diff --git a/symlinks/config/ulauncher/extensions.json b/symlinks/config/ulauncher/extensions.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/symlinks/config/ulauncher/extensions.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/symlinks/config/ulauncher/settings.json b/symlinks/config/ulauncher/settings.json
new file mode 100644
index 0000000..d66c49e
--- /dev/null
+++ b/symlinks/config/ulauncher/settings.json
@@ -0,0 +1,11 @@
+{
+ "blacklisted-desktop-dirs": "/usr/share/locale:/usr/share/app-install:/usr/share/kservices5:/usr/share/fk5:/usr/share/kservicetypes5:/usr/share/applications/screensavers:/usr/share/kde4:/usr/share/mimelnk",
+ "clear-previous-query": true,
+ "grab-mouse-pointer": false,
+ "hotkey-show-app": "Super_Lspace",
+ "render-on-screen": "mouse-pointer-monitor",
+ "show-indicator-icon": true,
+ "show-recent-apps": "0",
+ "terminal-command": "",
+ "theme-name": "dark"
+}
diff --git a/symlinks/config/ulauncher/shortcuts.json b/symlinks/config/ulauncher/shortcuts.json
new file mode 100644
index 0000000..a8ca6d8
--- /dev/null
+++ b/symlinks/config/ulauncher/shortcuts.json
@@ -0,0 +1,22 @@
+{
+ "feb919a9-ec3f-41dd-8cee-07be86cc0901": {
+ "id": "feb919a9-ec3f-41dd-8cee-07be86cc0901",
+ "name": "Stack Overflow",
+ "keyword": "so",
+ "cmd": "http://stackoverflow.com/search?q=%s",
+ "icon": "/usr/share/ulauncher/media/stackoverflow-icon.svg",
+ "is_default_search": true,
+ "run_without_argument": false,
+ "added": 1615309537.084131
+ },
+ "a61d5cbd-4e61-45ff-ae0e-a08e8f9242f5": {
+ "id": "a61d5cbd-4e61-45ff-ae0e-a08e8f9242f5",
+ "name": "Wikipedia",
+ "keyword": "wiki",
+ "cmd": "https://en.wikipedia.org/wiki/%s",
+ "icon": "/usr/share/ulauncher/media/wikipedia-icon.png",
+ "is_default_search": true,
+ "run_without_argument": false,
+ "added": 1615309537.0841668
+ }
+}
\ No newline at end of file
diff --git a/symlinks/config/waybar/config b/symlinks/config/waybar/config
index 39dc953..77b05b3 100644
--- a/symlinks/config/waybar/config
+++ b/symlinks/config/waybar/config
@@ -39,8 +39,7 @@
"battery",
"tray",
"idle_inhibitor",
- "custom/power-menu",
- "custom/apps-menu"
+ "custom/power-menu"
],
@@ -190,12 +189,6 @@
"custom/power-menu": {
"tooltip": false,
"format": "",
- "on-click": "nwgbar"
+ "on-click": "wlogout"
},
-
- "custom/apps-menu": {
- "tooltip": false,
- "format": "",
- "on-click": "nwggrid"
- }
}
diff --git a/symlinks/config/wlogout/layout b/symlinks/config/wlogout/layout
new file mode 100644
index 0000000..e0c8814
--- /dev/null
+++ b/symlinks/config/wlogout/layout
@@ -0,0 +1,36 @@
+{
+ "label" : "lock",
+ "action" : "~/bin/lockscreen",
+ "text" : "Lock screen",
+ "keybind" : "l"
+}
+{
+ "label" : "hibernate",
+ "action" : "systemctl hibernate",
+ "text" : "Hibernate",
+ "keybind" : "h"
+}
+{
+ "label" : "logout",
+ "action" : "swaymsg exit",
+ "text" : "Logout",
+ "keybind" : "e"
+}
+{
+ "label" : "shutdown",
+ "action" : "systemctl poweroff",
+ "text" : "Shutdown",
+ "keybind" : "s"
+}
+{
+ "label" : "suspend",
+ "action" : "systemctl suspend",
+ "text" : "Suspend",
+ "keybind" : "u"
+}
+{
+ "label" : "reboot",
+ "action" : "systemctl reboot",
+ "text" : "Reboot",
+ "keybind" : "r"
+}
diff --git a/symlinks/config/wlogout/style.css b/symlinks/config/wlogout/style.css
new file mode 100644
index 0000000..b076b72
--- /dev/null
+++ b/symlinks/config/wlogout/style.css
@@ -0,0 +1,44 @@
+* {
+ background-image: none;
+}
+window {
+ background-color: rgba(12, 12, 12, 0.5);
+}
+button {
+ color: #FFFFFF;
+ background-color: #1E1E1E;
+ border-style: solid;
+ border-width: 2px;
+ background-repeat: no-repeat;
+ background-position: center;
+ background-size: 25%;
+}
+
+button:focus, button:active, button:hover {
+ background-color: #3700B3;
+ outline-style: none;
+}
+
+#lock {
+ background-image: image(url("/usr/share/wlogout/icons/lock.png"), url("/usr/local/share/wlogout/icons/lock.png"));
+}
+
+#logout {
+ background-image: image(url("/usr/share/wlogout/icons/logout.png"), url("/usr/local/share/wlogout/icons/logout.png"));
+}
+
+#suspend {
+ background-image: image(url("/usr/share/wlogout/icons/suspend.png"), url("/usr/local/share/wlogout/icons/suspend.png"));
+}
+
+#hibernate {
+ background-image: image(url("/usr/share/wlogout/icons/hibernate.png"), url("/usr/local/share/wlogout/icons/hibernate.png"));
+}
+
+#shutdown {
+ background-image: image(url("/usr/share/wlogout/icons/shutdown.png"), url("/usr/local/share/wlogout/icons/shutdown.png"));
+}
+
+#reboot {
+ background-image: image(url("/usr/share/wlogout/icons/reboot.png"), url("/usr/local/share/wlogout/icons/reboot.png"));
+}
diff --git a/symlinks/ideavimrc b/symlinks/ideavimrc
index 4cacd4a..4f4b952 100644
--- a/symlinks/ideavimrc
+++ b/symlinks/ideavimrc
@@ -10,6 +10,9 @@ set ideajoin
set idearefactormode=keep
" IdeaVIM mappings
+nnoremap [c :action VcsShowPrevChangeMarker
+nnoremap ]c :action VcsShowNextChangeMarker
+
nnoremap :action SearchEverywhere
nnoremap gd :action GotoDeclaration
nnoremap gi :action GotoImplementation
@@ -21,6 +24,9 @@ nnoremap tf :action RunClass
inoremap :action ParameterInfo
nnoremap :action ParameterInfo
+nnoremap db :action ToggleLineBreakpoint
+nnoremap dc :action ChooseDebugConfiguration
+
nnoremap ac :action ShowIntentionActions
command! Start action Run