diff --git a/.config/awesome/jupiter_menu.lua b/.config/awesome/jupiter_menu.lua index 6f9fd94f..e7f7f063 100644 --- a/.config/awesome/jupiter_menu.lua +++ b/.config/awesome/jupiter_menu.lua @@ -9,7 +9,7 @@ accessoriesmenu = { { "freemind", "/usr/bin/freemind", "/usr/share/icons/hicolor/32x32/apps/freemind.png" }, { "gscriptor", "/usr/bin/gscriptor", "/usr/share/icons/hicolor/48x48/apps/gcr-smart-card.png" }, { "gvim", "/usr/bin/gvim", "/usr/share/icons/hicolor/48x48/apps/gvim.png" }, - { "lector", "/usr/bin/lector", "/usr/share/icons/hicolor/scalable/apps/Lector.png" }, + --{ "lector", "/usr/bin/lector", "/usr/share/icons/hicolor/scalable/apps/Lector.png" }, { "pluma", "/usr/bin/pluma", "/usr/share/icons/Vimix/scalable/apps/gedit-icon.svg" }, { "regexxer", "/usr/bin/regexxer", "/usr/share/icons/hicolor/48x48/apps/regexxer.png" }, { "retext", "/usr/bin/retext", "/usr/share/icons/hicolor/48x48/apps/retext.png" }, @@ -31,14 +31,20 @@ communicationmenu = { { "skype", "/usr/bin/skypeforlinux", "/usr/share/pixmaps/skypeforlinux.png" }, { "teams", "/usr/bin/teams", "/usr/share/pixmaps/teams.png" }, { "telegram", "/usr/bin/telegram-desktop", "/usr/share/icons/hicolor/48x48/apps/telegram.png" }, + { "whatsapp", "/usr/bin/whatsapp-for-linux", "/usr/share/icons/hicolor/32x32/apps/com.github.eneshecan.WhatsAppForLinux.png" }, { "zoom", "/usr/bin/zoom", "/usr/share/pixmaps/application-x-zoom.png" }, } +databasemenu = { + { "dbeaver", "/usr/bin/dbeaver", "/usr/share/icons/hicolor/48x48/apps/dbeaver.png" }, + { "mysql workbench", "/usr/bin/mysql-workbench", "/usr/share/icons/hicolor/48x48/apps/mysql-workbench.png" }, + { "resp.app", "/usr/bin/resp", "/usr/share/pixmaps/resp.png" }, + { "sqlitebrowser", "/usr/bin/sqlitebrowser", "/usr/share/icons/hicolor/256x256/apps/sqlitebrowser.png" }, +} developmentmenu = { { "android studio", "/usr/bin/android-studio", "/usr/share/pixmaps/android-studio.png" }, { "anjuta", "/usr/bin/anjuta", "/usr/share/icons/hicolor/48x48/apps/anjuta.png" }, { "codeblocks", "/usr/bin/codeblocks", "/usr/share/icons/hicolor/64x64/apps/codeblocks.png" }, { "cmake gui", "/usr/bin/cmake-gui", "/usr/share/icons/hicolor/64x64/apps/cmake.png" }, - { "dbeaver", "/usr/bin/dbeaver", "/usr/share/icons/hicolor/48x48/apps/dbeaver.png" }, { "ddd", "/usr/bin/ddd", "/usr/share/pixmaps/ddd.xpm" }, { "eric", "/usr/bin/eric6", "/usr/share/icons/hicolor/48x48/apps/eric.png" }, { "fluid", "/usr/bin/fluid", "/usr/share/icons/hicolor/48x48/apps/fluid.png" }, @@ -48,12 +54,11 @@ developmentmenu = { { "lazarus", "/usr/bin/lazarus", "/usr/lib/lazarus/images/ide_icon48x48.png" }, { "liteide", "/usr/bin/liteide", "/usr/share/pixmaps/liteide.png" }, { "meld", "/usr/bin/meld", "/usr/share/icons/hicolor/scalable/apps/org.gnome.meld.svg" }, - { "mysql workbench", "/usr/bin/mysql-workbench", "/usr/share/icons/hicolor/48x48/apps/mysql-workbench.png" }, { "netbeans", "/usr/bin/netbeans", "/usr/share/pixmaps/netbeans.png" }, + { "pycharm", "/usr/bin/pycharm", "/usr/share/pycharm/bin/pycharm.svg" }, { "qgit", "/usr/bin/qgit", "/usr/share/icons/hicolor/48x48/apps/qgit.png" }, { "qtcreator", "/usr/bin/qtcreator", "/usr/share/icons/hicolor/48x48/apps/QtProject-qtcreator.png" }, { "sasm", "/usr/bin/sasm", "/usr/share/sasm/sasm.png" }, - { "sqlitebrowser", "/usr/bin/sqlitebrowser", "/usr/share/icons/hicolor/256x256/apps/sqlitebrowser.png" }, { "thonny", "/usr/bin/thonny", "/usr/share/icons/hicolor/48x48/apps/org.thonny.Thonny.png" }, { "wxformbuilder", "/usr/bin/wxformbuilder", "/usr/share/pixmaps/wxformbuilder.png" }, { "wxglade", "/usr/bin/wxglade", "/usr/share/icons/hicolor/32x32/apps/wxglade.png" }, @@ -78,7 +83,7 @@ engineeringmenu = { } gamesmenu = { { "0 a.d.", "/usr/bin/0ad", "/usr/share/pixmaps/0ad.png" }, - { "flightgear", "/usr/bin/fgfs --launcher", "/usr/share/icons/hicolor/scalable/apps/flightgear.svg" }, + --{ "flightgear", "/usr/bin/fgfs --launcher", "/usr/share/icons/hicolor/scalable/apps/flightgear.svg" }, { "kobodeluxe", "/usr/bin/kobodl", "/usr/share/icons/hicolor/48x48/apps/kobodl.png" }, { "lutris", "/usr/bin/lutris", "/usr/share/icons/hicolor/scalable/apps/lutris.svg" }, { "neverball", "/usr/bin/neverball", "/usr/share/icons/hicolor/48x48/apps/neverball.png" }, @@ -134,6 +139,7 @@ internetmenu = { } multimediamenu = { { "acidrip", "/usr/bin/acidrip", "/usr/share/icons/Vimix/scalable/apps/acidrip.svg" }, + { "audex", "/usr/bin/audex", "/usr/share/icons/hicolor/48x48/apps/audex.png" }, { "brasero", "/usr/bin/brasero", "/usr/share/icons/hicolor/48x48/apps/brasero.png" }, { "demon editor", "/usr/bin/demon-editor", "/usr/share/icons/hicolor/scalable/apps/demon-editor.svg" }, { "handbrake", "/usr/bin/ghb", "/usr/share/icons/hicolor/scalable/apps/hb-icon.svg" }, @@ -143,6 +149,7 @@ multimediamenu = { { "mediathekview", "/home/hanez/opt/MediathekView/MediathekView", "/home/hanez/opt/MediathekView/MediathekView.svg" }, { "spotiflyer", "/opt/spotiflyer/bin/SpotiFlyer", "/opt/spotiflyer/lib/SpotiFlyer.png" }, { "spotify", "/usr/bin/spotify-tray", "/usr/share/pixmaps/spotify-client.png" }, + { "sound juicer", "/usr/bin/sound-juicer", "/usr/share/icons/hicolor/48x48/apps/org.gnome.SoundJuicer.png" }, { "tvbrowser", "/usr/bin/tvbrowser", "/usr/share/icons/hicolor/48x48/apps/tvbrowser.png" }, { "vlc", "/usr/bin/vlc", "/usr/share/icons/hicolor/48x48/apps/vlc.png" }, } @@ -168,6 +175,7 @@ officemenu = { } privacymenu = { { "ausweisapp 2", "/usr/bin/AusweisApp2", "/usr/share/icons/hicolor/scalable/apps/AusweisApp2.svg" }, + { "cryptomator", "/usr/bin/cryptomator", "/usr/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.svg" }, { "gnu privacy agent", "/usr/bin/gpa", "/usr/share/pixmaps/gpa.png" }, { "keepassxc", "/usr/bin/keepassxc", "/usr/share/icons/hicolor/scalable/apps/keepassxc.svg" }, { "kleopatra", "/usr/bin/kleopatra", "/usr/share/icons/hicolor/48x48/apps/kleopatra.png" }, @@ -175,6 +183,7 @@ privacymenu = { { "seahorse", "/usr/bin/seahorse", "/usr/share/icons/hicolor/scalable/apps/org.gnome.seahorse.Application.svg" }, { "tor browser", "/usr/bin/tor-browser", "/usr/share/icons/hicolor/scalable/apps/tor-browser.svg" }, { "veracrypt", "/usr/bin/veracrypt", "/usr/share/icons/hicolor/scalable/apps/tor-browser.svg" }, + { "yubikey athenticator", "/usr/bin/yubioath-desktop", "/usr/share/pixmaps/com.yubico.yubioath.svg" }, { "yubikey manager", "/usr/bin/ykman-gui", "/usr/share/pixmaps/ykman.png" }, { "yubikey personalization tool", "/usr/bin/yubikey-personalization-gui", "/usr/share/icons/hicolor/48x48/apps/yubikey-personalization-gui.png" }, { "yubikey piv manager", "/usr/bin/pivman", "/usr/share/pixmaps/pivman.xpm" }, @@ -224,6 +233,7 @@ mainmenu = awful.menu({ items = { { "accessories", accessoriesmenu, "/usr/share/icons/Adwaita/22x22/legacy/applications-accessories.png" }, { "audio", audiomenu, "/home/hanez/.config/awesome/icons/synth2.png" }, { "communication", communicationmenu, icondir.."actions/quote.png" }, + { "database", databasemenu, "/usr/share/icons/Adwaita/22x22/legacy/applications-development.png" }, { "development", developmentmenu, "/usr/share/icons/Adwaita/22x22/legacy/applications-development.png" }, { "engineering", engineeringmenu, "/usr/share/icons/Adwaita/22x22/legacy/applications-engineering.png" }, { "games", gamesmenu, "/usr/share/icons/Adwaita/22x22/legacy/applications-games.png" }, @@ -240,9 +250,10 @@ mainmenu = awful.menu({ items = { { "utilities", utilitiesmenu, "/usr/share/icons/Adwaita/22x22/legacy/applications-utilities.png" }, { "video", videomenu, "/usr/share/icons/Adwaita/48x48/legacy/camera-video.png" }, { "wine", windowsmenu, "" }, - { "filemanager", "/usr/bin/nemo", "/usr/share/icons/Adwaita/22x22/legacy/system-file-manager.png" }, - { "terminal (xterm)", terminal, "/usr/share/icons/Adwaita/22x22/legacy/utilities-terminal.png" }, + { "filemanager (nemo)", "/usr/bin/nemo", "/usr/share/icons/Adwaita/22x22/legacy/system-file-manager.png" }, + { "filemanager (thunar)", "/usr/bin/thunar", "/usr/share/icons/Adwaita/22x22/legacy/system-file-manager.png" }, { "terminal (xfce4)", "/usr/bin/xfce4-terminal", "/usr/share/icons/Adwaita/22x22/legacy/utilities-terminal.png" }, + { "terminal (xterm)", terminal, "/usr/share/icons/Adwaita/22x22/legacy/utilities-terminal.png" }, { "configuration", editor_cmd .. " " .. awesome.conffile, "/usr/share/icons/Adwaita/22x22/legacy/preferences-other.png" }, { "reload", awesome.restart, "/usr/share/icons/Adwaita/22x22/legacy/view-refresh.png" }, { "suspend", function () awful.util.spawn("/usr/bin/loginctl suspend") end, "/usr/share/icons/Faenza-Dark/apps/48/system-suspend.png" }, diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 24b27e5b..8fa44285 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -76,7 +76,8 @@ end -- This is used later as the default terminal and editor to run. -terminal = '/usr/bin/uxterm -bg black -fg grey -sb -leftbar -si -bc -cr orange -fa "'..config.font_xterm..'" -fs '..config.font_xterm_size +terminal = '/usr/bin/uxterm -bg black -fg grey -sb -leftbar -si -bc -cr orange -fa "'..config.font_xterm..'" -fs "'..config.font_xterm_size..'"' +xterminal = "/usr/bin/xfce4-terminal" editor = "/usr/bin/vim" editor_cmd = terminal .. " -e " .. editor @@ -383,7 +384,7 @@ globalkeys = gears.table.join( -- Standard program awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end, { description = "open a terminal", group = "launcher"}), - awful.key({ modkey, "Control" }, "Return", function () awful.util.spawn("/usr/bin/xfce4-terminal") end, + awful.key({ modkey, "Control" }, "Return", function () awful.util.spawn(xterminal) end, { description = "open a terminal", group = "launcher"}), awful.key({ modkey, "Control" }, "r", awesome.restart, { description = "reload awesome", group = "awesome"}), @@ -585,10 +586,15 @@ awful.rules.rules = { } }, properties = { floating = true }}, - -- Add titlebars to normal clients and dialogs - { rule_any = {type = { "normal", "dialog" } - }, properties = { titlebars_enabled = config.titlebars_enabled } + -- Do not add titlebars to normal clients + { rule_any = {type = { "normal" } + }, properties = { titlebars_enabled = config.titlebars_enabled_normal } }, + -- Add titlebars to dialogs + { rule_any = {type = { "dialog" } + }, properties = { titlebars_enabled = config.titlebars_enabled_dialog } + }, + -- Set Firefox to always map on the tag named "2" on screen 1. -- { rule = { class = "Firefox" }, diff --git a/.gitignore b/.gitignore index d5f74a44..4d0a17a3 100644 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,7 @@ !.zsh !.zsh/** !.zshrc +!.zsh_functions.zsh !README.md diff --git a/.zsh_functions.zsh b/.zsh_functions.zsh new file mode 100644 index 00000000..0078afdb --- /dev/null +++ b/.zsh_functions.zsh @@ -0,0 +1,14 @@ +tmx () { + # Use -d to allow the rest of the function to run + tmux new-session -d -s "CMD" + tmux new-window + # -d to prevent current window from changing + #tmux new-window -d + #tmux new-window -d + #tmux new-window -d + #tmux new-window -d + # -d to detach any other client (which there shouldn't be, + # since you just created the session). + tmux attach-session -d -t "CMD" +} + diff --git a/.zshrc b/.zshrc index d972af2d..7eb16ca9 100644 --- a/.zshrc +++ b/.zshrc @@ -5,9 +5,16 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" fi +if [[ -r $HOME/.zsh_functions.zsh ]]; then + source $HOME/.zsh_functions.zsh +fi + # Extend my $PATH to $HOME/bin export PATH=$HOME/bin:$HOME/.gem/ruby/3.0.0/bin:$HOME/.android/sdk/platform-tools:$PATH +# Private stuff +source /home/hanez/.zsh_private + # Java Stuff export JAVA_HOME=/usr/lib/jvm/java-8-openjdk @@ -115,7 +122,6 @@ alias ll='ls --color -l' alias lla='ls -la --color' alias llh='ls -lh --color' alias llah='ls -lah --color' -alias lsd='ls -ld --color' alias vi=vim alias y=yaourt alias xterm=$TERMINAL @@ -130,13 +136,6 @@ alias gitd='git diff' alias gitp='git push' alias gits='git status' -# SSH Host aliases -alias a.systemchaos.org='ssh a.systemchaos.org' -alias c.systemchaos.org='ssh c.systemchaos.org' -alias d.systemchaos.org='ssh d.systemchaos.org' -alias e.systemchaos.org='ssh e.systemchaos.org' -alias onionpi='ssh onionpi' - # I use xterm and this sets a nice title with hostname and cwd in it. case $TERM in linux)