diff options
| -rw-r--r-- | config/dodo/config.py | 4 | ||||
| -rw-r--r-- | config/nvim/init.vim | 3 | ||||
| -rw-r--r-- | config/nvim/lua/plugins.lua | 6 | ||||
| -rw-r--r-- | config/systemd/user/davmail.service | 5 | ||||
| -rwxr-xr-x | install | 6 | ||||
| -rwxr-xr-x | local/bin/allsync | 3 | ||||
| -rwxr-xr-x | local/bin/cloud | 15 | ||||
| -rwxr-xr-x | local/bin/elektroline00 | 1 | ||||
| -rwxr-xr-x | local/bin/new-flake-dev | 7 | ||||
| m--------- | private | 0 | ||||
| -rw-r--r-- | shvcli.ini | 7 | ||||
| -rw-r--r-- | shvcli.toml | 4 |
12 files changed, 42 insertions, 19 deletions
diff --git a/config/dodo/config.py b/config/dodo/config.py index 66e64ac..1347424 100644 --- a/config/dodo/config.py +++ b/config/dodo/config.py @@ -1,14 +1,16 @@ import dodo -dodo.settings.smtp_accounts = ["email", "gmail", "fel"] +dodo.settings.smtp_accounts = ["email", "gmail", "ell", "fel"] dodo.settings.email_address = { "email": "Karel Kočí <cynerd@email.cz>", "gmail": "Karel Kočí <citrisin@gmail.com>", + "ell": "Karel Kočí <kkoci@elektroline.cz>", "fel": "Karel Kočí <kocikare@fel.cvut.cz>", } dodo.settings.sent_dir = { "email": "~/.mail/email/sent/", "gmail": "~/.mail/gmail/Drafts/", + "ell": "~/.mail/ell/Sent/", "fel": "~/.mail/fel/Sent/", } dodo.settings.gnupg_keyid = "2B1F70F95F1B48DA2265A7FAA6BC8B8CEB31659B" diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 8ca2669..c269b77 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -99,6 +99,9 @@ nnoremap <c-c><CR> :Explore<cr> nnoremap <c-c>l :bnext<cr> nnoremap <c-c>h :bprev<cr> +" Table mode +let g:table_mode_syntax = 0 + " Format nmap <leader>f :lua require("conform").format()<cr> diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index a1c17bf..d1a4c55 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -127,9 +127,9 @@ require("packer").startup(function(use) -- Additional integrations ------------------------------------------------- use({ "chomosuke/typst-preview.nvim", - tag = "v0.1.*", - run = function() - require("typst-preview").update() + tag = "v1.*", + config = function() + require("typst-preview").setup({}) end, }) -- Movement, format and others --------------------------------------------- diff --git a/config/systemd/user/davmail.service b/config/systemd/user/davmail.service new file mode 100644 index 0000000..b0f239b --- /dev/null +++ b/config/systemd/user/davmail.service @@ -0,0 +1,5 @@ +[Unit] +Description=DavMail + +[Service] +ExecStart="/run/current-system/sw/bin/davmail" @@ -84,7 +84,6 @@ if ask "dev" "Development tools configuration"; then inst pylintrc ~/.pylintrc inst config/mypy/ ~/.config/mypy inst local/bin/new-flake-dev ~/.local/bin/new-flake-dev - inst shvcli.ini ~/.shvcli.ini curl "https://github.com/cyrus-and/gdb-dashboard/raw/master/.gdbinit" >~/.gdbinit fi @@ -93,16 +92,17 @@ if ask "sync" "Install synchronization"; then if [ "$(ps -o comm= 1)" = "systemd" ]; then inst config/systemd/user/allsync.service ~/.config/systemd/user/ inst config/systemd/user/allsync.timer ~/.config/systemd/user/ + inst config/systemd/user/davmail.service ~/.config/systemd/user/ fi inst private/mbsyncrc ~/.mbsyncrc + inst private/msmtprc ~/.msmtprc + inst private/davmail.properties ~/.davmail.properties inst private/notmuch-config ~/.notmuch-config inst private/notmuch-tag-new ~/.notmuch-tag-new inst local/bin/email-unread ~/.local/bin/email-unread inst local/sbin/newmail-notify ~/.local/sbin/newmail-notify - inst private/msmtprc ~/.msmtprc inst config/dodo/config.py ~/.config/dodo/config.py - inst private/astroid/config ~/.config/astroid/config inst private/vdirsyncer/ ~/.vdirsyncer inst config/khal/config ~/.config/khal/config diff --git a/local/bin/allsync b/local/bin/allsync index 9539f0d..70c9d29 100755 --- a/local/bin/allsync +++ b/local/bin/allsync @@ -23,6 +23,7 @@ cron_enable() { } | crontab - else systemctl --user start allsync.timer + systemctl --user start davmail.service fi notify_bar } @@ -112,12 +113,10 @@ pass git pull || fail "Passwords pull failed" pass git push || fail "Passwords push failed" sec "Mail" -i3_astroid --start-polling mbsync -a || fail "Mail synchronization reported failure" notmuch new ~/.local/sbin/newmail-notify || fail "Mail notifications not sent" notmuch tag --batch --input="$HOME/.notmuch-tag-new" -i3_astroid --stop-polling notify_bar #sec "Calendar and contacts" diff --git a/local/bin/cloud b/local/bin/cloud index db6e717..187db18 100755 --- a/local/bin/cloud +++ b/local/bin/cloud @@ -19,8 +19,21 @@ while getopts "u" opt; do done if [ "$umount" = "n" ]; then + url="https://cloud.cynerd.cz/remote.php/dav/files/cynerd" + conf="$(mktemp)" + secrets="$(mktemp)" + trap 'rm -f "$conf" "$secrets"' EXIT HUP INT QUIT SEGV PIPE TERM + cat >"$conf" <<-EOF + [$path] + secrets ${secrets} + use_locks 0 + EOF + chmod 600 "$secrets" + echo "$url cynerd $(pass cynerd.cz/nextcloud/davfs)" >"$secrets" + sudo chown root "$secrets" sudo mkdir -p "$path" - sudo mount.davfs -o uid=1000,username=cynerd "https://cloud.cynerd.cz/remote.php/dav/files/cynerd" "$path" + sudo mount.davfs -o "conf=${conf}" -o uid=1000 "$url" "$path" + sudo rm -f "$secrets" else sudo umount "$path" fi diff --git a/local/bin/elektroline00 b/local/bin/elektroline00 index 7a21cd6..99664d2 100755 --- a/local/bin/elektroline00 +++ b/local/bin/elektroline00 @@ -20,6 +20,7 @@ done if [ "$umount" = "n" ]; then mount_cifs() { + sudo mkdir -p "$path/$2" sudo --preserve-env=PASSWD mount.cifs -o username=kkoci,uid=1000 "$1" "$path/$2" echo "Mounted $path/$2" } diff --git a/local/bin/new-flake-dev b/local/bin/new-flake-dev index 360a94e..c28f2fd 100755 --- a/local/bin/new-flake-dev +++ b/local/bin/new-flake-dev @@ -11,10 +11,15 @@ cat >./flake.nix <<"EOF" systems, nixpkgs, }: let - inherit (nixpkgs.lib) genAttrs; + inherit (nixpkgs.lib) genAttrs composeManyExtensions; forSystems = genAttrs (import systems); withPkgs = func: forSystems (system: func self.legacyPackages.${system}); in { + overlays = { + packages = final: prev: {}; + default = composeManyExtensions [self.overlays.packages]; + }; + devShells = withPkgs (pkgs: { default = with pkgs; mkShell { diff --git a/private b/private -Subproject abe80caafee87d3111f52d3e7a01f3869d2cfc3 +Subproject b201be2e4f6ea5654fdc8cda97e2c461fece0c3 diff --git a/shvcli.ini b/shvcli.ini deleted file mode 100644 index 66caf52..0000000 --- a/shvcli.ini +++ /dev/null @@ -1,7 +0,0 @@ -[hosts] -localhost = tcp://admin@localhost?password=admin!123 -test = tcp://test@localhost?password=test -brcg2 = tcp://cli@localhost - -[hosts-shell] -nirvana = tcp://kkoci@nirvana.elektroline.cz:3756?password=$(pass elektroline.cz/nirvana/kkoci) diff --git a/shvcli.toml b/shvcli.toml index 5a3e9e8..0c262b4 100644 --- a/shvcli.toml +++ b/shvcli.toml @@ -2,7 +2,9 @@ localhost = "tcp://admin@localhost?password=admin!123" test = "tcp://test@localhost?password=test" brcg2 = "tcp://cli@localhost" +nirvanaa = "tcp://kkoci@nirvana.elektroline.cz:3755?oauth2=y" [hosts-shell] -nirvana = "tcp://kkoci@nirvana.elektroline.cz:3756?password=$(pass elektroline.cz/nirvana/kkoci)" +nirvana = "tcp://kkoci@nirvana.elektroline.cz:3755?password=$(pass elektroline.cz/nirvana/kkoci)" +nirvana-old = "tcp://kkoci@nirvana.elektroline.cz:3756?password=$(pass elektroline.cz/nirvana/kkoci)" ats = "tcp://atsshv@czellats.elektroline.cz?password=$(pass elektroline.cz/czellats/atsshv)" |