commit 15856c21160e2849c86b9a676e2af12c4f0e19f4
parent 6948a28f5c88db572e30e7768cbb44f8a67af532
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Tue, 22 Feb 2022 10:50:49 +0100
Merge branch 'master' of a3nm.net:git/myconfig
Diffstat:
11 files changed, 174 insertions(+), 47 deletions(-)
diff --git a/Xdefaults b/Xdefaults
@@ -41,7 +41,8 @@ URxvt.keysym.M-y: perl:keyboard-select:activate
#URxvt.keysym.M-v: perl:clipboard:paste
#URxvt.keysym.M-C-v: perl:clipboard:paste_escaped
#URxvt.urlLauncher: w3mn
-URxvt.urlLauncher: sandboxed-browser
+#URxvt.urlLauncher: sandboxed-browser
+URxvt.urlLauncher: firefox
URxvt.keysym.M-j: command:\033]720;23\007
URxvt.keysym.M-k: command:\033]721;23\007
URxvt.print-pipe: cat > ~/temp/urxvt.dmp
diff --git a/apt/desktop b/apt/desktop
@@ -170,6 +170,7 @@ wireshark
geoip-database-extra
# nautilus # useless services
+thunar
# gvfs-backends
xorg
@@ -178,7 +179,7 @@ xserver-xorg-legacy # for legacy drivers
seahorse # manage keys etc.
pulseaudio
-rtkit # realtime?
+# rtkit # realtime?
acpi-support # only for laptops, because it depends on X
@@ -194,3 +195,4 @@ jmtpfs # retrieve photo from weird stuff
xawtv # adjust webcam brightness
+libjpeg-progs # jpeg lossless handling
diff --git a/apt/minimal b/apt/minimal
@@ -142,3 +142,6 @@ isc-dhcp-common # manpages
os-prober # for grub
nocache
+
+software-properties-common # add-apt-repository
+
diff --git a/apt/misc b/apt/misc
@@ -37,7 +37,7 @@ pkg-config
potrace
rkhunter
rlwrap
-# tmux -- i don't really use it
+tmux # i don't really use it
units
xsltproc
mscompress
diff --git a/apt/python b/apt/python
@@ -81,3 +81,13 @@ libjpeg-dev # for python-imageio for songflower
python3-apt # for git/debdu
2to3
+
+ipython3
+
+python3-psycopg2
+python3-wtforms
+
+python3-pypdf2
+python3-bibtexparser
+
+
diff --git a/apt/sage b/apt/sage
@@ -0,0 +1,2 @@
+sagemath
+maxima-share
diff --git a/install.sh b/install.sh
@@ -46,7 +46,7 @@ ln -s ~/config/elinks ~/.elinks/elinks.conf
ln -s ~/config/w3m ~/.w3m/config
mkdir -p ~/.config/rofi
-ln -s ~/config/rofi ~/.config/rofi/config
+ln -s ~/config/rofi ~/.config/rofi/config.rasi
for app in vim zsh
do
diff --git a/mailcap b/mailcap
@@ -1,5 +1,5 @@
-application/pdf; ~/bin/mutt_bgrun /usr/bin/evince '%s'; test=test "$DISPLAY" != ""; description=Portable Document Format; nametemplate=%s.pdf
-application/x-pdf; ~/bin/mutt_bgrun /usr/bin/evince '%s'; test=test "$DISPLAY" != ""; description=Portable Document Format; nametemplate=%s.pdf
+application/pdf; ~/bin/mutt_bgrun_evince '%s'; test=test "$DISPLAY" != ""; description=Portable Document Format; nametemplate=%s.pdf
+application/x-pdf; ~/bin/mutt_bgrun_evince '%s'; test=test "$DISPLAY" != ""; description=Portable Document Format; nametemplate=%s.pdf
image/gif; /usr/bin/mplayer '%s'
image/*; /usr/bin/feh -.Z '%s'
diff --git a/rofi b/rofi
@@ -1,11 +1,148 @@
-rofi.width: 100
-rofi.location: 2
-rofi.color-normal: #000000, #FFFFFF, #222222, #008800, #FFFFFF
-rofi.color-urgent: #000000, #FFFFFF, #222222, #008800, #FFFFFF
-rofi.color-active: #000000, #FFFFFF, #222222, #008800, #FFFFFF
-rofi.color-window: #000000, #002b36, #002b36
-rofi.kb-row-select: Tab
-rofi.kb-row-tab: Shift+space
-# lazy-grab makes rofi show on keydown
-# rofi.terminal reconfigured to something that depends on $HOME
-# cannot be configured here, workaround in ~/bin/my-rofi
+configuration {
+
+/* modi: "window,run,ssh";*/
+/* font: "mono 12";*/
+/* location: 0;*/
+/* 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} [<span weight='light' size='small'><i>({generic})</i></span>]";*/
+/* 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-modi: "window,run";*/
+/* matching: "normal";*/
+/* tokenize: true;*/
+/* m: "-5";*/
+/* filter: ;*/
+/* dpi: -1;*/
+/* threads: 0;*/
+/* scroll-method: 0;*/
+/* window-format: "{w} {c} {t}";*/
+/* click-to-exit: true;*/
+/* theme: ;*/
+/* 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;*/
+/* steal-focus: false;*/
+/* application-fallback-icon: ;*/
+/* pid: "/run/user/1337/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,ISO_Left_Tab";*/
+/* kb-row-down: "Down,Control+n";*/
+ kb-row-tab: "Control+space";
+/* 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: "Tab";
+/* 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";*/
+ timeout {
+ action: "kb-cancel";
+ delay: 0;
+ }
+ filebrowser {
+ directories-first: true;
+ sorting-method: "name";
+ }
+}
diff --git a/screenrc b/screenrc
@@ -9,32 +9,3 @@ startup_message off
#dynamic title
shelltitle '$ |bash'
-#TODO be nice
-#TODO can we use colors?
-#TODO optimize this!
-#TODO use some other existing tool which is independent from screen
-#backtick 1 0 0 /home/a3_nm/scripts/screen/cpu
-#backtick 2 0 0 /home/a3_nm/scripts/screen/ram
-#backtick 3 0 0 /home/a3_nm/scripts/screen/swap
-#backtick 4 0 0 /home/a3_nm/scripts/screen/load
-#backtick 5 0 0 /home/a3_nm/scripts/screen/df
-#backtick 6 0 0 /home/a3_nm/scripts/screen/net RX
-#backtick 7 0 0 /home/a3_nm/scripts/screen/net TX
-#backtick 8 0 0 /home/a3_nm/scripts/screen/disk 6 #i
-#backtick 9 0 0 /home/a3_nm/scripts/screen/disk 7 #o
-#backtick 10 0 0 /home/a3_nm/scripts/screen/temp #o
-#backtick 11 0 0 /home/a3_nm/scripts/screen/bat #o
-#backtick 12 0 0 /home/a3_nm/scripts/screen/fan #o
-
-#hardstatus string '%{= kG}%-Lw%{= kW}%50> %n%f* %t%{= kG}%+Lw%< %{= kG}%-=CPU %1`--%d/%m %c:%s%{-}'
-#hardstatus string '%{= kG}%-Lw%{= kW}%50> %n%f* %t%{= kG}%+Lw%< %{= kG}%-=C%1` R%2` S%3` L%4` D%5` %c%{-}'
-# hardstatus string '%{= kg}%-Lw%{=b kW}%50> %n%f %t%{= kg}%+Lw%< %-=%{=b kW}C%{= kg}%1` %{=b kW}M%{= kg}%2` %{=b kW}S%{= kg}%3` %{=b kW}L%{= kg}%4` %{=b kW}D%{= kg}%5` %{=b kW}i%{= kg}%6` %{=b kW}o%{= kg}%7` %{=b kW}r%{= kg}%8` %{=b kW}w%{= kg}%9` %{=b kW}%c%{-}'
-# hardstatus string '%{= kg}%-Lw%{=b kW}%50> %n%f %t%{= kg}%+Lw%< %-=%{= kg}C%{=b kW}%1` %{= kg}M%{=b kW}%2` %{= kg}S%{=b kW}%3` %{= kg}L%{=b kW}%4` %{= kg}D%{=b kW}%5` %{= kg}i%{=b kW}%6` %{= kg}o%{=b kW}%7` %{= kg}r%{=b kW}%8` %{= kg}w%{=b kW}%9` %{=b kW}%c%{-}'
-#hardstatus string '%{= kG}%-Lw%{= kW}%50> %n%f* %t%{= kG}%+Lw%< %{= kG}%-=%c:%s%{-}'
-##hardstatus string '%{= mK}%-Lw%{= KW}%50>%n%f* %t%{= mK}%+Lw%< %{= kG}%-=%D %d %M %Y %c:%s%{-}'
-##hardstatus string '%{= kG}[ %{G}%H %{g}][%= %{= kw}%?%-Lw%?%{r}(%{W}%n*%f%t%?(%u)%?%{r})%{w}%?%+Lw%?%?%= %{g}][%{B} %d/%m %{W}%c %{g}]'
-#
-# hardstatus string '%99`%{= Wk} %100`%112`%= %102`%101`%114`%115`%108`%113`%119`%117`%118`%116`%106`%104`%103`%105`%107`%Y-%m-%d %0c:%s'
-
-
-#hardstatus string '%{= kg}%-Lw%{=b kW}%50> %n%f %t%{= kg}%+Lw%< %-=%{=b kC}%1` %{=b kM}%2` %{=b kR}%3` %{=b kG}%4` %{=b kY}%5` %{=b kR}%6` %{=b kM}%7` %{=b kB}%8` %{=b kC}%9` %{=b kG}%10` %{=b kR}%12` %{=b kY}%11` %{=b kW}%c:%s%{-}'
diff --git a/zsh/zshrc b/zsh/zshrc
@@ -1,6 +1,7 @@
. ~/.zsh/path
. ~/.zsh/alias
. ~/.zsh/fontsize
+. ~/.zsh/perso
SHORTHOST=$(hostname | cut -d'.' -f1)
export $SHORTHOST
@@ -86,7 +87,7 @@ zstyle ':completion:*:sudo:*' command-path /usr/local/sbin /usr/local/bin \
export PAGER='less'
export EDITOR='vim'
-export BROWSER="$HOME/bin/sandboxed-browser"
+export BROWSER="/usr/bin/firefox"
bindkey -e
