diff --git a/.gitignore b/.gitignore index e16391b3..2515ecef 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ mail/msmtp/config misc/spotifyd.conf misc/wakatime.cfg misc/nextcloud +misc/calcurse/caldav/config diff --git a/.gitsecret/paths/mapping.cfg b/.gitsecret/paths/mapping.cfg index b244cb73..7f944c4e 100644 --- a/.gitsecret/paths/mapping.cfg +++ b/.gitsecret/paths/mapping.cfg @@ -3,4 +3,5 @@ mail/mbsyncrc:65eec91b162f829575c2cc4b2428faa90eb71f3f79ba779bcfe70712f161cabe mail/msmtp/config:529c5ae169a81f528ece6356c2bfb23f20af93619386aa018f28fab9505271ec misc/spotifyd.conf:dd73afe8809498ba3b00ba9aa99e78fb3606867dc4871231880d2ebfd55196a9 misc/wakatime.cfg:e306146d45036c38f15aa9a817fc172bdca3c4c9d9ed3c4f6fe1d8d93d783d78 -misc/nextcloud:936fb8a7f1f7a624c12e370edb0d19e219f9a8bb7210728449d6fff1b9d060a9 +misc/nextcloud:1ee8feae4ac43c1e27178a5114374ff0afed84a1fd558a12d91e5409f77efef1 +misc/calcurse/caldav/config:15d288e4edcbb85da765080fcdc7d25815cf2e22854002af5ea5ca2b4c4c7955 diff --git a/gtk/gtkrc-2.0 b/gtk/gtkrc-2.0 new file mode 100644 index 00000000..b08a9474 --- /dev/null +++ b/gtk/gtkrc-2.0 @@ -0,0 +1,8 @@ +# Auto-written by gtk2_prefs. Do not edit. + +gtk-theme-name = "material-ocean" +style "user-font" +{ + font_name="CaskaydiaCove Nerd Font Mono 11" +} +widget_class "*" style "user-font" diff --git a/install.sh b/install.sh index e121659c..52688caa 100755 --- a/install.sh +++ b/install.sh @@ -84,7 +84,8 @@ ln -s ~/.dotfiles/vim/nvim ~/.config/nvim # GTK ln -s ~/.dotfiles/gtk/themes ~/.themes -ln -s ~/.dotfiles/gtk/gtk-2.0 ~/.config/gtk-2.0 +ln -s ~/.dotfiles/gtk/gtkrc-2.0 ~/.gtkrc-2.0 +ln -s ~/.dotfiles/gtk/gtk-3.0 ~/.config/gtk-2.0 ln -s ~/.dotfiles/gtk/gtk-3.0 ~/.config/gtk-3.0 ln -s ~/.dotfiles/gtk/gtk-4.0 ~/.config/gtk-4.0 ~/.dotfiles/gtk/Tela-icon-theme/install.sh @@ -93,6 +94,7 @@ ln -s ~/.dotfiles/gtk/gtk-4.0 ~/.config/gtk-4.0 ln -s ~/.dotfiles/misc/dunst ~/.config/dunst ln -s ~/.dotfiles/misc/zathura ~/.config/zathura ln -s ~/.dotfiles/misc/termite/ ~/.config/termite +ln -s ~/.dotfiles/misc/vdirsyncer ~/.vdirsyncer ln -s ~/.dotfiles/misc/systemd ~/.config/systemd ln -s ~/.dotfiles/misc/ranger ~/.config/ranger ln -s ~/.dotfiles/misc/neofetch ~/.config/neofetch @@ -104,6 +106,7 @@ ln -s ~/.dotfiles/misc/mimeapps.list ~/.config/mimeapps.list ln -s ~/.dotfiles/misc/wakatime.cfg ~/.wakatime.cfg ln -s ~/.dotfiles/misc/BetterDiscord ~/.config/BetterDiscord ln -s ~/.dotfiles/misc/nextcloud ~/.nextcloud +ln -s ~/.dotfiles/misc/calcurse ~/.calcurse mkdir -p ~/.config/spotifyd ln -s ~/.dotfiles/misc/spotifyd.conf ~/.config/spotifyd/spotifyd.conf ln -s ~/.dotfiles/fonts ~/.fonts @@ -151,6 +154,8 @@ if [ ! -f "/var/spool/cron$username" ]; then fi echo "*/8 * * * * /home/$username/.scripts/mailsync" >> /var/spool/cron/yigit echo "*/15 * * * * /home/$username/.scripts/nextcloud-sync" >> /var/spool/cron/yigit +echo "*/30 * * * * calcurse-caldav" >> /var/spool/cron/yigit +echo "*/30 * * * * vdirsyncer sync" >> /var/spool/cron/yigit # Root sudo cp ~/.dotfiles/root/dwm.desktop /usr/share/xsessions diff --git a/mail/mbsyncrc.secret b/mail/mbsyncrc.secret index 665f6b6e..6e49abb6 100644 Binary files a/mail/mbsyncrc.secret and b/mail/mbsyncrc.secret differ diff --git a/mail/msmtp/config.secret b/mail/msmtp/config.secret index 66fa2418..de9805c5 100644 Binary files a/mail/msmtp/config.secret and b/mail/msmtp/config.secret differ diff --git a/misc/calcurse/.gitignore b/misc/calcurse/.gitignore new file mode 100644 index 00000000..d65ec102 --- /dev/null +++ b/misc/calcurse/.gitignore @@ -0,0 +1,6 @@ +apts +.apts +.calcurse.pid +notes +todo +caldav/sync.db diff --git a/misc/calcurse/caldav/config.secret b/misc/calcurse/caldav/config.secret new file mode 100644 index 00000000..58c7d1c6 Binary files /dev/null and b/misc/calcurse/caldav/config.secret differ diff --git a/misc/ranger/colorschemes/__init__.py b/misc/calcurse/conf similarity index 100% rename from misc/ranger/colorschemes/__init__.py rename to misc/calcurse/conf diff --git a/misc/calcurse/keys b/misc/calcurse/keys new file mode 100644 index 00000000..28ff9e43 --- /dev/null +++ b/misc/calcurse/keys @@ -0,0 +1,55 @@ +# +# Calcurse keys configuration file +# +# In this file the keybindings used by Calcurse are defined. +# It is generated automatically by Calcurse and is maintained +# via the key configuration menu of the interactive user +# interface. It should not be edited directly. + +generic-cancel ESC +generic-select SPC +generic-credits @ +generic-help ? +generic-quit q Q +generic-save s S ^S +generic-reload R +generic-copy c +generic-paste p ^V +generic-change-view TAB +generic-import i I +generic-export x X +generic-goto g G +generic-other-cmd o O +generic-config-menu C +generic-redraw ^R +generic-add-appt ^A +generic-add-todo ^T +generic-prev-day T ^H +generic-next-day t ^L +generic-prev-week W ^K +generic-next-week w +generic-prev-month M +generic-next-month m +generic-prev-year Y +generic-next-year y +generic-scroll-down ^N +generic-scroll-up ^P +generic-goto-today ^G +generic-command : +move-right l L RGT +move-left h H LFT +move-down j J DWN +move-up k K UP +start-of-week 0 +end-of-week $ +add-item a A +del-item d D +edit-item e E +view-item v V RET +pipe-item | +flag-item ! +repeat r +edit-note n N +view-note > +raise-priority + +lower-priority - diff --git a/misc/nextcloud.secret b/misc/nextcloud.secret index 0fba7013..6125178d 100644 Binary files a/misc/nextcloud.secret and b/misc/nextcloud.secret differ diff --git a/misc/ranger/colorschemes/__pycache__/__init__.cpython-39.opt-1.pyc b/misc/ranger/colorschemes/__pycache__/__init__.cpython-39.opt-1.pyc deleted file mode 100644 index f30c192c..00000000 Binary files a/misc/ranger/colorschemes/__pycache__/__init__.cpython-39.opt-1.pyc and /dev/null differ diff --git a/misc/ranger/colorschemes/__pycache__/material-ocean.cpython-39.opt-1.pyc b/misc/ranger/colorschemes/__pycache__/material-ocean.cpython-39.opt-1.pyc deleted file mode 100644 index bcfc18a9..00000000 Binary files a/misc/ranger/colorschemes/__pycache__/material-ocean.cpython-39.opt-1.pyc and /dev/null differ diff --git a/misc/ranger/colorschemes/material-ocean.py b/misc/ranger/colorschemes/material-ocean.py deleted file mode 100644 index 33304c5c..00000000 --- a/misc/ranger/colorschemes/material-ocean.py +++ /dev/null @@ -1,181 +0,0 @@ -# This file is part of ranger, the console file manager. -# License: GNU GPL version 3, see the file "AUTHORS" for details. - -from __future__ import (absolute_import, division, print_function) - -from ranger.gui.colorscheme import ColorScheme -from ranger.gui.color import ( - default, normal, bold, reverse, dim, BRIGHT, default_colors, -) - - -black = 16 -blue = 32 -cyan = 50 -green = 47 -magenta = 141 -red = 9 -white = 255 -yellow =227 - -class Default(ColorScheme): - progress_bar_color = 87 - - def use(self, context): # pylint: disable=too-many-branches,too-many-statements - fg, bg, attr = 231, black, bold - - if context.reset: - return default_colors - - elif context.in_browser: - if context.selected: - attr = reverse - else: - attr = normal - if context.empty or context.error: - bg = red - if context.border: - fg = default - if context.media: - if context.image: - fg = yellow - else: - fg = magenta - if context.container: - fg = red - if context.directory: - attr |= bold - fg = blue - elif context.executable and not \ - any((context.media, context.container, - context.fifo, context.socket)): - attr |= bold - fg = green - if context.socket: - attr |= bold - fg = magenta - if context.fifo or context.device: - fg = yellow - if context.device: - attr |= bold - if context.link: - fg = cyan if context.good else magenta - if context.tag_marker and not context.selected: - attr |= bold - if fg in (red, magenta): - fg = white - else: - fg = red - if not context.selected and (context.cut or context.copied): - attr |= bold - fg = black - # If the terminal doesn't support bright colors, use dim white - # instead of black. - if BRIGHT == 0: - attr |= dim - fg = white - if context.main_column: - # Doubling up with BRIGHT here causes issues because it's - # additive not idempotent. - if context.selected: - attr |= bold - if context.marked: - attr |= bold - fg = yellow - if context.badinfo: - if attr & reverse: - bg = magenta - else: - fg = magenta - - if context.inactive_pane: - fg = cyan - - elif context.in_titlebar: - if context.hostname: - fg = red if context.bad else green - elif context.directory: - fg = blue - elif context.tab: - if context.good: - bg = green - elif context.link: - fg = cyan - attr |= bold - - elif context.in_statusbar: - if context.permissions: - if context.good: - fg = cyan - elif context.bad: - fg = magenta - if context.marked: - attr |= bold | reverse - fg = yellow - if context.frozen: - attr |= bold | reverse - fg = cyan - if context.message: - if context.bad: - attr |= bold - fg = red - if context.loaded: - bg = self.progress_bar_color - if context.vcsinfo: - fg = blue - attr &= ~bold - if context.vcscommit: - fg = yellow - attr &= ~bold - if context.vcsdate: - fg = cyan - attr &= ~bold - - if context.text: - if context.highlight: - attr |= reverse - - if context.in_taskview: - if context.title: - fg = blue - - if context.selected: - attr |= reverse - - if context.loaded: - if context.selected: - fg = self.progress_bar_color - else: - bg = self.progress_bar_color - - if context.vcsfile and not context.selected: - attr &= ~bold - if context.vcsconflict: - fg = magenta - elif context.vcsuntracked: - fg = cyan - elif context.vcschanged: - fg = red - elif context.vcsunknown: - fg = red - elif context.vcsstaged: - fg = green - elif context.vcssync: - fg = green - elif context.vcsignored: - fg = default - - elif context.vcsremote and not context.selected: - attr &= ~bold - if context.vcssync or context.vcsnone: - fg = green - elif context.vcsbehind: - fg = red - elif context.vcsahead: - fg = blue - elif context.vcsdiverged: - fg = magenta - elif context.vcsunknown: - fg = red - - return fg, bg, attr diff --git a/misc/ranger/rc.conf b/misc/ranger/rc.conf index ceec81e3..7090e20b 100644 --- a/misc/ranger/rc.conf +++ b/misc/ranger/rc.conf @@ -31,7 +31,7 @@ set unicode_ellipsis true # Show dotfiles in the bookmark preview box? set show_hidden_bookmarks true -set colorscheme material-ocean +#set colorscheme material-ocean # Preview files on the rightmost column? # And collapse (shrink) the last column if there is nothing to preview? diff --git a/misc/spotifyd.conf.secret b/misc/spotifyd.conf.secret index 51c6bd81..50b2b850 100644 Binary files a/misc/spotifyd.conf.secret and b/misc/spotifyd.conf.secret differ diff --git a/misc/vdirsyncer/config b/misc/vdirsyncer/config new file mode 100644 index 00000000..f199a266 --- /dev/null +++ b/misc/vdirsyncer/config @@ -0,0 +1,18 @@ +[general] +status_path = "~/.cache/vsync-status/" + +[pair nextcloud_contacts] +a = "nx_contacts_local" +b = "nx_contacts_remote" +collections = ["from a", "from b"] + +[storage nx_contacts_local] +type = "filesystem" +path = "~/.card/contacts" +fileext = ".vcf" + +[storage nx_contacts_remote] +type = "carddav" +url = "https://drive.yigitcolakoglu.com/" +username = "yigitcolakoglu" +password = "@Ygtclksbl12!" diff --git a/misc/wakatime.cfg.secret b/misc/wakatime.cfg.secret index bb483d22..673f756e 100644 Binary files a/misc/wakatime.cfg.secret and b/misc/wakatime.cfg.secret differ diff --git a/scripts/status-bar/date b/scripts/status-bar/date index 975db9f2..fc7fe9da 100755 --- a/scripts/status-bar/date +++ b/scripts/status-bar/date @@ -1,8 +1,17 @@ #! /bin/sh icon= +events=$(calcurse -a | grep -- '->' | wc -l) +if [ ! "$events" = "0" ]; then + events="($events) " +fi cmd=$(date +"%h %e") #echo "$ifg $icon $tfg$cmd" -echo -n "^c#0f111a^^b#88c0d0^ $icon $cmd ^d^" +echo -n "^c#0f111a^^b#88c0d0^ $icon $events$cmd ^d^" + +case $BLOCK_BUTTON in + 1) setsid -f st -c center -n center -e calcurse;; +esac + diff --git a/scripts/status-bar/memory b/scripts/status-bar/memory index 7fd2d2f8..1ac12f98 100755 --- a/scripts/status-bar/memory +++ b/scripts/status-bar/memory @@ -4,4 +4,7 @@ MEM=$(free | grep Mem | awk '{printf("%d", $3/$2 * 100.0)}') echo "^c#a3be8c^ ^d^ $MEM%" +case $BLOCK_BUTTON in + 1) setsid -f st -c htop -n htop -e htop;; +esac diff --git a/suckless/dwm/rules.h b/suckless/dwm/rules.h index 75b5d8ff..cef2a16c 100644 --- a/suckless/dwm/rules.h +++ b/suckless/dwm/rules.h @@ -32,8 +32,10 @@ static const Rule rules[] = { RULE(.class = "mpv", 0, .isfloating = 1, .floatpos="100% 1% 600W 350H") RULE(.instance = "sxiv", 0, .isfloating = 1, .floatpos="100% 1% 600W 350H") RULE(.class = "neomutt-send", 0, .isfloating = 1, .floatpos="50% 50% 1000W 700H") - RULE(.class = "neomutt-send", 0, .isfloating = 1, .floatpos="50% 50% 250W 600H") // Why did I put this here? + RULE(.class = "Zathura", 0, .isfloating = 1, .floatpos="100% 50% 700W 1000H") RULE(.class = "weather", 0, .isfloating = 1, .floatpos="50% 50% 1200W 800H") // Why did I put this here? + RULE(.class = "center", 0, .isfloating = 1, .floatpos="50% 50% 1000W 600H") // Why did I put this here? + RULE(.class = "htop", 0, .isfloating = 1, .floatpos="50% 50% 1200W 600H") // Why did I put this here? RULE(.title = "SimCrop", 0, .isfloating = 1, .floatpos="50% 50% 800W 500H") }; diff --git a/suckless/st/config.h b/suckless/st/config.h index 8e181202..f45c3203 100644 --- a/suckless/st/config.h +++ b/suckless/st/config.h @@ -9,6 +9,7 @@ static char *font = "CaskaydiaCove Nerd Font Mono:pixelsize=16:antialias=true:au static char *font2[] = { "Symbola:pixelsize=16:antialias=true:autohint=true", }; +char *iso14755_cmd = "dmenu -p codepoint: