From d5a47e99fa12e246f041f39d5d5d0d1cbe11402f Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Wed, 18 Oct 2023 21:15:17 +0000 Subject: [PATCH] test --- .gitignore | 3 + .pre-commit-config.yaml | 8 + .salt-lint | 4 + LICENSE | 674 +++++++++++++++ README.md | 121 +++ TODO.md | 25 + minion.d/qusal.conf | 5 + qusal/ansible/README.md | 53 ++ qusal/ansible/clone.sls | 2 + qusal/ansible/clone.top | 4 + qusal/ansible/configure-minion.sls | 20 + qusal/ansible/configure-minion.top | 3 + qusal/ansible/configure.sls | 21 + qusal/ansible/configure.top | 3 + qusal/ansible/create.sls | 66 ++ qusal/ansible/create.top | 4 + .../ansible/files/minion/99-sshd-ansible.conf | 1 + qusal/ansible/files/policy/default.policy | 4 + qusal/ansible/files/repo/ansible.asc | 30 + qusal/ansible/files/repo/ansible.list | 2 + qusal/ansible/files/repo/ansible.sources | 6 + .../ansible/files/server/99-ssh-ansible.conf | 8 + qusal/ansible/init.top | 11 + qusal/ansible/install.sls | 52 ++ qusal/ansible/install.top | 3 + qusal/browser/README.md | 72 ++ qusal/browser/appmenus.sls | 2 + qusal/browser/appmenus.top | 4 + qusal/browser/clone.sls | 2 + qusal/browser/clone.top | 4 + qusal/browser/create.sls | 35 + qusal/browser/create.top | 4 + qusal/browser/files/repo/chrome.asc | 226 +++++ qusal/browser/files/repo/chrome.list | 2 + qusal/browser/files/repo/chrome.sources | 6 + qusal/browser/init.top | 6 + qusal/browser/install-chrome.sls | 35 + qusal/browser/install-chrome.top | 3 + qusal/browser/install-chromium.sls | 18 + qusal/browser/install-chromium.top | 3 + qusal/browser/install-common.sls | 25 + qusal/browser/install-common.top | 3 + qusal/browser/install-firefox.sls | 18 + qusal/browser/install-firefox.top | 3 + qusal/browser/install-lynx.sls | 18 + qusal/browser/install-lynx.top | 3 + qusal/browser/install-w3m.sls | 19 + qusal/browser/install-w3m.top | 3 + qusal/browser/install.sls | 6 + qusal/browser/install.top | 3 + qusal/dev/README.md | 35 + qusal/dev/clone.sls | 2 + qusal/dev/clone.top | 4 + qusal/dev/configure.sls | 7 + qusal/dev/create.sls | 75 ++ qusal/dev/create.top | 4 + qusal/dev/home-cleanup.sls | 11 + qusal/dev/home-cleanup.top | 3 + qusal/dev/init.sls | 13 + qusal/dev/init.top | 10 + qusal/dev/install-python-tools.sls | 19 + qusal/dev/install-python-tools.top | 3 + qusal/dev/install-salt-tools.sls | 26 + qusal/dev/install-salt-tools.top | 3 + qusal/dev/install.sls | 54 ++ qusal/dev/install.top | 4 + qusal/docker/README.md | 32 + qusal/docker/configure.sls | 10 + qusal/docker/configure.top | 3 + qusal/docker/files/repo/docker.asc | 62 ++ qusal/docker/files/repo/docker.list | 2 + qusal/docker/files/repo/docker.sources | 6 + qusal/docker/files/repo/docker.yum.asc | 28 + qusal/docker/files/repo/docker.yum.repo | 15 + qusal/docker/init.top | 5 + qusal/docker/install.sls | 57 ++ qusal/docker/install.top | 3 + qusal/dom0/README.md | 31 + qusal/dom0/backup.sls | 15 + qusal/dom0/backup.top | 4 + qusal/dom0/dotfiles.sls | 15 + qusal/dom0/dotfiles.top | 4 + .../kde-activity-changed-notifier | 32 + qusal/dom0/files/autostart/xprofile.desktop | 8 + qusal/dom0/files/backup/qusal.conf | 18 + qusal/dom0/files/bin/kde-write-rules | 48 ++ qusal/dom0/files/bin/qvm-backup-find-last | 22 + qusal/dom0/files/sddm.conf.d/qubes.conf | 2 + qusal/dom0/files/xinitrc.d/55xfce-qubes.sh | 8 + qusal/dom0/files/xorg.conf.d/30-touchpad.conf | 5 + qusal/dom0/init.sls | 10 + qusal/dom0/init.top | 4 + qusal/dom0/install.sls | 16 + qusal/dom0/install.top | 4 + qusal/dom0/kde.sls | 51 ++ qusal/dom0/kde.top | 4 + qusal/dom0/xorg.sls | 20 + qusal/dom0/xorg.top | 4 + qusal/dotfiles/README.md | 77 ++ qusal/dotfiles/copy-all.sls | 46 + qusal/dotfiles/copy-all.top | 3 + qusal/dotfiles/copy-git.sls | 59 ++ qusal/dotfiles/copy-git.top | 3 + qusal/dotfiles/copy-gtk.sls | 17 + qusal/dotfiles/copy-gtk.top | 3 + qusal/dotfiles/copy-net.sls | 21 + qusal/dotfiles/copy-net.top | 3 + qusal/dotfiles/copy-pgp.sls | 17 + qusal/dotfiles/copy-pgp.top | 3 + qusal/dotfiles/copy-sh.sls | 37 + qusal/dotfiles/copy-sh.top | 3 + qusal/dotfiles/copy-ssh.sls | 18 + qusal/dotfiles/copy-ssh.top | 3 + qusal/dotfiles/copy-tmux.sls | 31 + qusal/dotfiles/copy-tmux.top | 3 + qusal/dotfiles/copy-vim.sls | 17 + qusal/dotfiles/copy-vim.top | 3 + qusal/dotfiles/copy-x11.sls | 21 + qusal/dotfiles/copy-x11.top | 3 + .../The Qubes Project/qubes-qube-manager.conf | 32 + qusal/dotfiles/files/git/.config/git/config | 144 ++++ .../git/.config/git/config.d/qubes-devel | 5 + qusal/dotfiles/files/git/.config/git/ignore | 31 + qusal/dotfiles/files/git/.config/git/message | 3 + .../.config/git/sample/gitconfig.local.sample | 6 + .../git/.config/git/shell/.git-shell-lib | 24 + .../files/git/.config/git/shell/description | 21 + .../dotfiles/files/git/.config/git/shell/help | 4 + .../dotfiles/files/git/.config/git/shell/init | 30 + .../dotfiles/files/git/.config/git/shell/list | 12 + .../.config/git/shell/no-interactive-login | 18 + .../files/git/.config/git/template/config | 12 + .../.config/git/template/hooks/pre-receive | 46 + .../git/.config/git/template/info/exclude | 1 + qusal/dotfiles/files/git/.config/tig/config | 71 ++ .../files/gtk/.config/gtk-2.0/bookmarks | 1 + .../files/gtk/.config/gtk-2.0/gtkrc-2.0 | 15 + .../gtk-2.0/qubes-incoming-bookmark-created | 0 .../files/gtk/.config/gtk-3.0/bookmarks | 1 + .../gtk-3.0/qubes-incoming-bookmark-created | 0 .../files/gtk/.config/gtk-3.0/settings.ini | 16 + .../files/gtk/.config/gtk-4.0/bookmarks | 1 + .../gtk-4.0/qubes-incoming-bookmark-created | 0 .../files/gtk/.config/gtk-4.0/settings.ini | 16 + qusal/dotfiles/files/net/.config/curl/.curlrc | 1 + qusal/dotfiles/files/net/.config/curl/curlrc | 1 + .../files/net/.config/urlview/urlview | 1 + qusal/dotfiles/files/net/.config/wget/wgetrc | 1 + qusal/dotfiles/files/net/.urlview | 1 + qusal/dotfiles/files/net/.w3m/keymap | 252 ++++++ qusal/dotfiles/files/pgp/.gnupg/gpg.conf | 16 + qusal/dotfiles/files/qvm-copy-dotfiles | 34 + qusal/dotfiles/files/setup.sh | 40 + qusal/dotfiles/files/sh/.bash_env | 1 + qusal/dotfiles/files/sh/.bash_logout | 1 + qusal/dotfiles/files/sh/.bash_profile | 1 + qusal/dotfiles/files/sh/.bashrc | 1 + qusal/dotfiles/files/sh/.config/bash/bash_env | 9 + .../files/sh/.config/bash/bash_logout | 3 + .../files/sh/.config/bash/bash_profile | 5 + qusal/dotfiles/files/sh/.config/bash/bashrc | 102 +++ qusal/dotfiles/files/sh/.config/bash/inputrc | 131 +++ .../files/sh/.config/dircolors/dircolors | 168 ++++ .../dotfiles/files/sh/.config/less/lessfilter | 13 + qusal/dotfiles/files/sh/.config/less/lesskey | 17 + .../files/sh/.config/less/lesskey-old | Bin 0 -> 62 bytes qusal/dotfiles/files/sh/.config/sh/profile | 129 +++ qusal/dotfiles/files/sh/.config/sh/shrc | 286 +++++++ .../dotfiles/files/sh/.config/user-dirs.dirs | 15 + .../files/sh/.config/user-dirs.locale | 1 + qusal/dotfiles/files/sh/.config/zsh/.zlogout | 1 + qusal/dotfiles/files/sh/.config/zsh/.zprofile | 1 + qusal/dotfiles/files/sh/.config/zsh/.zshenv | 1 + qusal/dotfiles/files/sh/.config/zsh/.zshrc | 1 + qusal/dotfiles/files/sh/.config/zsh/zlogout | 3 + qusal/dotfiles/files/sh/.config/zsh/zprofile | 7 + qusal/dotfiles/files/sh/.config/zsh/zshenv | 8 + qusal/dotfiles/files/sh/.config/zsh/zshrc | 458 ++++++++++ qusal/dotfiles/files/sh/.profile | 1 + qusal/dotfiles/files/sh/.zprofile | 1 + qusal/dotfiles/files/ssh/.ssh/config | 20 + .../files/tmux/.config/tmux/tmux.conf | 137 +++ .../.config/vim/after/autoload/pathogen.vim | 353 ++++++++ .../vim/.config/vim/after/colors/tango2.vim | 62 ++ .../vim/.config/vim/after/colors/torte.vim | 51 ++ .../.config/vim/after/colors/vividchalk.vim | 191 +++++ .../.config/vim/after/ftplugin/markdown.vim | 33 + .../vim/.config/vim/after/macros/less.vim | 2 + .../vim/.config/vim/after/plugin/cool.vim | 128 +++ .../.config/vim/after/plugin/lastplace.vim | 49 ++ .../.config/vim/after/plugin/update-time.vim | 80 ++ .../vim/bundle/vim-jinja/ftdetect/jinja.vim | 19 + .../vim/bundle/vim-jinja/ftplugin/jinja.vim | 20 + .../vim/bundle/vim-jinja/syntax/jinja.vim | 124 +++ .../vim/bundle/vim-salt/ftdetect/salt.vim | 13 + .../vim/bundle/vim-salt/ftplugin/salt.vim | 27 + .../vim/bundle/vim-salt/indent/salt.vim | 156 ++++ .../vim/bundle/vim-salt/syntax/salt.vim | 53 ++ .../.config/vim/bundle/vim-salt/test/file.sls | 22 + qusal/dotfiles/files/vim/.config/vim/vimrc | 732 ++++++++++++++++ qusal/dotfiles/files/x11/.Xresources | 1 + qusal/dotfiles/files/x11/.config/x11/xinitrc | 4 + qusal/dotfiles/files/x11/.config/x11/xprofile | 68 ++ .../dotfiles/files/x11/.config/x11/xresources | 310 +++++++ qusal/dotfiles/files/x11/.config/x11/xsession | 4 + .../dotfiles/files/x11/.config/x11/xsessionrc | 4 + qusal/dotfiles/files/x11/.xsession | 1 + qusal/dotfiles/files/x11/.xsessionrc | 1 + qusal/media/README.md | 37 + qusal/media/clone.sls | 2 + qusal/media/clone.top | 4 + qusal/media/configure.sls | 21 + qusal/media/configure.top | 3 + qusal/media/create.sls | 78 ++ qusal/media/create.top | 4 + qusal/media/files/app/mimeapps.list | 802 ++++++++++++++++++ qusal/media/files/disp/mimeapps.list | 69 ++ qusal/media/files/policy/default.policy | 4 + qusal/media/init.top | 8 + qusal/media/install.sls | 38 + qusal/media/install.top | 3 + qusal/mgmt/README.md | 28 + qusal/mgmt/clone.sls | 2 + qusal/mgmt/clone.top | 4 + qusal/mgmt/confirm.sls | 12 + qusal/mgmt/confirm.top | 4 + qusal/mgmt/create.sls | 24 + qusal/mgmt/create.top | 4 + qusal/mgmt/init.top | 6 + qusal/mgmt/install.sls | 17 + qusal/mgmt/install.top | 3 + qusal/mutt/README.md | 55 ++ qusal/mutt/clone.sls | 2 + qusal/mutt/clone.top | 4 + qusal/mutt/configure.sls | 17 + qusal/mutt/configure.top | 4 + qusal/mutt/create.sls | 29 + qusal/mutt/create.top | 4 + qusal/mutt/files/mutt/conf.d/bindings.muttrc | 80 ++ qusal/mutt/files/mutt/conf.d/colors.muttrc | 110 +++ qusal/mutt/files/mutt/conf.d/lists.muttrc | 7 + qusal/mutt/files/mutt/conf.d/mailbox.muttrc | 47 + qusal/mutt/files/mutt/conf.d/pgp.muttrc | 35 + qusal/mutt/files/mutt/conf.d/server.muttrc | 32 + qusal/mutt/files/mutt/muttrc | 12 + qusal/mutt/init.top | 8 + qusal/mutt/install.sls | 57 ++ qusal/mutt/install.top | 3 + qusal/qubes-builder/README.md | 88 ++ qusal/qubes-builder/clone.sls | 2 + qusal/qubes-builder/clone.top | 4 + .../configure-qubes-executor.sls | 42 + .../configure-qubes-executor.top | 3 + qusal/qubes-builder/configure.sls | 98 +++ qusal/qubes-builder/configure.top | 3 + qusal/qubes-builder/create.sls | 61 ++ qusal/qubes-builder/create.top | 4 + ...64428F455451B3EBE78A7F063938BA42CFA724.asc | 41 + ...4E12AB03F2FE293765FC06DA0434BC706E1FCF.asc | 41 + ...7F11FD0FAA4B080123F01CDDFA1A3E36879494.asc | 28 + ...A64B92F95E706BF28E2CA6484010B5CDC576E2.asc | 54 ++ qusal/qubes-builder/files/keys/otrust.txt | 6 + qusal/qubes-builder/files/keys/pubring.kbx | Bin 0 -> 7652 bytes qusal/qubes-builder/files/keys/trustdb.gpg | Bin 0 -> 1520 bytes .../qubes-builder/files/policy/default.policy | 23 + .../files/qubes-builder/gpg-split-domain | 1 + .../files/qubes-builder/rpmmacros | 11 + .../files/qubes-executor/builder.conf | 1 + .../files/rpc/qubesbuilder.FileCopyIn | 7 + .../files/rpc/qubesbuilder.FileCopyOut | 5 + qusal/qubes-builder/init.sls | 10 + qusal/qubes-builder/init.top | 10 + .../qubes-builder/install-qubes-executor.sls | 33 + .../qubes-builder/install-qubes-executor.top | 3 + qusal/qubes-builder/install.sls | 59 ++ qusal/qubes-builder/install.top | 3 + qusal/reader/README.md | 38 + qusal/reader/clone.sls | 2 + qusal/reader/clone.top | 4 + qusal/reader/create.sls | 44 + qusal/reader/create.top | 4 + qusal/reader/init.top | 6 + qusal/reader/install.sls | 22 + qusal/reader/install.top | 3 + qusal/remmina/README.md | 34 + qusal/remmina/appmenus.sls | 2 + qusal/remmina/appmenus.top | 4 + qusal/remmina/clone.sls | 2 + qusal/remmina/clone.top | 4 + qusal/remmina/create.sls | 56 ++ qusal/remmina/create.top | 4 + qusal/remmina/init.top | 6 + qusal/remmina/install.sls | 21 + qusal/remmina/install.top | 3 + qusal/signal/README.md | 31 + qusal/signal/clone.sls | 2 + qusal/signal/clone.top | 4 + qusal/signal/configure.sls | 13 + qusal/signal/configure.top | 4 + qusal/signal/create.sls | 38 + qusal/signal/create.top | 4 + qusal/signal/files/repo/signal.asc | 51 ++ qusal/signal/files/repo/signal.list | 2 + qusal/signal/files/repo/signal.sources | 6 + qusal/signal/firewall.sls | 16 + qusal/signal/firewall.top | 4 + qusal/signal/init.top | 9 + qusal/signal/install.sls | 29 + qusal/signal/install.top | 3 + qusal/ssh/README.md | 42 + qusal/ssh/clone.sls | 2 + qusal/ssh/clone.top | 4 + qusal/ssh/configure.sls | 8 + qusal/ssh/configure.top | 3 + qusal/ssh/create.sls | 45 + qusal/ssh/create.top | 4 + qusal/ssh/init.top | 8 + qusal/ssh/install.sls | 8 + qusal/ssh/install.top | 3 + qusal/sys-cacher/README.md | 123 +++ qusal/sys-cacher/clone.sls | 2 + qusal/sys-cacher/clone.top | 4 + qusal/sys-cacher/configure.sls | 29 + qusal/sys-cacher/configure.top | 3 + qusal/sys-cacher/create.sls | 35 + qusal/sys-cacher/create.top | 4 + qusal/sys-cacher/deinit.top | 8 + qusal/sys-cacher/files/bind-dirs/50_user.conf | 2 + qusal/sys-cacher/files/conf/acng.conf | 587 +++++++++++++ qusal/sys-cacher/files/mirrors/archlx_mirrors | 345 ++++++++ qusal/sys-cacher/files/mirrors/fedora_mirrors | 150 ++++ qusal/sys-cacher/files/policy/default.policy | 7 + qusal/sys-cacher/init.top | 11 + qusal/sys-cacher/install-client.sls | 66 ++ qusal/sys-cacher/install-client.top | 4 + qusal/sys-cacher/install.sls | 71 ++ qusal/sys-cacher/install.top | 3 + qusal/sys-cacher/remove-policy.sls | 2 + qusal/sys-cacher/tag.sls | 13 + qusal/sys-cacher/tag.top | 4 + qusal/sys-cacher/uninstall-client.sls | 51 ++ qusal/sys-cacher/uninstall-client.top | 4 + qusal/sys-cacher/untag.sls | 9 + qusal/sys-cacher/untag.top | 4 + qusal/sys-firewall/README.md | 45 + qusal/sys-firewall/clone.sls | 2 + qusal/sys-firewall/clone.top | 4 + qusal/sys-firewall/create.sls | 85 ++ qusal/sys-firewall/create.top | 4 + qusal/sys-firewall/init.top | 6 + qusal/sys-firewall/install.sls | 21 + qusal/sys-firewall/install.top | 3 + qusal/sys-firewall/prefs-disp.sls | 14 + qusal/sys-firewall/prefs-disp.top | 4 + qusal/sys-firewall/prefs.sls | 14 + qusal/sys-firewall/prefs.top | 4 + qusal/sys-git/README.md | 167 ++++ qusal/sys-git/clone.sls | 2 + qusal/sys-git/clone.top | 4 + qusal/sys-git/configure.sls | 7 + qusal/sys-git/configure.top | 3 + qusal/sys-git/create.sls | 33 + qusal/sys-git/create.top | 4 + .../files/client/git-core/git-init-qrexec | 25 + .../files/client/git-core/git-remote-qrexec | 102 +++ .../client/git-core/git-remote-qrexec-connect | 32 + qusal/sys-git/files/policy/default.policy | 9 + qusal/sys-git/files/rpc/qusal.GitFetch | 1 + qusal/sys-git/files/rpc/qusal.GitInit | 53 ++ qusal/sys-git/files/rpc/qusal.GitPush | 1 + qusal/sys-git/init.top | 8 + qusal/sys-git/install-client.sls | 29 + qusal/sys-git/install-client.top | 3 + qusal/sys-git/install.sls | 38 + qusal/sys-git/install.top | 3 + qusal/sys-net/README.md | 75 ++ qusal/sys-net/clone.sls | 2 + qusal/sys-net/clone.top | 4 + qusal/sys-net/create.sls | 95 +++ qusal/sys-net/create.top | 4 + qusal/sys-net/files/policy/default.policy | 7 + qusal/sys-net/firmware.txt | 12 + qusal/sys-net/init.top | 6 + qusal/sys-net/install-debug.sls | 21 + qusal/sys-net/install-debug.top | 3 + qusal/sys-net/install.sls | 21 + qusal/sys-net/install.top | 3 + qusal/sys-net/prefs-disp.sls | 20 + qusal/sys-net/prefs-disp.top | 4 + qusal/sys-net/prefs.sls | 20 + qusal/sys-net/prefs.top | 4 + qusal/sys-pgp/README.md | 65 ++ qusal/sys-pgp/clone.sls | 2 + qusal/sys-pgp/clone.top | 4 + qusal/sys-pgp/configure.sls | 7 + qusal/sys-pgp/configure.top | 4 + qusal/sys-pgp/create.sls | 26 + qusal/sys-pgp/create.top | 4 + qusal/sys-pgp/files/policy/default.policy | 7 + qusal/sys-pgp/init.top | 8 + qusal/sys-pgp/install-client.sls | 6 + qusal/sys-pgp/install-client.top | 4 + qusal/sys-pgp/install.sls | 25 + qusal/sys-pgp/install.top | 3 + qusal/sys-pihole/README.md | 70 ++ qusal/sys-pihole/clone.sls | 2 + qusal/sys-pihole/clone.top | 4 + qusal/sys-pihole/create.sls | 47 + qusal/sys-pihole/create.top | 4 + qusal/sys-pihole/files/firewall/flush | 4 + qusal/sys-pihole/files/firewall/flush.sh | 2 + .../sys-pihole/files/firewall/internalise.sh | 4 + qusal/sys-pihole/files/firewall/update_nft.sh | 14 + qusal/sys-pihole/files/network/eth0 | 5 + qusal/sys-pihole/files/network/setupVars.conf | 14 + qusal/sys-pihole/files/prefs.sh | 24 + qusal/sys-pihole/init.top | 6 + qusal/sys-pihole/install.sls | 143 ++++ qusal/sys-pihole/install.top | 3 + qusal/sys-pihole/prefs.sls | 22 + qusal/sys-pihole/prefs.top | 4 + qusal/sys-ssh-agent/README.md | 249 ++++++ qusal/sys-ssh-agent/clone.sls | 2 + qusal/sys-ssh-agent/clone.top | 4 + qusal/sys-ssh-agent/configure.sls | 14 + qusal/sys-ssh-agent/configure.top | 3 + qusal/sys-ssh-agent/create.sls | 28 + qusal/sys-ssh-agent/create.top | 4 + .../files/agent/bin/qvm-ssh-agent | 71 ++ .../systemd/qubes-ssh-agent-sock@.service | 14 + .../qubes-ssh-agent-client-sock@.service | 14 + .../systemd/qubes-ssh-agent-client@.service | 13 + .../sys-ssh-agent/files/policy/default.policy | 5 + qusal/sys-ssh-agent/files/rpc/qusal.SshAgent | 15 + qusal/sys-ssh-agent/init.top | 8 + qusal/sys-ssh-agent/install-client.sls | 50 ++ qusal/sys-ssh-agent/install-client.top | 3 + qusal/sys-ssh-agent/install.sls | 67 ++ qusal/sys-ssh-agent/install.top | 3 + qusal/sys-syncthing/README.md | 110 +++ qusal/sys-syncthing/appmenus.sls | 2 + qusal/sys-syncthing/appmenus.top | 4 + qusal/sys-syncthing/cancel.sls | 6 + qusal/sys-syncthing/cancel.top | 3 + qusal/sys-syncthing/clean.sls | 8 + qusal/sys-syncthing/clone.sls | 2 + qusal/sys-syncthing/clone.top | 4 + qusal/sys-syncthing/configure.sls | 6 + qusal/sys-syncthing/configure.top | 3 + qusal/sys-syncthing/create.sls | 55 ++ qusal/sys-syncthing/create.top | 4 + qusal/sys-syncthing/files/firewall/in.sh | 298 +++++++ .../sys-syncthing/files/policy/default.policy | 5 + qusal/sys-syncthing/files/repo/syncthing.asc | 41 + qusal/sys-syncthing/files/repo/syncthing.list | 2 + .../files/repo/syncthing.sources | 7 + .../files/rpc/qubes-syncthing.service | 19 + qusal/sys-syncthing/files/rpc/qusal.Syncthing | 2 + qusal/sys-syncthing/init.top | 6 + qusal/sys-syncthing/install.sls | 57 ++ qusal/sys-syncthing/install.top | 3 + qusal/sys-usb/README.md | 51 ++ qusal/sys-usb/clone.sls | 2 + qusal/sys-usb/clone.top | 4 + qusal/sys-usb/create.sls | 100 +++ qusal/sys-usb/create.top | 4 + qusal/sys-usb/files/policy/default.policy | 4 + qusal/sys-usb/init.top | 6 + qusal/sys-usb/install-client-cryptsetup.sls | 18 + qusal/sys-usb/install-client-cryptsetup.top | 3 + qusal/sys-usb/install-client-fido.sls | 19 + qusal/sys-usb/install-client-fido.top | 3 + qusal/sys-usb/install-client-proxy.sls | 15 + qusal/sys-usb/install-client-proxy.top | 3 + qusal/sys-usb/install-client.sls | 7 + qusal/sys-usb/install-client.top | 3 + qusal/sys-usb/install.sls | 19 + qusal/sys-usb/install.top | 3 + qusal/sys-usb/keyboard.sls | 52 ++ qusal/sys-usb/keyboard.top | 4 + qusal/templates/README.md | 19 + qusal/templates/debian-minimal.jinja | 5 + qusal/templates/debian-minimal/README.md | 24 + qusal/templates/debian-minimal/clone.sls | 6 + qusal/templates/debian-minimal/clone.top | 4 + qusal/templates/debian-minimal/create.sls | 53 ++ qusal/templates/debian-minimal/create.top | 4 + qusal/templates/debian-minimal/init.top | 7 + qusal/templates/debian-minimal/install.sls | 22 + qusal/templates/debian-minimal/install.top | 4 + qusal/templates/debian.jinja | 4 + qusal/templates/debian/README.md | 24 + qusal/templates/debian/clone.sls | 6 + qusal/templates/debian/clone.top | 4 + qusal/templates/debian/create.sls | 49 ++ qusal/templates/debian/create.top | 4 + qusal/templates/debian/init.top | 7 + qusal/templates/debian/install.sls | 7 + qusal/templates/debian/install.top | 4 + qusal/templates/fedora-minimal.jinja | 5 + qusal/templates/fedora-minimal/README.md | 24 + qusal/templates/fedora-minimal/clone.sls | 6 + qusal/templates/fedora-minimal/clone.top | 4 + qusal/templates/fedora-minimal/create.sls | 49 ++ qusal/templates/fedora-minimal/create.top | 4 + qusal/templates/fedora-minimal/init.top | 7 + qusal/templates/fedora-minimal/install.sls | 10 + qusal/templates/fedora-minimal/install.top | 4 + qusal/templates/fedora.jinja | 4 + qusal/templates/fedora/README.md | 24 + qusal/templates/fedora/clone.sls | 6 + qusal/templates/fedora/clone.top | 4 + qusal/templates/fedora/create.sls | 49 ++ qusal/templates/fedora/create.top | 4 + qusal/templates/fedora/init.top | 7 + qusal/templates/fedora/install.sls | 7 + qusal/templates/fedora/install.top | 4 + qusal/templates/whonix.jinja | 6 + qusal/templates/whonix/README.md | 27 + qusal/templates/whonix/clone.sls | 11 + qusal/templates/whonix/clone.top | 4 + qusal/templates/whonix/create.sls | 2 + qusal/templates/whonix/create.top | 4 + qusal/templates/whonix/init.top | 4 + qusal/templates/whonix/install.sls | 7 + qusal/templates/whonix/install.top | 4 + qusal/terraform/README.md | 30 + qusal/terraform/clone.sls | 2 + qusal/terraform/clone.top | 4 + qusal/terraform/create.sls | 21 + qusal/terraform/create.top | 4 + qusal/terraform/files/repo/terraform.asc | 64 ++ qusal/terraform/files/repo/terraform.list | 2 + qusal/terraform/files/repo/terraform.sources | 6 + qusal/terraform/init.top | 6 + qusal/terraform/install.sls | 22 + qusal/terraform/install.top | 3 + qusal/utils/macros/clone-template.sls | 24 + qusal/utils/macros/install-repo.sls | 67 ++ qusal/utils/macros/policy.sls | 80 ++ qusal/utils/macros/switch-template.sls | 20 + qusal/utils/macros/sync-appmenus.sls | 33 + qusal/utils/tools/builder/core.sls | 37 + qusal/utils/tools/builder/doc.sls | 24 + qusal/utils/tools/zsh/README.md | 25 + qusal/utils/tools/zsh/change-shell.sls | 14 + qusal/utils/tools/zsh/change-shell.top | 3 + qusal/utils/tools/zsh/init.sls | 4 + qusal/utils/tools/zsh/init.top | 5 + qusal/utils/tools/zsh/install.sls | 20 + qusal/utils/tools/zsh/install.top | 3 + qusal/utils/tools/zsh/touch-zshrc.sls | 10 + qusal/utils/tools/zsh/touch-zshrc.top | 3 + qusal/vault/README.md | 45 + qusal/vault/clone.sls | 2 + qusal/vault/clone.top | 4 + qusal/vault/create.sls | 29 + qusal/vault/create.top | 4 + qusal/vault/init.top | 6 + qusal/vault/install.sls | 25 + qusal/vault/install.top | 3 + rpm_spec/example.spec.tpl | 71 ++ scripts/salt-fix.sh | 32 + scripts/salt-lint.sh | 27 + scripts/setup.sh | 13 + scripts/shell-lint.sh | 39 + scripts/spec-build.sh | 27 + scripts/spec-gen.sh | 46 + scripts/spec-get.sh | 92 ++ 569 files changed, 16873 insertions(+) create mode 100644 .gitignore create mode 100644 .pre-commit-config.yaml create mode 100644 .salt-lint create mode 100644 LICENSE create mode 100644 README.md create mode 100644 TODO.md create mode 100644 minion.d/qusal.conf create mode 100644 qusal/ansible/README.md create mode 100644 qusal/ansible/clone.sls create mode 100644 qusal/ansible/clone.top create mode 100644 qusal/ansible/configure-minion.sls create mode 100644 qusal/ansible/configure-minion.top create mode 100644 qusal/ansible/configure.sls create mode 100644 qusal/ansible/configure.top create mode 100644 qusal/ansible/create.sls create mode 100644 qusal/ansible/create.top create mode 100644 qusal/ansible/files/minion/99-sshd-ansible.conf create mode 100644 qusal/ansible/files/policy/default.policy create mode 100644 qusal/ansible/files/repo/ansible.asc create mode 100644 qusal/ansible/files/repo/ansible.list create mode 100644 qusal/ansible/files/repo/ansible.sources create mode 100644 qusal/ansible/files/server/99-ssh-ansible.conf create mode 100644 qusal/ansible/init.top create mode 100644 qusal/ansible/install.sls create mode 100644 qusal/ansible/install.top create mode 100644 qusal/browser/README.md create mode 100644 qusal/browser/appmenus.sls create mode 100644 qusal/browser/appmenus.top create mode 100644 qusal/browser/clone.sls create mode 100644 qusal/browser/clone.top create mode 100644 qusal/browser/create.sls create mode 100644 qusal/browser/create.top create mode 100644 qusal/browser/files/repo/chrome.asc create mode 100644 qusal/browser/files/repo/chrome.list create mode 100644 qusal/browser/files/repo/chrome.sources create mode 100644 qusal/browser/init.top create mode 100644 qusal/browser/install-chrome.sls create mode 100644 qusal/browser/install-chrome.top create mode 100644 qusal/browser/install-chromium.sls create mode 100644 qusal/browser/install-chromium.top create mode 100644 qusal/browser/install-common.sls create mode 100644 qusal/browser/install-common.top create mode 100644 qusal/browser/install-firefox.sls create mode 100644 qusal/browser/install-firefox.top create mode 100644 qusal/browser/install-lynx.sls create mode 100644 qusal/browser/install-lynx.top create mode 100644 qusal/browser/install-w3m.sls create mode 100644 qusal/browser/install-w3m.top create mode 100644 qusal/browser/install.sls create mode 100644 qusal/browser/install.top create mode 100644 qusal/dev/README.md create mode 100644 qusal/dev/clone.sls create mode 100644 qusal/dev/clone.top create mode 100644 qusal/dev/configure.sls create mode 100644 qusal/dev/create.sls create mode 100644 qusal/dev/create.top create mode 100644 qusal/dev/home-cleanup.sls create mode 100644 qusal/dev/home-cleanup.top create mode 100644 qusal/dev/init.sls create mode 100644 qusal/dev/init.top create mode 100644 qusal/dev/install-python-tools.sls create mode 100644 qusal/dev/install-python-tools.top create mode 100644 qusal/dev/install-salt-tools.sls create mode 100644 qusal/dev/install-salt-tools.top create mode 100644 qusal/dev/install.sls create mode 100644 qusal/dev/install.top create mode 100644 qusal/docker/README.md create mode 100644 qusal/docker/configure.sls create mode 100644 qusal/docker/configure.top create mode 100644 qusal/docker/files/repo/docker.asc create mode 100644 qusal/docker/files/repo/docker.list create mode 100644 qusal/docker/files/repo/docker.sources create mode 100644 qusal/docker/files/repo/docker.yum.asc create mode 100644 qusal/docker/files/repo/docker.yum.repo create mode 100644 qusal/docker/init.top create mode 100644 qusal/docker/install.sls create mode 100644 qusal/docker/install.top create mode 100644 qusal/dom0/README.md create mode 100644 qusal/dom0/backup.sls create mode 100644 qusal/dom0/backup.top create mode 100644 qusal/dom0/dotfiles.sls create mode 100644 qusal/dom0/dotfiles.top create mode 100755 qusal/dom0/files/autostart-scripts/kde-activity-changed-notifier create mode 100644 qusal/dom0/files/autostart/xprofile.desktop create mode 100644 qusal/dom0/files/backup/qusal.conf create mode 100755 qusal/dom0/files/bin/kde-write-rules create mode 100755 qusal/dom0/files/bin/qvm-backup-find-last create mode 100644 qusal/dom0/files/sddm.conf.d/qubes.conf create mode 100755 qusal/dom0/files/xinitrc.d/55xfce-qubes.sh create mode 100644 qusal/dom0/files/xorg.conf.d/30-touchpad.conf create mode 100644 qusal/dom0/init.sls create mode 100644 qusal/dom0/init.top create mode 100644 qusal/dom0/install.sls create mode 100644 qusal/dom0/install.top create mode 100644 qusal/dom0/kde.sls create mode 100644 qusal/dom0/kde.top create mode 100644 qusal/dom0/xorg.sls create mode 100644 qusal/dom0/xorg.top create mode 100644 qusal/dotfiles/README.md create mode 100644 qusal/dotfiles/copy-all.sls create mode 100644 qusal/dotfiles/copy-all.top create mode 100644 qusal/dotfiles/copy-git.sls create mode 100644 qusal/dotfiles/copy-git.top create mode 100644 qusal/dotfiles/copy-gtk.sls create mode 100644 qusal/dotfiles/copy-gtk.top create mode 100644 qusal/dotfiles/copy-net.sls create mode 100644 qusal/dotfiles/copy-net.top create mode 100644 qusal/dotfiles/copy-pgp.sls create mode 100644 qusal/dotfiles/copy-pgp.top create mode 100644 qusal/dotfiles/copy-sh.sls create mode 100644 qusal/dotfiles/copy-sh.top create mode 100644 qusal/dotfiles/copy-ssh.sls create mode 100644 qusal/dotfiles/copy-ssh.top create mode 100644 qusal/dotfiles/copy-tmux.sls create mode 100644 qusal/dotfiles/copy-tmux.top create mode 100644 qusal/dotfiles/copy-vim.sls create mode 100644 qusal/dotfiles/copy-vim.top create mode 100644 qusal/dotfiles/copy-x11.sls create mode 100644 qusal/dotfiles/copy-x11.top create mode 100644 qusal/dotfiles/files/dom0/The Qubes Project/qubes-qube-manager.conf create mode 100644 qusal/dotfiles/files/git/.config/git/config create mode 100644 qusal/dotfiles/files/git/.config/git/config.d/qubes-devel create mode 100644 qusal/dotfiles/files/git/.config/git/ignore create mode 100644 qusal/dotfiles/files/git/.config/git/message create mode 100644 qusal/dotfiles/files/git/.config/git/sample/gitconfig.local.sample create mode 100644 qusal/dotfiles/files/git/.config/git/shell/.git-shell-lib create mode 100755 qusal/dotfiles/files/git/.config/git/shell/description create mode 100755 qusal/dotfiles/files/git/.config/git/shell/help create mode 100755 qusal/dotfiles/files/git/.config/git/shell/init create mode 100755 qusal/dotfiles/files/git/.config/git/shell/list create mode 100755 qusal/dotfiles/files/git/.config/git/shell/no-interactive-login create mode 100644 qusal/dotfiles/files/git/.config/git/template/config create mode 100755 qusal/dotfiles/files/git/.config/git/template/hooks/pre-receive create mode 100644 qusal/dotfiles/files/git/.config/git/template/info/exclude create mode 100644 qusal/dotfiles/files/git/.config/tig/config create mode 100644 qusal/dotfiles/files/gtk/.config/gtk-2.0/bookmarks create mode 100644 qusal/dotfiles/files/gtk/.config/gtk-2.0/gtkrc-2.0 create mode 100644 qusal/dotfiles/files/gtk/.config/gtk-2.0/qubes-incoming-bookmark-created create mode 100644 qusal/dotfiles/files/gtk/.config/gtk-3.0/bookmarks create mode 100644 qusal/dotfiles/files/gtk/.config/gtk-3.0/qubes-incoming-bookmark-created create mode 100644 qusal/dotfiles/files/gtk/.config/gtk-3.0/settings.ini create mode 100644 qusal/dotfiles/files/gtk/.config/gtk-4.0/bookmarks create mode 100644 qusal/dotfiles/files/gtk/.config/gtk-4.0/qubes-incoming-bookmark-created create mode 100644 qusal/dotfiles/files/gtk/.config/gtk-4.0/settings.ini create mode 120000 qusal/dotfiles/files/net/.config/curl/.curlrc create mode 100644 qusal/dotfiles/files/net/.config/curl/curlrc create mode 100644 qusal/dotfiles/files/net/.config/urlview/urlview create mode 100644 qusal/dotfiles/files/net/.config/wget/wgetrc create mode 120000 qusal/dotfiles/files/net/.urlview create mode 100644 qusal/dotfiles/files/net/.w3m/keymap create mode 100644 qusal/dotfiles/files/pgp/.gnupg/gpg.conf create mode 100755 qusal/dotfiles/files/qvm-copy-dotfiles create mode 100755 qusal/dotfiles/files/setup.sh create mode 120000 qusal/dotfiles/files/sh/.bash_env create mode 120000 qusal/dotfiles/files/sh/.bash_logout create mode 120000 qusal/dotfiles/files/sh/.bash_profile create mode 120000 qusal/dotfiles/files/sh/.bashrc create mode 100644 qusal/dotfiles/files/sh/.config/bash/bash_env create mode 100644 qusal/dotfiles/files/sh/.config/bash/bash_logout create mode 100644 qusal/dotfiles/files/sh/.config/bash/bash_profile create mode 100644 qusal/dotfiles/files/sh/.config/bash/bashrc create mode 100644 qusal/dotfiles/files/sh/.config/bash/inputrc create mode 100644 qusal/dotfiles/files/sh/.config/dircolors/dircolors create mode 100755 qusal/dotfiles/files/sh/.config/less/lessfilter create mode 100644 qusal/dotfiles/files/sh/.config/less/lesskey create mode 100644 qusal/dotfiles/files/sh/.config/less/lesskey-old create mode 100644 qusal/dotfiles/files/sh/.config/sh/profile create mode 100644 qusal/dotfiles/files/sh/.config/sh/shrc create mode 100644 qusal/dotfiles/files/sh/.config/user-dirs.dirs create mode 100644 qusal/dotfiles/files/sh/.config/user-dirs.locale create mode 120000 qusal/dotfiles/files/sh/.config/zsh/.zlogout create mode 120000 qusal/dotfiles/files/sh/.config/zsh/.zprofile create mode 120000 qusal/dotfiles/files/sh/.config/zsh/.zshenv create mode 120000 qusal/dotfiles/files/sh/.config/zsh/.zshrc create mode 100644 qusal/dotfiles/files/sh/.config/zsh/zlogout create mode 100644 qusal/dotfiles/files/sh/.config/zsh/zprofile create mode 100644 qusal/dotfiles/files/sh/.config/zsh/zshenv create mode 100644 qusal/dotfiles/files/sh/.config/zsh/zshrc create mode 120000 qusal/dotfiles/files/sh/.profile create mode 120000 qusal/dotfiles/files/sh/.zprofile create mode 100644 qusal/dotfiles/files/ssh/.ssh/config create mode 100644 qusal/dotfiles/files/tmux/.config/tmux/tmux.conf create mode 100644 qusal/dotfiles/files/vim/.config/vim/after/autoload/pathogen.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/after/colors/tango2.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/after/colors/torte.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/after/colors/vividchalk.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/after/ftplugin/markdown.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/after/macros/less.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/after/plugin/cool.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/after/plugin/lastplace.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/after/plugin/update-time.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftdetect/jinja.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftplugin/jinja.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/syntax/jinja.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftdetect/salt.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftplugin/salt.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/indent/salt.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/syntax/salt.vim create mode 100644 qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/test/file.sls create mode 100644 qusal/dotfiles/files/vim/.config/vim/vimrc create mode 120000 qusal/dotfiles/files/x11/.Xresources create mode 100755 qusal/dotfiles/files/x11/.config/x11/xinitrc create mode 100755 qusal/dotfiles/files/x11/.config/x11/xprofile create mode 100644 qusal/dotfiles/files/x11/.config/x11/xresources create mode 100755 qusal/dotfiles/files/x11/.config/x11/xsession create mode 100755 qusal/dotfiles/files/x11/.config/x11/xsessionrc create mode 120000 qusal/dotfiles/files/x11/.xsession create mode 120000 qusal/dotfiles/files/x11/.xsessionrc create mode 100644 qusal/media/README.md create mode 100644 qusal/media/clone.sls create mode 100644 qusal/media/clone.top create mode 100644 qusal/media/configure.sls create mode 100644 qusal/media/configure.top create mode 100644 qusal/media/create.sls create mode 100644 qusal/media/create.top create mode 100644 qusal/media/files/app/mimeapps.list create mode 100644 qusal/media/files/disp/mimeapps.list create mode 100644 qusal/media/files/policy/default.policy create mode 100644 qusal/media/init.top create mode 100644 qusal/media/install.sls create mode 100644 qusal/media/install.top create mode 100644 qusal/mgmt/README.md create mode 100644 qusal/mgmt/clone.sls create mode 100644 qusal/mgmt/clone.top create mode 100644 qusal/mgmt/confirm.sls create mode 100644 qusal/mgmt/confirm.top create mode 100644 qusal/mgmt/create.sls create mode 100644 qusal/mgmt/create.top create mode 100644 qusal/mgmt/init.top create mode 100644 qusal/mgmt/install.sls create mode 100644 qusal/mgmt/install.top create mode 100644 qusal/mutt/README.md create mode 100644 qusal/mutt/clone.sls create mode 100644 qusal/mutt/clone.top create mode 100644 qusal/mutt/configure.sls create mode 100644 qusal/mutt/configure.top create mode 100644 qusal/mutt/create.sls create mode 100644 qusal/mutt/create.top create mode 100644 qusal/mutt/files/mutt/conf.d/bindings.muttrc create mode 100644 qusal/mutt/files/mutt/conf.d/colors.muttrc create mode 100644 qusal/mutt/files/mutt/conf.d/lists.muttrc create mode 100644 qusal/mutt/files/mutt/conf.d/mailbox.muttrc create mode 100644 qusal/mutt/files/mutt/conf.d/pgp.muttrc create mode 100644 qusal/mutt/files/mutt/conf.d/server.muttrc create mode 100644 qusal/mutt/files/mutt/muttrc create mode 100644 qusal/mutt/init.top create mode 100644 qusal/mutt/install.sls create mode 100644 qusal/mutt/install.top create mode 100644 qusal/qubes-builder/README.md create mode 100644 qusal/qubes-builder/clone.sls create mode 100644 qusal/qubes-builder/clone.top create mode 100644 qusal/qubes-builder/configure-qubes-executor.sls create mode 100644 qusal/qubes-builder/configure-qubes-executor.top create mode 100644 qusal/qubes-builder/configure.sls create mode 100644 qusal/qubes-builder/configure.top create mode 100644 qusal/qubes-builder/create.sls create mode 100644 qusal/qubes-builder/create.top create mode 100644 qusal/qubes-builder/files/keys/0064428F455451B3EBE78A7F063938BA42CFA724.asc create mode 100644 qusal/qubes-builder/files/keys/274E12AB03F2FE293765FC06DA0434BC706E1FCF.asc create mode 100644 qusal/qubes-builder/files/keys/427F11FD0FAA4B080123F01CDDFA1A3E36879494.asc create mode 100644 qusal/qubes-builder/files/keys/9FA64B92F95E706BF28E2CA6484010B5CDC576E2.asc create mode 100644 qusal/qubes-builder/files/keys/otrust.txt create mode 100644 qusal/qubes-builder/files/keys/pubring.kbx create mode 100644 qusal/qubes-builder/files/keys/trustdb.gpg create mode 100644 qusal/qubes-builder/files/policy/default.policy create mode 100644 qusal/qubes-builder/files/qubes-builder/gpg-split-domain create mode 100644 qusal/qubes-builder/files/qubes-builder/rpmmacros create mode 100644 qusal/qubes-builder/files/qubes-executor/builder.conf create mode 100755 qusal/qubes-builder/files/rpc/qubesbuilder.FileCopyIn create mode 100755 qusal/qubes-builder/files/rpc/qubesbuilder.FileCopyOut create mode 100644 qusal/qubes-builder/init.sls create mode 100644 qusal/qubes-builder/init.top create mode 100644 qusal/qubes-builder/install-qubes-executor.sls create mode 100644 qusal/qubes-builder/install-qubes-executor.top create mode 100644 qusal/qubes-builder/install.sls create mode 100644 qusal/qubes-builder/install.top create mode 100644 qusal/reader/README.md create mode 100644 qusal/reader/clone.sls create mode 100644 qusal/reader/clone.top create mode 100644 qusal/reader/create.sls create mode 100644 qusal/reader/create.top create mode 100644 qusal/reader/init.top create mode 100644 qusal/reader/install.sls create mode 100644 qusal/reader/install.top create mode 100644 qusal/remmina/README.md create mode 100644 qusal/remmina/appmenus.sls create mode 100644 qusal/remmina/appmenus.top create mode 100644 qusal/remmina/clone.sls create mode 100644 qusal/remmina/clone.top create mode 100644 qusal/remmina/create.sls create mode 100644 qusal/remmina/create.top create mode 100644 qusal/remmina/init.top create mode 100644 qusal/remmina/install.sls create mode 100644 qusal/remmina/install.top create mode 100644 qusal/signal/README.md create mode 100644 qusal/signal/clone.sls create mode 100644 qusal/signal/clone.top create mode 100644 qusal/signal/configure.sls create mode 100644 qusal/signal/configure.top create mode 100644 qusal/signal/create.sls create mode 100644 qusal/signal/create.top create mode 100644 qusal/signal/files/repo/signal.asc create mode 100644 qusal/signal/files/repo/signal.list create mode 100644 qusal/signal/files/repo/signal.sources create mode 100644 qusal/signal/firewall.sls create mode 100644 qusal/signal/firewall.top create mode 100644 qusal/signal/init.top create mode 100644 qusal/signal/install.sls create mode 100644 qusal/signal/install.top create mode 100644 qusal/ssh/README.md create mode 100644 qusal/ssh/clone.sls create mode 100644 qusal/ssh/clone.top create mode 100644 qusal/ssh/configure.sls create mode 100644 qusal/ssh/configure.top create mode 100644 qusal/ssh/create.sls create mode 100644 qusal/ssh/create.top create mode 100644 qusal/ssh/init.top create mode 100644 qusal/ssh/install.sls create mode 100644 qusal/ssh/install.top create mode 100644 qusal/sys-cacher/README.md create mode 100644 qusal/sys-cacher/clone.sls create mode 100644 qusal/sys-cacher/clone.top create mode 100644 qusal/sys-cacher/configure.sls create mode 100644 qusal/sys-cacher/configure.top create mode 100644 qusal/sys-cacher/create.sls create mode 100644 qusal/sys-cacher/create.top create mode 100644 qusal/sys-cacher/deinit.top create mode 100644 qusal/sys-cacher/files/bind-dirs/50_user.conf create mode 100644 qusal/sys-cacher/files/conf/acng.conf create mode 100644 qusal/sys-cacher/files/mirrors/archlx_mirrors create mode 100644 qusal/sys-cacher/files/mirrors/fedora_mirrors create mode 100644 qusal/sys-cacher/files/policy/default.policy create mode 100644 qusal/sys-cacher/init.top create mode 100644 qusal/sys-cacher/install-client.sls create mode 100644 qusal/sys-cacher/install-client.top create mode 100644 qusal/sys-cacher/install.sls create mode 100644 qusal/sys-cacher/install.top create mode 100644 qusal/sys-cacher/remove-policy.sls create mode 100644 qusal/sys-cacher/tag.sls create mode 100644 qusal/sys-cacher/tag.top create mode 100644 qusal/sys-cacher/uninstall-client.sls create mode 100644 qusal/sys-cacher/uninstall-client.top create mode 100644 qusal/sys-cacher/untag.sls create mode 100644 qusal/sys-cacher/untag.top create mode 100644 qusal/sys-firewall/README.md create mode 100644 qusal/sys-firewall/clone.sls create mode 100644 qusal/sys-firewall/clone.top create mode 100644 qusal/sys-firewall/create.sls create mode 100644 qusal/sys-firewall/create.top create mode 100644 qusal/sys-firewall/init.top create mode 100644 qusal/sys-firewall/install.sls create mode 100644 qusal/sys-firewall/install.top create mode 100644 qusal/sys-firewall/prefs-disp.sls create mode 100644 qusal/sys-firewall/prefs-disp.top create mode 100644 qusal/sys-firewall/prefs.sls create mode 100644 qusal/sys-firewall/prefs.top create mode 100644 qusal/sys-git/README.md create mode 100644 qusal/sys-git/clone.sls create mode 100644 qusal/sys-git/clone.top create mode 100644 qusal/sys-git/configure.sls create mode 100644 qusal/sys-git/configure.top create mode 100644 qusal/sys-git/create.sls create mode 100644 qusal/sys-git/create.top create mode 100755 qusal/sys-git/files/client/git-core/git-init-qrexec create mode 100755 qusal/sys-git/files/client/git-core/git-remote-qrexec create mode 100755 qusal/sys-git/files/client/git-core/git-remote-qrexec-connect create mode 100644 qusal/sys-git/files/policy/default.policy create mode 120000 qusal/sys-git/files/rpc/qusal.GitFetch create mode 100644 qusal/sys-git/files/rpc/qusal.GitInit create mode 120000 qusal/sys-git/files/rpc/qusal.GitPush create mode 100644 qusal/sys-git/init.top create mode 100644 qusal/sys-git/install-client.sls create mode 100644 qusal/sys-git/install-client.top create mode 100644 qusal/sys-git/install.sls create mode 100644 qusal/sys-git/install.top create mode 100644 qusal/sys-net/README.md create mode 100644 qusal/sys-net/clone.sls create mode 100644 qusal/sys-net/clone.top create mode 100644 qusal/sys-net/create.sls create mode 100644 qusal/sys-net/create.top create mode 100644 qusal/sys-net/files/policy/default.policy create mode 100644 qusal/sys-net/firmware.txt create mode 100644 qusal/sys-net/init.top create mode 100644 qusal/sys-net/install-debug.sls create mode 100644 qusal/sys-net/install-debug.top create mode 100644 qusal/sys-net/install.sls create mode 100644 qusal/sys-net/install.top create mode 100644 qusal/sys-net/prefs-disp.sls create mode 100644 qusal/sys-net/prefs-disp.top create mode 100644 qusal/sys-net/prefs.sls create mode 100644 qusal/sys-net/prefs.top create mode 100644 qusal/sys-pgp/README.md create mode 100644 qusal/sys-pgp/clone.sls create mode 100644 qusal/sys-pgp/clone.top create mode 100644 qusal/sys-pgp/configure.sls create mode 100644 qusal/sys-pgp/configure.top create mode 100644 qusal/sys-pgp/create.sls create mode 100644 qusal/sys-pgp/create.top create mode 100644 qusal/sys-pgp/files/policy/default.policy create mode 100644 qusal/sys-pgp/init.top create mode 100644 qusal/sys-pgp/install-client.sls create mode 100644 qusal/sys-pgp/install-client.top create mode 100644 qusal/sys-pgp/install.sls create mode 100644 qusal/sys-pgp/install.top create mode 100644 qusal/sys-pihole/README.md create mode 100644 qusal/sys-pihole/clone.sls create mode 100644 qusal/sys-pihole/clone.top create mode 100644 qusal/sys-pihole/create.sls create mode 100644 qusal/sys-pihole/create.top create mode 100644 qusal/sys-pihole/files/firewall/flush create mode 100644 qusal/sys-pihole/files/firewall/flush.sh create mode 100644 qusal/sys-pihole/files/firewall/internalise.sh create mode 100644 qusal/sys-pihole/files/firewall/update_nft.sh create mode 100644 qusal/sys-pihole/files/network/eth0 create mode 100644 qusal/sys-pihole/files/network/setupVars.conf create mode 100755 qusal/sys-pihole/files/prefs.sh create mode 100644 qusal/sys-pihole/init.top create mode 100644 qusal/sys-pihole/install.sls create mode 100644 qusal/sys-pihole/install.top create mode 100644 qusal/sys-pihole/prefs.sls create mode 100644 qusal/sys-pihole/prefs.top create mode 100644 qusal/sys-ssh-agent/README.md create mode 100644 qusal/sys-ssh-agent/clone.sls create mode 100644 qusal/sys-ssh-agent/clone.top create mode 100644 qusal/sys-ssh-agent/configure.sls create mode 100644 qusal/sys-ssh-agent/configure.top create mode 100644 qusal/sys-ssh-agent/create.sls create mode 100644 qusal/sys-ssh-agent/create.top create mode 100755 qusal/sys-ssh-agent/files/agent/bin/qvm-ssh-agent create mode 100644 qusal/sys-ssh-agent/files/agent/systemd/qubes-ssh-agent-sock@.service create mode 100644 qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client-sock@.service create mode 100644 qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client@.service create mode 100644 qusal/sys-ssh-agent/files/policy/default.policy create mode 100644 qusal/sys-ssh-agent/files/rpc/qusal.SshAgent create mode 100644 qusal/sys-ssh-agent/init.top create mode 100644 qusal/sys-ssh-agent/install-client.sls create mode 100644 qusal/sys-ssh-agent/install-client.top create mode 100644 qusal/sys-ssh-agent/install.sls create mode 100644 qusal/sys-ssh-agent/install.top create mode 100644 qusal/sys-syncthing/README.md create mode 100644 qusal/sys-syncthing/appmenus.sls create mode 100644 qusal/sys-syncthing/appmenus.top create mode 100644 qusal/sys-syncthing/cancel.sls create mode 100644 qusal/sys-syncthing/cancel.top create mode 100644 qusal/sys-syncthing/clean.sls create mode 100644 qusal/sys-syncthing/clone.sls create mode 100644 qusal/sys-syncthing/clone.top create mode 100644 qusal/sys-syncthing/configure.sls create mode 100644 qusal/sys-syncthing/configure.top create mode 100644 qusal/sys-syncthing/create.sls create mode 100644 qusal/sys-syncthing/create.top create mode 100644 qusal/sys-syncthing/files/firewall/in.sh create mode 100644 qusal/sys-syncthing/files/policy/default.policy create mode 100644 qusal/sys-syncthing/files/repo/syncthing.asc create mode 100644 qusal/sys-syncthing/files/repo/syncthing.list create mode 100644 qusal/sys-syncthing/files/repo/syncthing.sources create mode 100644 qusal/sys-syncthing/files/rpc/qubes-syncthing.service create mode 100644 qusal/sys-syncthing/files/rpc/qusal.Syncthing create mode 100644 qusal/sys-syncthing/init.top create mode 100644 qusal/sys-syncthing/install.sls create mode 100644 qusal/sys-syncthing/install.top create mode 100644 qusal/sys-usb/README.md create mode 100644 qusal/sys-usb/clone.sls create mode 100644 qusal/sys-usb/clone.top create mode 100644 qusal/sys-usb/create.sls create mode 100644 qusal/sys-usb/create.top create mode 100644 qusal/sys-usb/files/policy/default.policy create mode 100644 qusal/sys-usb/init.top create mode 100644 qusal/sys-usb/install-client-cryptsetup.sls create mode 100644 qusal/sys-usb/install-client-cryptsetup.top create mode 100644 qusal/sys-usb/install-client-fido.sls create mode 100644 qusal/sys-usb/install-client-fido.top create mode 100644 qusal/sys-usb/install-client-proxy.sls create mode 100644 qusal/sys-usb/install-client-proxy.top create mode 100644 qusal/sys-usb/install-client.sls create mode 100644 qusal/sys-usb/install-client.top create mode 100644 qusal/sys-usb/install.sls create mode 100644 qusal/sys-usb/install.top create mode 100644 qusal/sys-usb/keyboard.sls create mode 100644 qusal/sys-usb/keyboard.top create mode 100644 qusal/templates/README.md create mode 100644 qusal/templates/debian-minimal.jinja create mode 100644 qusal/templates/debian-minimal/README.md create mode 100644 qusal/templates/debian-minimal/clone.sls create mode 100644 qusal/templates/debian-minimal/clone.top create mode 100644 qusal/templates/debian-minimal/create.sls create mode 100644 qusal/templates/debian-minimal/create.top create mode 100644 qusal/templates/debian-minimal/init.top create mode 100644 qusal/templates/debian-minimal/install.sls create mode 100644 qusal/templates/debian-minimal/install.top create mode 100644 qusal/templates/debian.jinja create mode 100644 qusal/templates/debian/README.md create mode 100644 qusal/templates/debian/clone.sls create mode 100644 qusal/templates/debian/clone.top create mode 100644 qusal/templates/debian/create.sls create mode 100644 qusal/templates/debian/create.top create mode 100644 qusal/templates/debian/init.top create mode 100644 qusal/templates/debian/install.sls create mode 100644 qusal/templates/debian/install.top create mode 100644 qusal/templates/fedora-minimal.jinja create mode 100644 qusal/templates/fedora-minimal/README.md create mode 100644 qusal/templates/fedora-minimal/clone.sls create mode 100644 qusal/templates/fedora-minimal/clone.top create mode 100644 qusal/templates/fedora-minimal/create.sls create mode 100644 qusal/templates/fedora-minimal/create.top create mode 100644 qusal/templates/fedora-minimal/init.top create mode 100644 qusal/templates/fedora-minimal/install.sls create mode 100644 qusal/templates/fedora-minimal/install.top create mode 100644 qusal/templates/fedora.jinja create mode 100644 qusal/templates/fedora/README.md create mode 100644 qusal/templates/fedora/clone.sls create mode 100644 qusal/templates/fedora/clone.top create mode 100644 qusal/templates/fedora/create.sls create mode 100644 qusal/templates/fedora/create.top create mode 100644 qusal/templates/fedora/init.top create mode 100644 qusal/templates/fedora/install.sls create mode 100644 qusal/templates/fedora/install.top create mode 100644 qusal/templates/whonix.jinja create mode 100644 qusal/templates/whonix/README.md create mode 100644 qusal/templates/whonix/clone.sls create mode 100644 qusal/templates/whonix/clone.top create mode 100644 qusal/templates/whonix/create.sls create mode 100644 qusal/templates/whonix/create.top create mode 100644 qusal/templates/whonix/init.top create mode 100644 qusal/templates/whonix/install.sls create mode 100644 qusal/templates/whonix/install.top create mode 100644 qusal/terraform/README.md create mode 100644 qusal/terraform/clone.sls create mode 100644 qusal/terraform/clone.top create mode 100644 qusal/terraform/create.sls create mode 100644 qusal/terraform/create.top create mode 100644 qusal/terraform/files/repo/terraform.asc create mode 100644 qusal/terraform/files/repo/terraform.list create mode 100644 qusal/terraform/files/repo/terraform.sources create mode 100644 qusal/terraform/init.top create mode 100644 qusal/terraform/install.sls create mode 100644 qusal/terraform/install.top create mode 100644 qusal/utils/macros/clone-template.sls create mode 100644 qusal/utils/macros/install-repo.sls create mode 100644 qusal/utils/macros/policy.sls create mode 100644 qusal/utils/macros/switch-template.sls create mode 100644 qusal/utils/macros/sync-appmenus.sls create mode 100644 qusal/utils/tools/builder/core.sls create mode 100644 qusal/utils/tools/builder/doc.sls create mode 100644 qusal/utils/tools/zsh/README.md create mode 100644 qusal/utils/tools/zsh/change-shell.sls create mode 100644 qusal/utils/tools/zsh/change-shell.top create mode 100644 qusal/utils/tools/zsh/init.sls create mode 100644 qusal/utils/tools/zsh/init.top create mode 100644 qusal/utils/tools/zsh/install.sls create mode 100644 qusal/utils/tools/zsh/install.top create mode 100644 qusal/utils/tools/zsh/touch-zshrc.sls create mode 100644 qusal/utils/tools/zsh/touch-zshrc.top create mode 100644 qusal/vault/README.md create mode 100644 qusal/vault/clone.sls create mode 100644 qusal/vault/clone.top create mode 100644 qusal/vault/create.sls create mode 100644 qusal/vault/create.top create mode 100644 qusal/vault/init.top create mode 100644 qusal/vault/install.sls create mode 100644 qusal/vault/install.top create mode 100644 rpm_spec/example.spec.tpl create mode 100755 scripts/salt-fix.sh create mode 100755 scripts/salt-lint.sh create mode 100755 scripts/setup.sh create mode 100755 scripts/shell-lint.sh create mode 100755 scripts/spec-build.sh create mode 100755 scripts/spec-gen.sh create mode 100755 scripts/spec-get.sh diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3a67ed7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +qusal/qubesos-github-io +qusal/sys-audio +qusal/sys-wireguard diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..c3b8225 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,8 @@ +repos: +- repo: local + hooks: + - id: salt-lint + name: salt-lint + entry: salt-lint.sh + language: script + pass_filenames: false diff --git a/.salt-lint b/.salt-lint new file mode 100644 index 0000000..b1fdea3 --- /dev/null +++ b/.salt-lint @@ -0,0 +1,4 @@ +--- +skip_list: + - 205 # use '.sls' as a Salt State file extension +severity: true diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100644 index 0000000..b7dea0c --- /dev/null +++ b/README.md @@ -0,0 +1,121 @@ +# qusal + +## Table of Contents + +* [Description](#description) +* [Installation](#installation) +* [Format](#format) + * [File naming](#file-naming) + * [Readme](#readme) + * [Qube naming](#qube-naming) + * [Qrexec](#qrexec) +* [Copyright](#copyright) + +## Description + +Qusal - Salt Formulas for Qubes OS R4.1. + +Qusal' goal: +- All global preferences customized to use qubes based on minimal templates; +- All service templates with only the necessary programs installed; +- Focus on tasks and usability + +Each project is in a separate directory, but they may interact with other +projects. + +User policies should always be set on /etc/qubes/policy.d/30-user.policy as +this file will take precedence over the packaged policy. + +Qubes global settings (qubes-prefs) that will be managed: + +clockvm : disp-sys-net or sys-net +default_audiovm : dom0 # TODO +default_dispvm : reader +default_netvm : sys-pihole or sys-firewall or disp-sys-firewall +management_dispvm : dvm-mgmt +updatevm : sys-pihole or sys-firewall or disp-sys-firewall + +## Installation + +Clone this repository: +```sh +git clone https://github.com/ben-grande/qusal.git ~/qusal +git clone ssh://git@github.com/ben-grande/qusal.git ~/qusal +``` + +Copy this repository from some qube to Dom0 from Dom0: +```sh +mkdir -p ~/QubesIncoming/QUBE +qvm-run -p tar -cC qusal | tar -xvC ~/QubesIncoming/QUBE qusal +``` +Example copying repository from the `dev` qube to Dom0 by running in Dom0: +```sh +mkdir -p ~/QubesIncoming/dev +qvm-run -p tar -cC /home/user qusal | tar -xvC ~/QubesIncoming/QUBE qusal +``` + +Copy the files to the Salt directories: +```sh +cd qusal +./setup.sh +``` + +The RPM packaging is not ready, help wanted for automatic generation. + +## Format + +### File naming + +1. Every State file `.sls` must have a Top file `.top`. This ensures that + every state can be applied with top. +2. Every project must have a `init.top`, it facilitates applying every state + by enabling a single top file. +3. State file naming should be common between the projects, it helps + understand the project as if it was any other. +5. Files names and state IDs should use `-` as separator, not `_`. + +### Readme + +1. Every project should have a README.md with at least the following sections: + Table of Contents, Description, Installation, Access Control (if changed + Qrexec policy), Usage. + +### Qube naming + +1. Qube name format: + - TemplateVM: `tpl-NAME` + - StandaloneVM: `NAME` + - AppVM: `NAME` + - DispVM: `disp-NAME` + - DispVM Template (AppVM): `dvm-NAME` + - Service qubes (not a class): `sys-NAME` +2. Label: + - Black (Ultimately trusted): You must trust Dom0, Templates, Vaults, + Management qubes, these qubes control your system and hold valuable + information. Examples: dom0, tpl-ssh, vault, default-mgmt-dvm. + - Gray (Fully trusted): Trusted storage with extra RPC services that allow + certain operations to be made by the client and executed on the server. + Examples: sys-cacher, sys-git, sys-pgp, sys-ssh-agent. + - Purple, Blue, Green, Yellow (Relatively trusted per domain): Can be set + per user discretion, normally separated per domain (work, clients, + personal). + - Orange (Slightly trusted) Controls the flow of data to the client, + normally a firewall. Examples: sys-firewall, sys-vpn, sys-pihole. + - Red (Untrusted): Holds untrusted data (PCI devices, untrusted programs, + disposables for opening untrusted files or web pages). Examples: sys-net, + sys-usb, disp-sys-usb, disp-browser. + +### Qrexec + +1. Don't use `*` for source and destination, use `@anyvm` instead +2. Target qube for policies must be `@default`. It allows for the real target + to be set by Dom0 via the `target=` redirection parameter, instead of + having to modify the client to target a different server via + `qrexec-client-vm`. +3. Target qube for client script must default to `@default`, but other targets + must be allowed via parameters. + +## Copyright + +Each project has a README.md containing the license name and credits to the +copyright owners. diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..0870b47 --- /dev/null +++ b/TODO.md @@ -0,0 +1,25 @@ +# TODO + +## Priority + +- best-practices: use map.jinja to target different OSes - https://docs.saltproject.io/en/latest/topics/best_practices.html +- sys-ssh-agent: test +- sys-pgp: split-gpg2 support: Working in R4.1? +- sys-git: support Dom0 as a client, useful for fetching +- sys-cacher: test +- sys-syncthing: test +- terraform: test +- rpm_spec: adapt READMEs to be parsed by the spec builder + +## Medium Priority + +- sys-usb: + - multiple PCI assignment to different qubes fails due to ext_module_qvm.py + bug + - CTAP support +- sys-net: multiple PCI assignment to be implemented + +## Least Priority + +- sys-vpn: nftables porting, waiting for reviewed version of qubes community +- qubesos-github-io: cannot build locally, waiting for upstream fix diff --git a/minion.d/qusal.conf b/minion.d/qusal.conf new file mode 100644 index 0000000..393d5fd --- /dev/null +++ b/minion.d/qusal.conf @@ -0,0 +1,5 @@ +--- +file_roots: + base: + - /srv/salt/qusal +# vim:ft=yaml diff --git a/qusal/ansible/README.md b/qusal/ansible/README.md new file mode 100644 index 0000000..4a67999 --- /dev/null +++ b/qusal/ansible/README.md @@ -0,0 +1,53 @@ +# ansible + +## Table of Contents + +* [Description](#description) +* [Installation](#installation) +* [Usage](#usage) +* [Copyright](#copyright) + +## Description + +Ansible installation in Qubes OS. + +## Installation + +- Top +```sh +qubesctl top.enable ansible +qubesctl --targets=tpl-ansible,ansible,ansible-minion state.apply +qubesctl top.disable ansible +``` + +- State +```sh +qubesctl state.apply ansible.create +qubesctl --skip-dom0 --targets=tpl-ansible state.apply ansible.install +qubesctl --skip-dom0 --targets=ansible state.apply ansible.configure,zsh.touch-zshrc +qubesctl --skip-dom0 --targets=ansible-minion state.apply ansible.configure-minion,zsh.touch-zshrc +``` + +## Usage + +Configure the control node `ansible`: +```sh +ssh-keygen -t ed25519 -N "" -f ~/.ssh/id_ansible +qvm-copy ~/.ssh/id_ansible.pub +``` +Select `ansible-minion` as the target qube for the copy operation. + +Configure the minion `ansible-minion`: +```sh +mkdir -m 0700 ~/.ssh +cat ~/QubesIncoming/ansible/id_ansible.pub >> ~/.ssh/authorized_keys +``` + +From the control node `ansible`, test connection to the minion +`ansible-minion`: +```sh +ssh minion +``` +## Copyright + +License: GPLv2+ diff --git a/qusal/ansible/clone.sls b/qusal/ansible/clone.sls new file mode 100644 index 0000000..9995809 --- /dev/null +++ b/qusal/ansible/clone.sls @@ -0,0 +1,2 @@ +{% from 'utils/macros/clone-template.sls' import clone_template -%} +{{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/ansible/clone.top b/qusal/ansible/clone.top new file mode 100644 index 0000000..8687217 --- /dev/null +++ b/qusal/ansible/clone.top @@ -0,0 +1,4 @@ +base: + 'dom0': + - match: nodegroup + - ansible.clone diff --git a/qusal/ansible/configure-minion.sls b/qusal/ansible/configure-minion.sls new file mode 100644 index 0000000..81287d2 --- /dev/null +++ b/qusal/ansible/configure-minion.sls @@ -0,0 +1,20 @@ +{% if grains['nodename'] != 'dom0' -%} + +"{{ slsdotpath }}-minion-start-sshd": + file.managed: + - name: /rw/config/rc.local + - source: salt://{{ slsdotpath }}/files/minion/rc.local + - mode: '0755' + - user: root + - group: root + +"{{ slsdotpath }}-minion-ssh-authorized_keys": + file.touch: + - name: /home/user/.ssh/authorized_keys + - dir_mode: '0700' + - file_mode: '0600' + - user: user + - group: user + - makedirs: True + +{% endif -%} diff --git a/qusal/ansible/configure-minion.top b/qusal/ansible/configure-minion.top new file mode 100644 index 0000000..e010ff2 --- /dev/null +++ b/qusal/ansible/configure-minion.top @@ -0,0 +1,3 @@ +base: + 'ansible': + - ansible.configure-minion diff --git a/qusal/ansible/configure.sls b/qusal/ansible/configure.sls new file mode 100644 index 0000000..bf51837 --- /dev/null +++ b/qusal/ansible/configure.sls @@ -0,0 +1,21 @@ +{% if grains['nodename'] != 'dom0' -%} + +"{{ slsdotpath }}-autostart-ssh-over-qrexec": + file.managed: + - name: /rw/config/rc.local + - source: salt://{{ slsdotpath }}/files/server/rc.local + - mode: '0755' + - user: root + - group: root + +"{{ slsdotpath }}-ssh-config": + file.managed: + - name: /home/user/.ssh/config + - source: salt://{{ slsdotpath }}/files/server/ssh-config + - file_mode: '0600' + - dir_mode: '0700' + - user: root + - group: root + - makedirs: True + +{% endif -%} diff --git a/qusal/ansible/configure.top b/qusal/ansible/configure.top new file mode 100644 index 0000000..5de08ff --- /dev/null +++ b/qusal/ansible/configure.top @@ -0,0 +1,3 @@ +base: + 'ansible': + - ansible.configure diff --git a/qusal/ansible/create.sls b/qusal/ansible/create.sls new file mode 100644 index 0000000..bb38528 --- /dev/null +++ b/qusal/ansible/create.sls @@ -0,0 +1,66 @@ +include: + - .clone + +"tpl-{{ slsdotpath }}": + qvm.vm: + - require: + - sls: {{ slsdotpath }}.clone + - name: tpl-{{ slsdotpath }} + - prefs: + - memory: 300 + - maxmem: 400 + - features: + - set: + - default-menu-items: "qubes-run-terminal.desktop qubes-start.desktop" + - menu-items: "qubes-run-terminal.desktop qubes-start.desktop" + +"{{ slsdotpath }}": + qvm.vm: + - name: {{ slsdotpath }} + - require: + - sls: {{ slsdotpath }}.clone + - present: + - template: tpl-{{ slsdotpath }} + - label: blue + - prefs: + - template: tpl-{{ slsdotpath }} + - label: blue + - netvm: "" + - vpus: 1 + - memory: 400 + - maxmem: 500 + - autostart: False + - include_in_backups: True + - features: + - set: + - menu-items: "qubes-run-terminal.desktop qubes-start.desktop" + - disable: + - service.cups + - service.cups-browsed + +"{{ slsdotpath }}-minion": + qvm.vm: + - name: {{ slsdotpath }}-minion + - require: + - sls: {{ slsdotpath }}.clone + - present: + - template: tpl-{{ slsdotpath }} + - label: blue + - prefs: + - template: tpl-{{ slsdotpath }} + - label: blue + - netvm: "" + - vpus: 1 + - memory: 400 + - maxmem: 500 + - autostart: False + - include_in_backups: True + - features: + - set: + - menu-items: "qubes-run-terminal.desktop qubes-start.desktop" + - disable: + - service.cups + - service.cups-browsed + +{% from 'utils/macros/policy.sls' import policy_set with context -%} +{{ policy_set(sls_path, '80') }} diff --git a/qusal/ansible/create.top b/qusal/ansible/create.top new file mode 100644 index 0000000..aebb1fd --- /dev/null +++ b/qusal/ansible/create.top @@ -0,0 +1,4 @@ +base: + 'dom0': + - match: nodegroup + - ansible.create diff --git a/qusal/ansible/files/minion/99-sshd-ansible.conf b/qusal/ansible/files/minion/99-sshd-ansible.conf new file mode 100644 index 0000000..e63fae9 --- /dev/null +++ b/qusal/ansible/files/minion/99-sshd-ansible.conf @@ -0,0 +1 @@ +PubkeyAuthentication yes diff --git a/qusal/ansible/files/policy/default.policy b/qusal/ansible/files/policy/default.policy new file mode 100644 index 0000000..25e0448 --- /dev/null +++ b/qusal/ansible/files/policy/default.policy @@ -0,0 +1,4 @@ +## Do not modify this file, create a new policy with with a lower number in the +## file name instead. For example `30-user.policy`. +qubes.ConnectTCP +22 {{ sls_path }} @default allow target={{ sls_path }}-minion +## vim:ft=qrexecpolicy diff --git a/qusal/ansible/files/repo/ansible.asc b/qusal/ansible/files/repo/ansible.asc new file mode 100644 index 0000000..ab2304c --- /dev/null +++ b/qusal/ansible/files/repo/ansible.asc @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: Hostname: +Version: Hockeypuck 2.1.0-222-g25248d4 + +xsFNBFOXbTABEADKLcY3MYZyHIiCEu8cQ+0UzxZolTYZf8xZ06/d8xzUW/UBPTLV +x/40IzWJEZU87GCYVXUhdYXECrFQKQOOEWQswBxOt26/g0nIrU0edZ9cCZ9o9+ZO +sKDcScWNxWeclLr2+YHdmX9eph+2p+zIPmhNJaaWV6/bSo1fBi7ganZFRAc13zO8 +jtQsYyIeoAFwjt1vbk9CifdFhEchRVbwvZYhZDWfBZjhZ15UOunjo47gEkpK0PsW +HY5N3/c75pGMwMTCjHMKno6KFzhdKLaz/QgbNnpy1aMkA/LITeU6Pgg6iqofrSY3 +Fx73MCAb8EEytvSV/65wztKzexHjGYxhm5ygoET5tPyXciX0+XzojkZAHzUEeT5z +4kgL6OLyn+JQAyRDNnOJEkYmvwQveZuUjsYUkgc5DJdg6w7lTgQHWObOENpXls3B +DnphA4DJyc0PQODCxdSZo4ZXMLn5lE/0qvAJ6g/wntY/ee/vRKwy9iDMOWQvihTI +Y/L70/TnE4qZdaNbOJEvW59LT6GBTrcU1MX2fS5hU/mQa2CNixSVZG98rba3tfNa +LDDNqivkcxtWryEWd0giBzzUS+MhtxhHm77YgxNVyyFn8bXb25/W+Jq+VvWWx2KD +3ZwVD37X8wIBRLVozoH0jHVW7jKTnf2z+D6FCM+pVlm8zV1upXbHbdaRqwARAQAB +zR9MYXVuY2hwYWQgUFBBIGZvciBBbnNpYmxlLCBJbmMuwsF4BBMBAgAiBQJTl20w +AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCTxKP9e7nDZwzdD/9yFq+3 +ptLyWP1JN3RXsvTIJLhhjOqMMJCOocV0G3slHeUtdIDmvd2RaS8PeFNSd9QFbUzk +a7pBXec3a7kgEVorty2/+cZSpEVHT26oAbJnoH7E1YGii8bbnk9LqOCF/nLpasEq +PKqtVzXz+vGB7G0ox8qmRm6JynrMeLBftYemxJ8e4fii6APJxE6FPz/AvgcN3BtB +guseFwcga6lGcmp0JLofGhTbejfS9dW9bnCFJBtRfzUVd+Cb8aYuzV5zgCJgqOBJ +Hf0L6xDwn8UuzRfi0MWzEskuC/KxUJqVHMuTaLdrSeP1/czompetbsSHTfDklf/p +4EbSM9VqZFiKr17we0LdigAEv2JnL2Qj0oN3eRNU0sDJ3kZvh5qhnteNgSRM/el0 +Sly+34CRZzX25vd+pOTgwK6VFx3wvWfqn3pVNT9ASNalhogFXuBY2ukYJaiUTPsS +R4+KHiD3eIhWyayBGP+GRvGb5dVC29k4CjLvQM9lISmZrrxGmMGoV9S1dh7siZYE +CaVW0nKI95d6bBHaKH1g5HJ7NEsVTwf8LRY/FFpLsEPVw4HNVqqqwhuJnSW70WQ3 +blh0RIX/+z9hAla+M0kix7r0lS89ZBdTgwPuiCrkPRpoxi06ah/Q62uP3ZN4+dew +1sBZdaC9kaKdOOWTqArVnaPObQgUUJFhY9wUsA== +=uKv4 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/qusal/ansible/files/repo/ansible.list b/qusal/ansible/files/repo/ansible.list new file mode 100644 index 0000000..9f52a4e --- /dev/null +++ b/qusal/ansible/files/repo/ansible.list @@ -0,0 +1,2 @@ +deb [signed-by=/usr/share/keyrings/ansible.asc] http://ppa.launchpad.net/ansible/ansible/ubuntu focal main +# vim: ft=debsources diff --git a/qusal/ansible/files/repo/ansible.sources b/qusal/ansible/files/repo/ansible.sources new file mode 100644 index 0000000..b46570d --- /dev/null +++ b/qusal/ansible/files/repo/ansible.sources @@ -0,0 +1,6 @@ +Types: deb +URIs: http://ppa.launchpad.net/ansible/ansible/ubuntu +Suites: jammy +Components: main +Signed-by: /usr/share/keyrings/ansible.asc +# vim: ft=debsources diff --git a/qusal/ansible/files/server/99-ssh-ansible.conf b/qusal/ansible/files/server/99-ssh-ansible.conf new file mode 100644 index 0000000..26cf6f3 --- /dev/null +++ b/qusal/ansible/files/server/99-ssh-ansible.conf @@ -0,0 +1,8 @@ +Host minion ansible-minion + Hostname 127.0.0.1 + Port 22000 + User user + IdentityFile ~/.ssh/id_ansible.pub + PreferredAuthentications publickey + +# vim: ft=sshconfig diff --git a/qusal/ansible/init.top b/qusal/ansible/init.top new file mode 100644 index 0000000..51b84f8 --- /dev/null +++ b/qusal/ansible/init.top @@ -0,0 +1,11 @@ +base: + 'dom0': + - match: nodegroup + - ansible.create + 'tpl-ansible': + - ansible.install + 'ansible': + - zsh.touch-zshrc + - ansible.configure + 'ansible-minion': + - ansible.configure-minion diff --git a/qusal/ansible/install.sls b/qusal/ansible/install.sls new file mode 100644 index 0000000..4a36b10 --- /dev/null +++ b/qusal/ansible/install.sls @@ -0,0 +1,52 @@ +{% if grains['nodename'] != 'dom0' -%} + +include: + - utils.tools.zsh + +"{{ slsdotpath }}-updated": + pkg.uptodate: + - refresh: True + +"{{ slsdotpath }}-installed": + pkg.installed: + - refresh: True + - install_recommends: False + - skip_suggestions: True + - pkgs: + - ansible + {% if grains['os_family']|lower == 'debian' -%} + - openssh-client + - vim-nox + - python3-selinux + {% elif grains['os_family']|lower == 'redhat' -%} + - openssh-clients + - vim-enhanced + - vim-ansible + {% else -%} + - openssh-client + - vim + {% endif -%} + - python3-argcomplete + - python3-jmespath + - openssh-server + - qubes-core-agent-passwordless-root + - bash-completion + - man-db + +"{{ slsdotpath }}-ssh-config": + file.managed: + - name: /etc/ssh/ssh_config.d/99-ssh-ansible.conf + - source: salt://{{ slsdotpath }}/files/server/99-ssh-ansible.conf + - mode: '0644' + - user: root + - group: root + +"{{ slsdotpath }}-sshd-config": + file.managed: + - name: /etc/ssh/sshd_config.d/99-sshd-ansible.conf + - source: salt://{{ slsdotpath }}/files/minion/99-sshd-ansible.conf + - mode: '0644' + - user: root + - group: root + +{% endif -%} diff --git a/qusal/ansible/install.top b/qusal/ansible/install.top new file mode 100644 index 0000000..9e45875 --- /dev/null +++ b/qusal/ansible/install.top @@ -0,0 +1,3 @@ +base: + 'tpl-ansible': + - ansible.install diff --git a/qusal/browser/README.md b/qusal/browser/README.md new file mode 100644 index 0000000..95362f4 --- /dev/null +++ b/qusal/browser/README.md @@ -0,0 +1,72 @@ +# browser + +## Table of Contents + +* [Description](#description) +* [Installation](#installation) + * [Choose you browser](#choose-you-browser) +* [Copyright](#copyright) + +## Description + +Browser environment on Qubes OS + +Create environment for browsing. By default it creates a disposable template +called "dvm-browser", so when clicking the icon/launcher, it opens a +disposable qube. If you want to save your session, you can also clone the +template and create app qubes. + +Default browser to install is Chromium, but you can choose to install Chrome, +Firefox-ESR, W3M or Lynx. + +## Installation + +- Top +```sh +qubesctl top.enable browser +qubesctl --targets=tpl-browser state.apply +qubesctl top.disable browser +qubesctl state.apply browser.appmenus +``` + +- State +```sh +qubesctl state.apply browser.create +qubesctl --skip-dom0 --targets=tpl-browser state.apply browser.install +qubesctl state.apply browser.appmenus +``` + +### Choose you browser + +Instead of running the state `browser.install`, you can select which browser +to install: + +- Chromium: +```sh +qubesctl --skip-dom0 --targets=tpl-browser state.apply browser.install-chromium +``` +- Chrome: +```sh +qubesctl --skip-dom0 --targets=tpl-browser state.apply browser.install-chrome +``` +- Firefox-ESR: +```sh +qubesctl --skip-dom0 --targets=tpl-browser state.apply browser.install-firefox +``` +- W3M: +```sh +qubesctl --skip-dom0 --targets=tpl-browser state.apply browser.install-w3m +``` +- Lynx: +```sh +qubesctl --skip-dom0 --targets=tpl-browser state.apply browser.install-lynx +``` + +Do not forget to sync the `appmenus`: +```sh +qubesctl state.apply browser.appmenus +``` + +## Copyright + +License: GPLv2+ diff --git a/qusal/browser/appmenus.sls b/qusal/browser/appmenus.sls new file mode 100644 index 0000000..0211ae1 --- /dev/null +++ b/qusal/browser/appmenus.sls @@ -0,0 +1,2 @@ +{% from 'utils/macros/sync-appmenus.sls' import sync_appmenus -%} +{{ sync_appmenus('tpl-' ~ sls_path) }} diff --git a/qusal/browser/appmenus.top b/qusal/browser/appmenus.top new file mode 100644 index 0000000..a375038 --- /dev/null +++ b/qusal/browser/appmenus.top @@ -0,0 +1,4 @@ +base: + 'dom0': + - match: nodegroup + - browser.appmenus diff --git a/qusal/browser/clone.sls b/qusal/browser/clone.sls new file mode 100644 index 0000000..9995809 --- /dev/null +++ b/qusal/browser/clone.sls @@ -0,0 +1,2 @@ +{% from 'utils/macros/clone-template.sls' import clone_template -%} +{{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/browser/clone.top b/qusal/browser/clone.top new file mode 100644 index 0000000..6961e1e --- /dev/null +++ b/qusal/browser/clone.top @@ -0,0 +1,4 @@ +base: + 'dom0': + - match: nodegroup + - browser.clone diff --git a/qusal/browser/create.sls b/qusal/browser/create.sls new file mode 100644 index 0000000..7f593f4 --- /dev/null +++ b/qusal/browser/create.sls @@ -0,0 +1,35 @@ +include: + - .clone + +"tpl-{{ slsdotpath }}": + qvm.vm: + - require: + - sls: {{ slsdotpath }}.clone + - name: tpl-{{ slsdotpath }} + - prefs: + - memory: 300 + - maxmem: 2000 + - features: + - set: + - default-menu-items: "firefox-esr.desktop chromium.desktop google-chrome.desktop qubes-run-terminal.desktop qubes-start.desktop" + - menu-items: "firefox-esr.desktop chromium.desktop google-chrome.desktop qubes-run-terminal.desktop qubes-start.desktop" + +"dvm-{{ slsdotpath }}": + qvm.vm: + - require: + - qvm: tpl-{{ slsdotpath }} + - name: dvm-{{ slsdotpath }} + - present: + - template: tpl-{{ slsdotpath }} + - label: red + - prefs: + - memory: 300 + - maxmem: 2000 + - vcpus: 1 + - template_for_dispvms: True + - include_in_backups: False + - features: + - enable: + - appmenus-dispvm + - set: + - menu-items: "firefox-esr.desktop chromium.desktop google-chrome.desktop qubes-run-terminal.desktop qubes-start.desktop" diff --git a/qusal/browser/create.top b/qusal/browser/create.top new file mode 100644 index 0000000..ed4df32 --- /dev/null +++ b/qusal/browser/create.top @@ -0,0 +1,4 @@ +base: + 'dom0': + - match: nodegroup + - browser.create diff --git a/qusal/browser/files/repo/chrome.asc b/qusal/browser/files/repo/chrome.asc new file mode 100644 index 0000000..e1e0a48 --- /dev/null +++ b/qusal/browser/files/repo/chrome.asc @@ -0,0 +1,226 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBEXwb0YRBADQva2NLpYXxgjNkbuP0LnPoEXruGmvi3XMIxjEUFuGNCP4Rj/a +kv2E5VixBP1vcQFDRJ+p1puh8NU0XERlhpyZrVMzzS/RdWdyXf7E5S8oqNXsoD1z +fvmI+i9b2EhHAA19Kgw7ifV8vMa4tkwslEmcTiwiw8lyUl28Wh4Et8SxzwCggDcA +feGqtn3PP5YAdD0km4S4XeMEAJjlrqPoPv2Gf//tfznY2UyS9PUqFCPLHgFLe80u +QhI2U5jt6jUKN4fHauvR6z3seSAsh1YyzyZCKxJFEKXCCqnrFSoh4WSJsbFNc4PN +b0V0SqiTCkWADZyLT5wll8sWuQ5ylTf3z1ENoHf+G3um3/wk/+xmEHvj9HCTBEXP +78X0A/0Tqlhc2RBnEf+AqxWvM8sk8LzJI/XGjwBvKfXe+l3rnSR2kEAvGzj5Sg0X +4XmfTg4Jl8BNjWyvm2Wmjfet41LPmYJKsux3g0b8yzQxeOA4pQKKAU3Z4+rgzGmf +HdwCG5MNT2A5XxD/eDd+L4fRx0HbFkIQoAi1J3YWQSiTk15fw7RMR29vZ2xlLCBJ +bmMuIExpbnV4IFBhY2thZ2UgU2lnbmluZyBLZXkgPGxpbnV4LXBhY2thZ2VzLWtl +eW1hc3RlckBnb29nbGUuY29tPohjBBMRAgAjAhsDBgsJCAcDAgQVAggDBBYCAwEC +HgECF4AFAkYVdn8CGQEACgkQoECDD3+sWZHKSgCfdq3HtNYJLv+XZleb6HN4zOcF +AJEAniSFbuv8V5FSHxeRimHx25671az+uQINBEXwb0sQCACuA8HT2nr+FM5y/kzI +A51ZcC46KFtIDgjQJ31Q3OrkYP8LbxOpKMRIzvOZrsjOlFmDVqitiVc7qj3lYp6U +rgNVaFv6Qu4bo2/ctjNHDDBdv6nufmusJUWq/9TwieepM/cwnXd+HMxu1XBKRVk9 +XyAZ9SvfcW4EtxVgysI+XlptKFa5JCqFM3qJllVohMmr7lMwO8+sxTWTXqxsptJo +pZeKz+UBEEqPyw7CUIVYGC9ENEtIMFvAvPqnhj1GS96REMpry+5s9WKuLEaclWpd +K3krttbDlY1NaeQUCRvBYZ8iAG9YSLHUHMTuI2oea07Rh4dtIAqPwAX8xn36JAYG +2vgLAAMFB/wKqaycjWAZwIe98Yt0qHsdkpmIbarD9fGiA6kfkK/UxjL/k7tmS4Vm +CljrrDZkPSQ/19mpdRcGXtb0NI9+nyM5trweTvtPw+HPkDiJlTaiCcx+izg79Fj9 +KcofuNb3lPdXZb9tzf5oDnmm/B+4vkeTuEZJ//IFty8cmvCpzvY+DAz1Vo9rA+Zn +cpWY1n6z6oSS9AsyT/IFlWWBZZ17SpMHu+h4Bxy62+AbPHKGSujEGQhWq8ZRoJAT +G0KSObnmZ7FwFWu1e9XFoUCt0bSjiJWTIyaObMrWu/LvJ3e9I87HseSJStfw6fki +5og9qFEkMrIrBCp3QGuQWBq/rTdMuwNFiEkEGBECAAkFAkXwb0sCGwwACgkQoECD +D3+sWZF/WACfeNAu1/1hwZtUo1bR+MWiCjpvHtwAnA1R3IHqFLQ2X3xJ40XPuAyY +/FJGmQINBFcMjNMBEAC6Wr5QuLIFgz1V1EFPlg8ty2TsjQEl4VWftUAqWlMevJFW +vYExBOsOZ6kNFfBfjAxgJNWTkxZrHzDl74R7KW/nUx6X57bpFjUyRaB8F3/NpWKS +eIGSpJT+0m2SgUNhLAn1WY/iNJGNaMl7lgUnaP+/ZsSNT9hyTBiH3Ev5VvAtMGhV +I/u8P0EtTjXp4o2U+VqFTBGmZ6PJVhCFjZUeRByloHw8dGOshfXKgriebpioHvU8 +iQ2UGV3WNIirB2Rq1wkKxXJ/9Iw+4l5m4GmXMs7n3XaYQoBj28H86YA1cYWSm5LR +5iU2TneI1fJ3vwF2vpSXVBUUDk67PZhg6ZwGRT7GFWskC0z8PsWd5jwK20mA8EVK +q0vNBFmMK6i4fJU+ux17Rgvnc9tDSCzFZ1/4f43EZ41uTmmNXIDsaPCqwjvSS5IC +adt2xeqTWDlzONUpOs5yBjF1cfJSdVxsfshvln2JXUwgIdKl4DLbZybuNFXnPffN +Lb2vPtRJHO48O2UbeXS8n27PcuMoLRd7+r7TsqG2vBH4t/cB/1vsvWMbqnQlaJ5V +sjeWTp8Gv9FJiKuU8PKiWsF4EGR/kAFyCB8QbJeQ6HrOT0CXLOaYHRu2TvJ4taY9 +doXn98TgU03XTLcYoSp49cdkkis4K+9hd2dUqARVCG7UVd9PY60VVCKi47BVKQAR +AQABtFRHb29nbGUgSW5jLiAoTGludXggUGFja2FnZXMgU2lnbmluZyBBdXRob3Jp +dHkpIDxsaW51eC1wYWNrYWdlcy1rZXltYXN0ZXJAZ29vZ2xlLmNvbT6JAjgEEwEC +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 +=RoSw +-----END PGP PUBLIC KEY BLOCK----- diff --git a/qusal/browser/files/repo/chrome.list b/qusal/browser/files/repo/chrome.list new file mode 100644 index 0000000..416e029 --- /dev/null +++ b/qusal/browser/files/repo/chrome.list @@ -0,0 +1,2 @@ +deb [signed-by=/usr/share/keyrings/chrome.asc] http://dl.google.com/linux/chrome/deb/ stable main +# vim:ft=debsources diff --git a/qusal/browser/files/repo/chrome.sources b/qusal/browser/files/repo/chrome.sources new file mode 100644 index 0000000..48e50ea --- /dev/null +++ b/qusal/browser/files/repo/chrome.sources @@ -0,0 +1,6 @@ +Types: deb +URIs: http://dl.google.com/linux/chrome/deb/ +Suites: stable +Components: main +Signed-by: /usr/share/keyrings/chrome.asc +# vim:ft=debsources diff --git a/qusal/browser/init.top b/qusal/browser/init.top new file mode 100644 index 0000000..de8c9f1 --- /dev/null +++ b/qusal/browser/init.top @@ -0,0 +1,6 @@ +base: + 'dom0': + - match: nodegroup + - browser.create + 'tpl-browser': + - browser.install diff --git a/qusal/browser/install-chrome.sls b/qusal/browser/install-chrome.sls new file mode 100644 index 0000000..77e6c82 --- /dev/null +++ b/qusal/browser/install-chrome.sls @@ -0,0 +1,35 @@ +{% if grains['nodename'] != 'dom0' -%} + +include: + - .install-common + +{% from 'utils/macros/install-repo.sls' import install_repo -%} +{{ install_repo(sls_path, 'chrome') }} + +{# +"{{ slsdotpath }}-google-chrome-repo": + pkgrepo.managed: + - name: deb [signed-by=/usr/share/keyrings/chrome.asc] http://dl.google.com/linux/chrome/deb/ + - dist: {{ grains.get['oscodename'] }} + - comps: main + - key_url: salt://{{ slsdotpath }}/files/repo/chrome.asc + - file: /etc/apt/sources.list.d/chrome.list +#} + +"{{ slsdotpath }}-avoid-chrome-installing-own-repo": + file.touch: + - name: /etc/default/google-chrome + +"{{ slsdotpath }}-updated-chrome": + pkg.uptodate: + - refresh: True + +"{{ slsdotpath }}-installed-chrome": + pkg.installed: + - refresh: True + - install_recommends: False + - skip_suggestions: True + - pkgs: + - google-chrome-stable + +{% endif -%} diff --git a/qusal/browser/install-chrome.top b/qusal/browser/install-chrome.top new file mode 100644 index 0000000..def0eba --- /dev/null +++ b/qusal/browser/install-chrome.top @@ -0,0 +1,3 @@ +base: + 'tpl-browser': + - browser.install-chrome diff --git a/qusal/browser/install-chromium.sls b/qusal/browser/install-chromium.sls new file mode 100644 index 0000000..bcd2356 --- /dev/null +++ b/qusal/browser/install-chromium.sls @@ -0,0 +1,18 @@ +{% if grains['nodename'] != 'dom0' -%} + +include: + - .install-common + +"{{ slsdotpath }}-updated-chromium": + pkg.uptodate: + - refresh: True + +"{{ slsdotpath }}-installed-chromium": + pkg.installed: + - refresh: True + - install_recommends: False + - skip_suggestions: True + - pkgs: + - chromium + +{% endif -%} diff --git a/qusal/browser/install-chromium.top b/qusal/browser/install-chromium.top new file mode 100644 index 0000000..af2f618 --- /dev/null +++ b/qusal/browser/install-chromium.top @@ -0,0 +1,3 @@ +base: + 'tpl-browser': + - browser.install-chromium diff --git a/qusal/browser/install-common.sls b/qusal/browser/install-common.sls new file mode 100644 index 0000000..b145bfd --- /dev/null +++ b/qusal/browser/install-common.sls @@ -0,0 +1,25 @@ +{% if grains['nodename'] != 'dom0' -%} + +include: + - sys-usb.install-client-fido + +"{{ slsdotpath }}-updated-common": + pkg.uptodate: + - refresh: True + +"{{ slsdotpath }}-installed-common": + pkg.installed: + - refresh: True + - install_recommends: False + - skip_suggestions: True + - pkgs: + - qubes-core-agent-networking + - ca-certificates + - curl + - qubes-core-agent-nautilus + - nautilus + - zenity + - libgdk-pixbuf2.0-bin + - pulseaudio-qubes + +{% endif -%} diff --git a/qusal/browser/install-common.top b/qusal/browser/install-common.top new file mode 100644 index 0000000..4a4c6db --- /dev/null +++ b/qusal/browser/install-common.top @@ -0,0 +1,3 @@ +base: + 'tpl-browser': + - browser.install-common diff --git a/qusal/browser/install-firefox.sls b/qusal/browser/install-firefox.sls new file mode 100644 index 0000000..08c7f4e --- /dev/null +++ b/qusal/browser/install-firefox.sls @@ -0,0 +1,18 @@ +{% if grains['nodename'] != 'dom0' -%} + +include: + - .install-common + +"{{ slsdotpath }}-updated-firefox": + pkg.uptodate: + - refresh: True + +"{{ slsdotpath }}-installed-firefox": + pkg.installed: + - refresh: True + - install_recommends: False + - skip_suggestions: True + - pkgs: + - firefox-esr + +{% endif -%} diff --git a/qusal/browser/install-firefox.top b/qusal/browser/install-firefox.top new file mode 100644 index 0000000..62ebb3d --- /dev/null +++ b/qusal/browser/install-firefox.top @@ -0,0 +1,3 @@ +base: + 'tpl-browser': + - browser.install-firefox diff --git a/qusal/browser/install-lynx.sls b/qusal/browser/install-lynx.sls new file mode 100644 index 0000000..9de41df --- /dev/null +++ b/qusal/browser/install-lynx.sls @@ -0,0 +1,18 @@ +{% if grains['nodename'] != 'dom0' -%} + +include: + - .install-common + +"{{ slsdotpath }}-updated-lynx": + pkg.uptodate: + - refresh: True + +"{{ slsdotpath }}-installed-lynx": + pkg.installed: + - refresh: True + - install_recommends: False + - skip_suggestions: True + - pkgs: + - lynx + +{% endif -%} diff --git a/qusal/browser/install-lynx.top b/qusal/browser/install-lynx.top new file mode 100644 index 0000000..5d33920 --- /dev/null +++ b/qusal/browser/install-lynx.top @@ -0,0 +1,3 @@ +base: + 'tpl-browser': + - browser.install-lynx diff --git a/qusal/browser/install-w3m.sls b/qusal/browser/install-w3m.sls new file mode 100644 index 0000000..8bd3973 --- /dev/null +++ b/qusal/browser/install-w3m.sls @@ -0,0 +1,19 @@ +{% if grains['nodename'] != 'dom0' -%} + +include: + - .install-common + - dotfiles.copy-net + +"{{ slsdotpath }}-updated-w3m": + pkg.uptodate: + - refresh: True + +"{{ slsdotpath }}-installed-w3m": + pkg.installed: + - refresh: True + - install_recommends: False + - skip_suggestions: True + - pkgs: + - w3m + +{% endif -%} diff --git a/qusal/browser/install-w3m.top b/qusal/browser/install-w3m.top new file mode 100644 index 0000000..e8e26dc --- /dev/null +++ b/qusal/browser/install-w3m.top @@ -0,0 +1,3 @@ +base: + 'tpl-browser': + - browser.install-w3m diff --git a/qusal/browser/install.sls b/qusal/browser/install.sls new file mode 100644 index 0000000..b1d16bf --- /dev/null +++ b/qusal/browser/install.sls @@ -0,0 +1,6 @@ +{% if grains['nodename'] != 'dom0' -%} + +include: + - .install-chromium + +{% endif -%} diff --git a/qusal/browser/install.top b/qusal/browser/install.top new file mode 100644 index 0000000..6e1b77d --- /dev/null +++ b/qusal/browser/install.top @@ -0,0 +1,3 @@ +base: + 'tpl-browser': + - browser.install diff --git a/qusal/dev/README.md b/qusal/dev/README.md new file mode 100644 index 0000000..a934380 --- /dev/null +++ b/qusal/dev/README.md @@ -0,0 +1,35 @@ +# dev + +## Table of Contents + +* [Description](#description) +* [Installation](#installation) +* [Copyright](#copyright) + +## Description + +Development environment on Qubes OS. + +Setup a development qube named "dev". Defines the user interactive shell, +installing goodies, applying dotfiles, being client of sys-pgp, sys-git and +sys-ssh-agent. + +## Installation + +- Top +```sh +qubesctl top.enable dev +qubesctl --targets=tpl-dev,disp-dev,dev state.apply +qubesctl top.disable dev +``` + +- State +```sh +qubesctl state.apply dev.create +qubesctl --skip-dom0 --targets=tpl-dev state.apply dev.install +qubesctl --skip-dom0 --targets=dev state.apply dev.configure +``` + +## Copyright + +License: GPLv3+ diff --git a/qusal/dev/clone.sls b/qusal/dev/clone.sls new file mode 100644 index 0000000..9995809 --- /dev/null +++ b/qusal/dev/clone.sls @@ -0,0 +1,2 @@ +{% from 'utils/macros/clone-template.sls' import clone_template -%} +{{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/dev/clone.top b/qusal/dev/clone.top new file mode 100644 index 0000000..cbe0de4 --- /dev/null +++ b/qusal/dev/clone.top @@ -0,0 +1,4 @@ +base: + 'dom0': + - match: nodegroup + - dev.clone diff --git a/qusal/dev/configure.sls b/qusal/dev/configure.sls new file mode 100644 index 0000000..46fe6ce --- /dev/null +++ b/qusal/dev/configure.sls @@ -0,0 +1,7 @@ +{% if grains['nodename'] != 'dom0' -%} + +include: + - .home-cleanup + - dotfiles.copy-all + +{% endif -%} diff --git a/qusal/dev/create.sls b/qusal/dev/create.sls new file mode 100644 index 0000000..cd5da3a --- /dev/null +++ b/qusal/dev/create.sls @@ -0,0 +1,75 @@ +include: + - .clone + +"{{ slsdotpath }}": + qvm.vm: + - name: {{ slsdotpath }} + - require: + - sls: {{ slsdotpath }}.clone + - present: + - template: tpl-{{ slsdotpath }} + - label: blue + - prefs: + - template: tpl-{{ slsdotpath }} + - label: blue + - netvm: "" + - vpus: 1 + - memory: 400 + - maxmem: 600 + - autostart: False + - include_in_backups: True + - features: + - enable: + - service.split-gpg2-client + - service.crond + - disable: + - service.cups + - service.cups-browsed + +"dvm-{{ slsdotpath }}": + qvm.vm: + - name: dvm-{{ slsdotpath }} + - require: + - sls: {{ slsdotpath }}.clone + - present: + - template: tpl-{{ slsdotpath }} + - label: red + - prefs: + - template: tpl-{{ slsdotpath }} + - label: red + - netvm: "" + - vpus: 1 + - memory: 400 + - maxmem: 600 + - autostart: False + - template_for_dispvms: True + - include_in_backups: False + - features: + - enable: + - appmenus-dispvm + - disable: + - service.cups + - service.cups-browsed + +"disp-{{ slsdotpath }}": + qvm.vm: + - name: disp-{{ slsdotpath }} + - require: + - qvm: dvm-{{ slsdotpath }} + - present: + - template: dvm-{{ slsdotpath }} + - label: red + - class: DispVM + - prefs: + - template: dvm-{{ slsdotpath }} + - label: red + - vpus: 1 + - memory: 400 + - maxmem: 600 + - autostart: False + - include_in_backups: False + - features: + - disable: + - appmenus-dispvm + - service.cups + - service.cups-browsed diff --git a/qusal/dev/create.top b/qusal/dev/create.top new file mode 100644 index 0000000..c2287d0 --- /dev/null +++ b/qusal/dev/create.top @@ -0,0 +1,4 @@ +base: + 'dom0': + - match: nodegroup + - dev.create diff --git a/qusal/dev/home-cleanup.sls b/qusal/dev/home-cleanup.sls new file mode 100644 index 0000000..8dee2a8 --- /dev/null +++ b/qusal/dev/home-cleanup.sls @@ -0,0 +1,11 @@ +{% if grains['nodename'] != 'dom0' -%} +{% for unused_dir in ['Desktop','Documents','Downloads','Music','Pictures','Public','Templates','Videos'] -%} + + {% set full_unused_dir = '/home/user/' ~ unused_dir -%} + "remove-{{ full_unused_dir }}": + file.absent: + - name: {{ full_unused_dir }} + - onlyif: test -z "$(ls -A {{ full_unused_dir }})" + +{% endfor -%} +{% endif -%} diff --git a/qusal/dev/home-cleanup.top b/qusal/dev/home-cleanup.top new file mode 100644 index 0000000..b290604 --- /dev/null +++ b/qusal/dev/home-cleanup.top @@ -0,0 +1,3 @@ +base: + 'dev': + - dev.home-cleanup diff --git a/qusal/dev/init.sls b/qusal/dev/init.sls new file mode 100644 index 0000000..65916d3 --- /dev/null +++ b/qusal/dev/init.sls @@ -0,0 +1,13 @@ +## TODO: should we allow minions to decide which states they should run? +{# +include: +{% if grains['id'] == 'dom0' -%} + - .create +{% elif grains['id'] == 'tpl-' ~ slsdotpath -%} + - .install +{% elif grains['id'] == 'disp-' ~ slsdotpath -%} + - utils.tools.zsh.touch-zshrc +{% elif grains['id'] == slsdotpath -%} + - .configure +{% endif -%} +#} diff --git a/qusal/dev/init.top b/qusal/dev/init.top new file mode 100644 index 0000000..b7fe09a --- /dev/null +++ b/qusal/dev/init.top @@ -0,0 +1,10 @@ +base: + 'dom0': + - match: nodegroup + - dev.create + 'tpl-dev': + - dev.install + 'disp-dev': + - utils.tools.zsh.touch-zshrc + 'dev': + - dev.configure diff --git a/qusal/dev/install-python-tools.sls b/qusal/dev/install-python-tools.sls new file mode 100644 index 0000000..4d2cdfb --- /dev/null +++ b/qusal/dev/install-python-tools.sls @@ -0,0 +1,19 @@ +{% if grains['nodename'] != 'dom0' -%} + +"{{ slsdotpath }}-updated-network": + pkg.uptodate: + - refresh: True + +"{{ slsdotpath }}-installed-network": + pkg.installed: + - refresh: True + - install_recommends: False + - skip_suggestions: True + - pkgs: + - python3-dev + - python3-venv + - python3-setuptools + - python3-pytest + - python3-pip + +{% endif %} diff --git a/qusal/dev/install-python-tools.top b/qusal/dev/install-python-tools.top new file mode 100644 index 0000000..41b159c --- /dev/null +++ b/qusal/dev/install-python-tools.top @@ -0,0 +1,3 @@ +base: + 'tpl-dev': + - dev.install-python-tools diff --git a/qusal/dev/install-salt-tools.sls b/qusal/dev/install-salt-tools.sls new file mode 100644 index 0000000..a535df9 --- /dev/null +++ b/qusal/dev/install-salt-tools.sls @@ -0,0 +1,26 @@ +{% if grains['nodename'] != 'dom0' -%} + +"{{ slsdotpath }}-updated-salt-tools": + pkg.uptodate: + - refresh: True + +"{{ slsdotpath }}-installed-salt-tools": + pkg.installed: + - refresh: True + - install_recommends: False + - skip_suggestions: True + - pkgs: + - python3-pip + - yamllint + - ansible-lint + {% if grains['os_family']|lower == 'redhat' -%} + - salt-lint + {% endif -%} + +# {% if grains['os_family']|lower != 'redhat' -%} +# pip-installed-salt-tools: +# cmd.run: +# - name: python3 -m pip install salt-lint +# {% endif -%} + +{% endif %} diff --git a/qusal/dev/install-salt-tools.top b/qusal/dev/install-salt-tools.top new file mode 100644 index 0000000..045b55a --- /dev/null +++ b/qusal/dev/install-salt-tools.top @@ -0,0 +1,3 @@ +base: + 'tpl-dev': + - dev.install-salt-tools diff --git a/qusal/dev/install.sls b/qusal/dev/install.sls new file mode 100644 index 0000000..822414d --- /dev/null +++ b/qusal/dev/install.sls @@ -0,0 +1,54 @@ +{% if grains['nodename'] != 'dom0' -%} + +include: + - .home-cleanup + - .install-python-tools + - .install-salt-tools + - dotfiles.copy-all + - utils.tools.zsh + - sys-pgp.install-client + - sys-git.install-client + - sys-ssh-agent.install-client + +"{{ slsdotpath }}-updated": + pkg.uptodate: + - refresh: True + +"{{ slsdotpath }}-installed": + pkg.installed: + - refresh: True + - install_recommends: False + - skip_suggestions: True + - pkgs: + - qubes-core-agent-passwordless-root + - qubes-core-agent-networking + - ca-certificates + - git + - gnupg2 + - tmux + - xclip + - bash-completion + - man-db + - texinfo + - file + - tree + - pre-commit + - gitlint + - ripgrep + - fzf + {% if grains['os_family']|lower == 'debian' -%} + - shellcheck + - vim-nox + - fd-find + {% elif grains['os_family']|lower == 'redhat' -%} + - passwd + - fd-find + - ShellCheck + - vim-enhanced + {% else -%} + - fd + - shellcheck + - vim + {% endif -%} + +{% endif -%} diff --git a/qusal/dev/install.top b/qusal/dev/install.top new file mode 100644 index 0000000..0957761 --- /dev/null +++ b/qusal/dev/install.top @@ -0,0 +1,4 @@ +base: + 'tpl-dev': + - match: list + - dev.install diff --git a/qusal/docker/README.md b/qusal/docker/README.md new file mode 100644 index 0000000..40b4365 --- /dev/null +++ b/qusal/docker/README.md @@ -0,0 +1,32 @@ +# docker + +## Table of Contents + +* [Description](#description) +* [Installation](#installation) +* [Copyright](#copyright) + +## Description + +Docker installation on Qubes OS. + +Setup docker on Qubes OS with the Docker repository. + +## Installation + +- Top +```sh +qubesctl top.enable docker +qubesctl --targets=tpl-qubes-builder,qubes-builder state.apply +qubesctl top.disable docker +``` + +- State +```sh +qubesctl --skip-dom0 --targets=tpl-qubes-builder state.apply docker.install +qubesctl --skip-dom0 --targets=qubes-builder state.apply docker.configure +``` + +## Copyright + +License: GPLv2+ diff --git a/qusal/docker/configure.sls b/qusal/docker/configure.sls new file mode 100644 index 0000000..31709d8 --- /dev/null +++ b/qusal/docker/configure.sls @@ -0,0 +1,10 @@ +{% if grains['nodename'] != 'dom0' -%} + +"{{ slsdotpath }}-rc.local": + file.append: + - name: /rw/config/rc.local + - text: | + usermod -aG docker user + systemctl start docker + +{% endif -%} diff --git a/qusal/docker/configure.top b/qusal/docker/configure.top new file mode 100644 index 0000000..c6e508c --- /dev/null +++ b/qusal/docker/configure.top @@ -0,0 +1,3 @@ +base: + 'qubes-builder': + - docker.configure diff --git a/qusal/docker/files/repo/docker.asc b/qusal/docker/files/repo/docker.asc new file mode 100644 index 0000000..ee7872e --- /dev/null +++ b/qusal/docker/files/repo/docker.asc @@ -0,0 +1,62 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +YT90qFF93M3v01BbxP+EIY2/9tiIPbrd +=0YYh +-----END PGP PUBLIC KEY BLOCK----- diff --git a/qusal/docker/files/repo/docker.list b/qusal/docker/files/repo/docker.list new file mode 100644 index 0000000..b951047 --- /dev/null +++ b/qusal/docker/files/repo/docker.list @@ -0,0 +1,2 @@ +deb [arch=amd64 signed-by=/usr/share/keyrings/docker.asc] http://download.docker.com/linux/debian bookworm stable +# vim: ft=debsources diff --git a/qusal/docker/files/repo/docker.sources b/qusal/docker/files/repo/docker.sources new file mode 100644 index 0000000..57c08b7 --- /dev/null +++ b/qusal/docker/files/repo/docker.sources @@ -0,0 +1,6 @@ +Types: deb +URIs: http://download.docker.com/linux/debian +Suites: bookworm +Components: stable +Signed-by: /usr/share/keyrings/docker.asc +# vim: ft=debsources diff --git a/qusal/docker/files/repo/docker.yum.asc b/qusal/docker/files/repo/docker.yum.asc new file mode 100644 index 0000000..1967cbf --- /dev/null +++ b/qusal/docker/files/repo/docker.yum.asc @@ -0,0 +1,28 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFit5IEBEADDt86QpYKz5flnCsOyZ/fk3WwBKxfDjwHf/GIflo+4GWAXS7wJ +1PSzPsvSDATV10J44i5WQzh99q+lZvFCVRFiNhRmlmcXG+rk1QmDh3fsCCj9Q/yP +w8jn3Hx0zDtz8PIB/18ReftYJzUo34COLiHn8WiY20uGCF2pjdPgfxE+K454c4G7 +gKFqVUFYgPug2CS0quaBB5b0rpFUdzTeI5RCStd27nHCpuSDCvRYAfdv+4Y1yiVh +KKdoe3Smj+RnXeVMgDxtH9FJibZ3DK7WnMN2yeob6VqXox+FvKYJCCLkbQgQmE50 +uVK0uN71A1mQDcTRKQ2q3fFGlMTqJbbzr3LwnCBE6hV0a36t+DABtZTmz5O69xdJ +WGdBeePCnWVqtDb/BdEYz7hPKskcZBarygCCe2Xi7sZieoFZuq6ltPoCsdfEdfbO ++VBVKJnExqNZCcFUTEnbH4CldWROOzMS8BGUlkGpa59Sl1t0QcmWlw1EbkeMQNrN +spdR8lobcdNS9bpAJQqSHRZh3cAM9mA3Yq/bssUS/P2quRXLjJ9mIv3dky9C3udM ++q2unvnbNpPtIUly76FJ3s8g8sHeOnmYcKqNGqHq2Q3kMdA2eIbI0MqfOIo2+Xk0 +rNt3ctq3g+cQiorcN3rdHPsTRSAcp+NCz1QF9TwXYtH1XV24A6QMO0+CZwARAQAB +tCtEb2NrZXIgUmVsZWFzZSAoQ0UgcnBtKSA8ZG9ja2VyQGRvY2tlci5jb20+iQI3 +BBMBCgAhBQJYrep4AhsvBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEMUv62ti +Hp816C0P/iP+1uhSa6Qq3TIc5sIFE5JHxOO6y0R97cUdAmCbEqBiJHUPNQDQaaRG +VYBm0K013Q1gcJeUJvS32gthmIvhkstw7KTodwOM8Kl11CCqZ07NPFef1b2SaJ7l +TYpyUsT9+e343ph+O4C1oUQw6flaAJe+8ATCmI/4KxfhIjD2a/Q1voR5tUIxfexC +/LZTx05gyf2mAgEWlRm/cGTStNfqDN1uoKMlV+WFuB1j2oTUuO1/dr8mL+FgZAM3 +ntWFo9gQCllNV9ahYOON2gkoZoNuPUnHsf4Bj6BQJnIXbAhMk9H2sZzwUi9bgObZ +XO8+OrP4D4B9kCAKqqaQqA+O46LzO2vhN74lm/Fy6PumHuviqDBdN+HgtRPMUuao +xnuVJSvBu9sPdgT/pR1N9u/KnfAnnLtR6g+fx4mWz+ts/riB/KRHzXd+44jGKZra +IhTMfniguMJNsyEOO0AN8Tqcl0eRBxcOArcri7xu8HFvvl+e+ILymu4buusbYEVL +GBkYP5YMmScfKn+jnDVN4mWoN1Bq2yMhMGx6PA3hOvzPNsUoYy2BwDxNZyflzuAi +g59mgJm2NXtzNbSRJbMamKpQ69mzLWGdFNsRd4aH7PT7uPAURaf7B5BVp3UyjERW +5alSGnBqsZmvlRnVH5BDUhYsWZMPRQS9rRr4iGW0l+TH+O2VJ8aQ +=0Zqq +-----END PGP PUBLIC KEY BLOCK----- diff --git a/qusal/docker/files/repo/docker.yum.repo b/qusal/docker/files/repo/docker.yum.repo new file mode 100644 index 0000000..6e5918a --- /dev/null +++ b/qusal/docker/files/repo/docker.yum.repo @@ -0,0 +1,15 @@ +[docker-ce-stable] +name=Docker CE Stable - $basearch +baseurl=https://download.docker.com/linux/fedora/$releasever/$basearch/stable +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-docker + +[docker-ce-stable-source] +name=Docker CE Stable - Sources +baseurl=https://download.docker.com/linux/fedora/$releasever/source/stable +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-docker + +# vim: ft=toml diff --git a/qusal/docker/init.top b/qusal/docker/init.top new file mode 100644 index 0000000..3b60ac5 --- /dev/null +++ b/qusal/docker/init.top @@ -0,0 +1,5 @@ +base: + 'tpl-qubes-builder': + - docker.install + 'qubes-builder': + - docker.configure diff --git a/qusal/docker/install.sls b/qusal/docker/install.sls new file mode 100644 index 0000000..5078a1f --- /dev/null +++ b/qusal/docker/install.sls @@ -0,0 +1,57 @@ +{% if grains['nodename'] != 'dom0' -%} + +{% from 'utils/macros/install-repo.sls' import install_repo -%} +{{ install_repo(sls_path, 'docker') }} + +"{{ slsdotpath }}-updated": + pkg.uptodate: + - refresh: True + +{# +"{{ slsdotpath }}-removed": + pkg.removed: + - pkgs: + {% if grains['os_family']|lower == 'debian' -%} + - docker.io + - docker-doc + - docker-compose + - podman-docker + - containerd + - runc + {% elif grains['os_family']|lower == 'redhat' -%} + - docker + - docker-client + - docker-client-latest + - docker-common + - docker-latest + - docker-latest-logrotate + - docker-logrotate + - docker-selinux + - docker-engine-selinux + - docker-engine + {% endif -%} +#} + +"{{ slsdotpath }}-installed": + pkg.installed: + - refresh: True + - install_recommends: False + - skip_suggestions: True + - pkgs: + - qubes-core-agent-networking + - man-db + - docker-ce + - docker-ce-cli + - containerd.io + - docker-buildx-plugin + - docker-compose-plugin + +"{{ slsdotpath }}-user-in-docker-group": + user.present: + - name: user + - groups: + - user + - qubes + - docker + +{% endif -%} diff --git a/qusal/docker/install.top b/qusal/docker/install.top new file mode 100644 index 0000000..9d74a61 --- /dev/null +++ b/qusal/docker/install.top @@ -0,0 +1,3 @@ +base: + 'tpl-qubes-builder': + - docker.install diff --git a/qusal/dom0/README.md b/qusal/dom0/README.md new file mode 100644 index 0000000..79ed773 --- /dev/null +++ b/qusal/dom0/README.md @@ -0,0 +1,31 @@ +# dom0 + +## Table of Contents + +* [Description](#description) +* [Installation](#installation) +* [Copyright](#copyright) + +## Description + +Dom0 environment on Qubes OS. + +Configure Dom0 window manager, install packages, backup scripts and profile etc. + +## Installation + +- Top +```sh +qubesctl top.enable dom0 +qubesctl state.apply +qubesctl top.disable dom0 +``` + +- State +```sh +qubesctl state.apply dom0 +``` + +## Copyright + +License: GPLv2+ diff --git a/qusal/dom0/backup.sls b/qusal/dom0/backup.sls new file mode 100644 index 0000000..5992dd7 --- /dev/null +++ b/qusal/dom0/backup.sls @@ -0,0 +1,15 @@ +"{{ slsdotpath }}-backup-find-script": + file.managed: + - name: /usr/bin/qvm-backup-find-last + - source: salt://{{ slsdotpath }}/files/bin/qvm-backup-find-last + - mode: '0755' + - user: root + - group: root + +"{{ slsdotpath }}-backup-profile": + file.managed: + - name: /etc/qubes/backup/qusal.conf + - source: salt://{{ slsdotpath }}/files/backup/qusal.conf + - mode: '0755' + - user: root + - group: root diff --git a/qusal/dom0/backup.top b/qusal/dom0/backup.top new file mode 100644 index 0000000..1e2dcf8 --- /dev/null +++ b/qusal/dom0/backup.top @@ -0,0 +1,4 @@ +base: + 'dom0': + - match: nodegroup + - dom0.backup diff --git a/qusal/dom0/dotfiles.sls b/qusal/dom0/dotfiles.sls new file mode 100644 index 0000000..d72501b --- /dev/null +++ b/qusal/dom0/dotfiles.sls @@ -0,0 +1,15 @@ +{% if grains['nodename'] == 'dom0' -%} + +include: + - dotfiles.copy-all + +"{{ slsdotpath }}-xprofile-sourcer": + file.managed: + - name: /home/user/.config/autostart/xprofile.desktop + - source: salt://{{ slsdotpath }}/files/autostart/xprofile.desktop + - user: user + - group: user + - mode: '0644' + - makedirs: True + +{% endif -%} diff --git a/qusal/dom0/dotfiles.top b/qusal/dom0/dotfiles.top new file mode 100644 index 0000000..befee11 --- /dev/null +++ b/qusal/dom0/dotfiles.top @@ -0,0 +1,4 @@ +base: + 'dom0': + - match: nodegroup + - dom0.dotfiles diff --git a/qusal/dom0/files/autostart-scripts/kde-activity-changed-notifier b/qusal/dom0/files/autostart-scripts/kde-activity-changed-notifier new file mode 100755 index 0000000..e27544f --- /dev/null +++ b/qusal/dom0/files/autostart-scripts/kde-activity-changed-notifier @@ -0,0 +1,32 @@ +#!/bin/sh +set -eu + +if ! command -v notify-send >/dev/null && + ! command -v kdialog >/dev/null; then + exit 1 +fi +command -v qdbus >/dev/null || exit 1 + +case "${XDG_SESSION_DESKTOP:-}" in + KDE|plasma) ;; + *) exit 1;; +esac + +## https://geek.co.il/2018/07/30/script-day-different-default-browser-per-kde-activity +service="org.kde.ActivityManager" +interface="$service.Activities" +path="/ActivityManager/Activities" +signal="CurrentActivityChanged" + +dbus-monitor --profile \ + "type=signal,path=$path,interface=$interface,member=$signal" | \ +while read -r _ _ _ _ _ path interface member; do + test "$member" = "$signal" || continue + id="$(qdbus "$service" "$path" "$interface.CurrentActivity")" + name="$(qdbus "$service" "$path" "$interface.ActivityName" "$id")" + if command -v kdialog; then + kdialog --title "Activity: $name" --passivepopup "Switched Activities" 3 + elif command -v notify-send; then + notify-send -u normal -t 3000 "Activity: $name" "Switched activities" + fi +done diff --git a/qusal/dom0/files/autostart/xprofile.desktop b/qusal/dom0/files/autostart/xprofile.desktop new file mode 100644 index 0000000..90ad799 --- /dev/null +++ b/qusal/dom0/files/autostart/xprofile.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Xprofile sourcer +Comment=Source User's Xprofile +Type=Application +Exec=/home/user/.config/x11/xprofile +Terminal=false +StartupNotify=false +Categories=System;X; diff --git a/qusal/dom0/files/backup/qusal.conf b/qusal/dom0/files/backup/qusal.conf new file mode 100644 index 0000000..c7b4cb3 --- /dev/null +++ b/qusal/dom0/files/backup/qusal.conf @@ -0,0 +1,18 @@ +## Sample backup profile +--- +include: + - dev + - vault + - sys-git + - sys-ssh-agent +exclude: + - "@tag:skip-backup" + - "@type:TemplateVM" + +compression: true +passphrase_text: my-password + +destination_vm: backup-ssh +destination_path: ssh backup 'cat | tee /dir/qubes-backup-$(data +%Y-%m-%d-%H-%M-%S) >/dev/null' + +# vim: ft=yaml diff --git a/qusal/dom0/files/bin/kde-write-rules b/qusal/dom0/files/bin/kde-write-rules new file mode 100755 index 0000000..cb8d2e5 --- /dev/null +++ b/qusal/dom0/files/bin/kde-write-rules @@ -0,0 +1,48 @@ +#!/bin/sh +# shellcheck disable=SC1090,SC2317 +## Wrapper around kwriteconfig to write key=values to specific groups. +## TODO: finish +set -eu +echo "Unfinished work" >&2 +exit 2 + +# shellcheck disable=SC1091 +test -r "$HOME/.profile" && . "$HOME/.profile" +: "${XDG_CONFIG_HOME:=$HOME/.config}" +file="$XDG_CONFIG_HOME/kwinrulesrc" + +writeconf(){ + group="$1" + key="$2" + value="$3" + + kwriteconfig \ + --file "$file" \ + --group "rules-$group" \ + --key "$key" "$value" +} + +writeconf_group(){ + chosen_group="$1" + chosen_activity="$2" + writeconf "$chosen_group" Description "$chosen_group" + if test -n "$chosen_activity"; then + chosen_activity_id="$(kactivities-cli --list-activities | + cut -d " " -f 2,3 | grep -F " $chosen_activity" | cut -d " " -f 1)" + if test -z "$chosen_activity_id"; then + printf '%s\n' "Invalid activity name: $chosen_activity" + exit 1 + fi + writeconf "$chosen_group" activity "$chosen_activity_id" + writeconf "$chosen_group" activityrule 2 + fi + writeconf "$chosen_group" title "^\\[$chosen_group\\] .*" + writeconf "$chosen_group" titlematch 3 + writeconf "$chosen_group" wmclass "$chosen_group" + writeconf "$chosen_group" wmclasscomplete false + writeconf "$chosen_group" wmclassmatch 2 +} + +#writeconf_group dev +#writeconf_group disp +#writeconf disp title "^\\[disp[0-9]{4}\\] .*" diff --git a/qusal/dom0/files/bin/qvm-backup-find-last b/qusal/dom0/files/bin/qvm-backup-find-last new file mode 100755 index 0000000..254a687 --- /dev/null +++ b/qusal/dom0/files/bin/qvm-backup-find-last @@ -0,0 +1,22 @@ +#!/bin/sh +set -eu + +usage(){ + printf '%s\n' "usage: ${0##*/} QUBE DIR [CMD]" + printf '%s\n' "example: ${0##*/} usb-qube /local/dir/backups" + printf '%s\n' "example: ${0##*/} ssh-qube /remote/dir/backups 'ssh user@server'" + printf '%s\n' "note: when using a remote login command (ssh), the DIR is the remote directory" + printf '%s\n' "note: the directory specified must be the parent of where the backups are saved" + exit 1 +} + +if test -z "${2-}"; then + usage +fi + +qube="$1" +path="$2" +cmd="${3-}" + +# shellcheck disable=SC2086 +qvm-run -p "$qube" $cmd find "$path" -maxdepth 1 -type f -name "qubes-backup-*" 2>/dev/null | tail -1 diff --git a/qusal/dom0/files/sddm.conf.d/qubes.conf b/qusal/dom0/files/sddm.conf.d/qubes.conf new file mode 100644 index 0000000..eb55e57 --- /dev/null +++ b/qusal/dom0/files/sddm.conf.d/qubes.conf @@ -0,0 +1,2 @@ +[XDisplay] +ServerArguments=-nolisten tcp -background none diff --git a/qusal/dom0/files/xinitrc.d/55xfce-qubes.sh b/qusal/dom0/files/xinitrc.d/55xfce-qubes.sh new file mode 100755 index 0000000..ca20342 --- /dev/null +++ b/qusal/dom0/files/xinitrc.d/55xfce-qubes.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +## Use Qubes provided menu instead of the default one. +case "$XDG_SESSION_DESKTOP" in + KDE|plasma) XDG_MENU_PREFIX="kf5-";; + *) XDG_MENU_PREFIX="qubes-";; +esac +export XDG_MENU_PREFIX diff --git a/qusal/dom0/files/xorg.conf.d/30-touchpad.conf b/qusal/dom0/files/xorg.conf.d/30-touchpad.conf new file mode 100644 index 0000000..841d5e3 --- /dev/null +++ b/qusal/dom0/files/xorg.conf.d/30-touchpad.conf @@ -0,0 +1,5 @@ +Section "InputClass" + Identifier "touchpad catchall" + Driver "libinput" + Option "Tapping" "on" +EndSection diff --git a/qusal/dom0/init.sls b/qusal/dom0/init.sls new file mode 100644 index 0000000..f9089f4 --- /dev/null +++ b/qusal/dom0/init.sls @@ -0,0 +1,10 @@ +{% if grains['nodename'] == 'dom0' -%} + +include: + - .install + - .backup + - .xorg + - .kde + - .dotfiles + +{% endif -%} diff --git a/qusal/dom0/init.top b/qusal/dom0/init.top new file mode 100644 index 0000000..ef82bcd --- /dev/null +++ b/qusal/dom0/init.top @@ -0,0 +1,4 @@ +base: + 'dom0': + - match: nodegroup + - dom0 diff --git a/qusal/dom0/install.sls b/qusal/dom0/install.sls new file mode 100644 index 0000000..dca9957 --- /dev/null +++ b/qusal/dom0/install.sls @@ -0,0 +1,16 @@ +{% if grains['nodename'] == 'dom0' -%} + +"{{ slsdotpath }}-updated": + pkg.uptodate: + - refresh: True + +"{{ slsdotpath }}-installed": + pkg.installed: + - refresh: True + - install_recommends: False + - skip_suggestions: True + - pkg: + - vim + - xclip + +{% endif -%} diff --git a/qusal/dom0/install.top b/qusal/dom0/install.top new file mode 100644 index 0000000..095ddc9 --- /dev/null +++ b/qusal/dom0/install.top @@ -0,0 +1,4 @@ +base: + 'dom0': + - match: nodegroup + - dom0.install diff --git a/qusal/dom0/kde.sls b/qusal/dom0/kde.sls new file mode 100644 index 0000000..140ac31 --- /dev/null +++ b/qusal/dom0/kde.sls @@ -0,0 +1,51 @@ +{% if grains['nodename'] == 'dom0' -%} + +"{{ slsdotpath }}-kde-updated": + pkg.uptodate: + - refresh: True + +"{{ slsdotpath }}-kde-installed" + pkg.installed: + - pkgs: + - kde-settings-qubes + - sddm + +"{{ slsdotpath }}-configure-xinit": + file.managed: + - name: /etc/X11/xinit/xinitrc.d/55xfce-qubes.sh + - source: salt://{{ slsdotpath }}/files/xinitrc.d/55xfce-qubes.sh + - user: root + - group: root + - mode: '0755' + +"{{ slsdotpath }}-configure-sddm": + file.managed: + - name: /etc/sddm.conf.d/qubes.conf + - source: salt://{{ slsdotpath }}/files/sddm.conf.d/qubes.conf + - user: root + - group: root + - mode: '0644' + - makedirs: True + +"{{ slsdotpath }}-disable-lightdm": + cmd.run: + - name: systemctl disable lightdm + - runas: root + +"{{ slsdotpath }}-enable-sddm": + cmd.run: + - name: systemctl enable sddm + - runas: root + - require: + - cmd: disable-lightdm + +"{{ slsdotpath }}-activity-notifier": + file.managed: + - name: /home/user/.config/autostart-scripts/kde-activity-changed-notifier + - source: salt://{{ slsdotpath }}/files/autostart-scripts/kde-activity-changed-notifier + - user: user + - group: user + - mode: '0755' + - makedirs: True + +{% endif -%} diff --git a/qusal/dom0/kde.top b/qusal/dom0/kde.top new file mode 100644 index 0000000..c5a83ed --- /dev/null +++ b/qusal/dom0/kde.top @@ -0,0 +1,4 @@ +base: + 'dom0': + - match: nodegroup + - dom0.kde diff --git a/qusal/dom0/xorg.sls b/qusal/dom0/xorg.sls new file mode 100644 index 0000000..cc54fb4 --- /dev/null +++ b/qusal/dom0/xorg.sls @@ -0,0 +1,20 @@ +{% if grains['nodename'] == 'dom0' -%} + +"{{ slsdotpath }}-xorg-updated": + pkg.uptodate: + - refresh: True + +"{{ slsdotpath }}-xorg-allow-custom-xsession-login": + pkg.installed: + - pkgs: + - xorg-x11-xinit-session + +"{{ slsdotpath }}-xorg-tap-to-touch": + file.managed: + - name: /etc/X11/xorg.conf.d/30-touchpad.conf + - source: salt://{{ slsdotpath }}/files/xorg.conf.d/30-touchpad.conf + - user: root + - group: root + - mode: '0644' + +{% endif -%} diff --git a/qusal/dom0/xorg.top b/qusal/dom0/xorg.top new file mode 100644 index 0000000..600efdf --- /dev/null +++ b/qusal/dom0/xorg.top @@ -0,0 +1,4 @@ +base: + 'dom0': + - match: nodegroup + - dom0.xorg diff --git a/qusal/dotfiles/README.md b/qusal/dotfiles/README.md new file mode 100644 index 0000000..5549e32 --- /dev/null +++ b/qusal/dotfiles/README.md @@ -0,0 +1,77 @@ +# dotfiles + +## Table of Contents + +* [Description](#description) +* [Installation](#installation) +* [Usage](#usage) +* [Copyright](#copyright) + +## Description + +Ben Grande's Dotfiles. + +Configuration and scripts targeting: + +- Usability: + - Vi keybindings for application movement + - Emacs keybindings for command-line editing + - XDG Specification to not clutter $HOME +- Portability: + - POSIX compliant code + - Drop-in configuration files + - Tested on Qubes OS Dom0, Debian, Fedora +- Tasks: + - GUI: x11, gtk + - SCM: git, tig, git-shell + - Keys: gpg, ssh + - Networking: curl, urlview, wget, w3m + - Productivity: tmux, vim + - Shell: sh, bash, zsh, less, dircolors + +## Installation + +You can simply deploy all configurations with: +```sh +./files/setup.sh +``` +Or target specific ones by specifying the directory name: +```sh +./files/setup.sh sh bash +``` +Note that some files might depend on other directories, specially `sh` which +is a base for `bash` and `zsh` but might also have environment variables for +`net` and `vim`. + +Reload your shell: +```sh +exec $SHELL +``` + +Reload you X server: +```sh +. ~/.config/x11/xprofile +``` + +You need to logout and login again for some changes to take effect. + +## Usage + +The deployment replaces existing files and that is the goal, to make sure that +we have the same configuration of every machine. Support for local +configuration is implemented by including a local file per application. + +Supported programs and the expected file names in `$HOME`: + +- bash: `.bashrc.local` +- git: `.gitconfig.local` +- sh: `.profile.local`, `.shrc.local` +- ssh: `.ssh/config.d/*.conf`, `.ssh/known_hosts.d/*.host` +- tmux: `.tmux.conf.local` +- vim: `.vimrc.local` +- x11: `.xprofile.local` +- zsh: `.zshrc.local` + +## Copyright + +License: GPLv3+ diff --git a/qusal/dotfiles/copy-all.sls b/qusal/dotfiles/copy-all.sls new file mode 100644 index 0000000..5a72336 --- /dev/null +++ b/qusal/dotfiles/copy-all.sls @@ -0,0 +1,46 @@ +include: + - .copy-git + - .copy-gtk + - .copy-net + - .copy-pgp + - .copy-sh + - .copy-ssh + - .copy-tmux + - .copy-vim + - .copy-x11 + +{# +Unfortunately salt.states.file does not keep permissions when using salt-ssh. +Best option is 'file.managed mode: keep' or 'file.recurse file_mode: keep'. +https://docs.saltproject.io/en/latest/ref/states/all/salt.states.file.html +#} +{# +"{{ slsdotpath }}-absent-dotfiles-client": + file.absent: + - name: /tmp/dotfiles + +"{{ slsdotpath }}-copy-dotfiles-client": + file.recurse: + - source: salt://{{ slsdotpath }}/files + - name: /tmp/dotfiles + - file_mode: '0644' + - dir_mode: '0700' + - user: user + - group: user + +"{{ slsdotpath }}-apply-dotfiles-client": + cmd.run: + - name: sh /tmp/dotfiles/setup.sh + - runas: user + +"{{ slsdotpath }}-fix-executables-permission": + file.directory: + - name: /home/user/.local/bin + - mode: '0755' + - recurse: + - mode + +"{{ slsdotpath }}-absent-end-dotfiles-client": + file.absent: + - name: /tmp/dotfiles +#} diff --git a/qusal/dotfiles/copy-all.top b/qusal/dotfiles/copy-all.top new file mode 100644 index 0000000..3a08cb6 --- /dev/null +++ b/qusal/dotfiles/copy-all.top @@ -0,0 +1,3 @@ +base: + '*': + - dotfiles.copy-all diff --git a/qusal/dotfiles/copy-git.sls b/qusal/dotfiles/copy-git.sls new file mode 100644 index 0000000..196a97c --- /dev/null +++ b/qusal/dotfiles/copy-git.sls @@ -0,0 +1,59 @@ +"{{ slsdotpath }}-copy-git-home": + file.recurse: + - name: /home/user + - source: salt://{{ slsdotpath }}/files/git + - file_mode: '0644' + - dir_mode: '0700' + - user: user + - group: user + +"{{ slsdotpath }}-fix-executables-git-template-dir-home": + file.directory: + - name: /home/user/.config/git/template/hooks + - mode: '0755' + - recurse: + - mode + +"{{ slsdotpath }}-fix-executables-git-shell-dir-home": + file.directory: + - name: /home/user/.config/git/shell + - mode: '0755' + - recurse: + - mode + +"{{ slsdotpath }}-fix-executables-git-bin-dir-home": + file.directory: + - name: /home/user/.local/bin + - mode: '0755' + - recurse: + - mode + +"{{ slsdotpath }}-copy-git-skel": + file.recurse: + - name: /etc/skel + - source: salt://{{ slsdotpath }}/files/git + - file_mode: '0644' + - dir_mode: '0700' + - user: root + - group: root + +"{{ slsdotpath }}-fix-executables-git-template-dir-skel": + file.directory: + - name: /etc/skel/.config/git/template/hooks + - mode: '0755' + - recurse: + - mode + +"{{ slsdotpath }}-fix-executables-git-shell-dir-skel": + file.directory: + - name: /home/user/.config/git/shell + - mode: '0755' + - recurse: + - mode + +"{{ slsdotpath }}-fix-executables-git-bin-dir-skel": + file.directory: + - name: /home/user/.local/bin + - mode: '0755' + - recurse: + - mode diff --git a/qusal/dotfiles/copy-git.top b/qusal/dotfiles/copy-git.top new file mode 100644 index 0000000..6bbf4c7 --- /dev/null +++ b/qusal/dotfiles/copy-git.top @@ -0,0 +1,3 @@ +base: + '*': + - dotfiles.copy-git diff --git a/qusal/dotfiles/copy-gtk.sls b/qusal/dotfiles/copy-gtk.sls new file mode 100644 index 0000000..277295d --- /dev/null +++ b/qusal/dotfiles/copy-gtk.sls @@ -0,0 +1,17 @@ +"{{ slsdotpath }}-copy-gtk-home": + file.recurse: + - name: /home/user/ + - source: salt://{{ slsdotpath }}/files/gtk/ + - file_mode: '0644' + - dir_mode: '0700' + - user: user + - group: user + +"{{ slsdotpath }}-copy-gtk-skel": + file.recurse: + - name: /etc/skel + - source: salt://{{ slsdotpath }}/files/gtk/ + - file_mode: '0644' + - dir_mode: '0700' + - user: root + - group: root diff --git a/qusal/dotfiles/copy-gtk.top b/qusal/dotfiles/copy-gtk.top new file mode 100644 index 0000000..52c7741 --- /dev/null +++ b/qusal/dotfiles/copy-gtk.top @@ -0,0 +1,3 @@ +base: + '*': + - dotfiles.copy-gtk diff --git a/qusal/dotfiles/copy-net.sls b/qusal/dotfiles/copy-net.sls new file mode 100644 index 0000000..1ee7434 --- /dev/null +++ b/qusal/dotfiles/copy-net.sls @@ -0,0 +1,21 @@ +"{{ slsdotpath }}-copy-net-home": + file.recurse: + - name: /home/user/ + - source: salt://{{ slsdotpath }}/files/net/ + - file_mode: '0644' + - dir_mode: '0700' + - user: user + - group: user + - keep_symlinks: True + - force_symlinks: True + +"{{ slsdotpath }}-copy-net-skel": + file.recurse: + - name: /etc/skel + - source: salt://{{ slsdotpath }}/files/net/ + - file_mode: '0644' + - dir_mode: '0700' + - user: root + - group: root + - keep_symlinks: True + - force_symlinks: True diff --git a/qusal/dotfiles/copy-net.top b/qusal/dotfiles/copy-net.top new file mode 100644 index 0000000..a63816b --- /dev/null +++ b/qusal/dotfiles/copy-net.top @@ -0,0 +1,3 @@ +base: + '*': + - dotfiles.copy-net diff --git a/qusal/dotfiles/copy-pgp.sls b/qusal/dotfiles/copy-pgp.sls new file mode 100644 index 0000000..591c02d --- /dev/null +++ b/qusal/dotfiles/copy-pgp.sls @@ -0,0 +1,17 @@ +"{{ slsdotpath }}-copy-pgp-home": + file.recurse: + - name: /home/user/ + - source: salt://{{ slsdotpath }}/files/pgp/ + - file_mode: '0600' + - dir_mode: '0700' + - user: user + - group: user + +"{{ slsdotpath }}-copy-pgp-skel": + file.recurse: + - name: /etc/skel/ + - source: salt://{{ slsdotpath }}/files/pgp/ + - file_mode: '0600' + - dir_mode: '0700' + - user: root + - group: root diff --git a/qusal/dotfiles/copy-pgp.top b/qusal/dotfiles/copy-pgp.top new file mode 100644 index 0000000..2593cf1 --- /dev/null +++ b/qusal/dotfiles/copy-pgp.top @@ -0,0 +1,3 @@ +base: + '*': + - dotfiles.copy-pgp diff --git a/qusal/dotfiles/copy-sh.sls b/qusal/dotfiles/copy-sh.sls new file mode 100644 index 0000000..446f38e --- /dev/null +++ b/qusal/dotfiles/copy-sh.sls @@ -0,0 +1,37 @@ +"{{ slsdotpath }}-copy-sh-home": + file.recurse: + - name: /home/user/ + - source: salt://{{ slsdotpath }}/files/sh + - file_mode: '0644' + - dir_mode: '0700' + - user: user + - group: user + - keep_symlinks: True + - force_symlinks: True + +"{{ slsdotpath }}-fix-executables-sh-dir-home": + file.directory: + - name: /home/user/.local/bin + - file_mode: '0755' + - dir_mode: '0755' + - recurse: + - mode + +"{{ slsdotpath }}-copy-sh-skel": + file.recurse: + - name: /etc/skel + - source: salt://{{ slsdotpath }}/files/sh + - file_mode: '0644' + - dir_mode: '0700' + - user: root + - group: root + - keep_symlinks: True + - force_symlinks: True + +"{{ slsdotpath }}-fix-executables-sh-dir-skel": + file.directory: + - name: /etc/skel/.local/bin + - file_mode: '0755' + - dir_mode: '0755' + - recurse: + - mode diff --git a/qusal/dotfiles/copy-sh.top b/qusal/dotfiles/copy-sh.top new file mode 100644 index 0000000..b6d1009 --- /dev/null +++ b/qusal/dotfiles/copy-sh.top @@ -0,0 +1,3 @@ +base: + '*': + - dotfiles.copy-sh diff --git a/qusal/dotfiles/copy-ssh.sls b/qusal/dotfiles/copy-ssh.sls new file mode 100644 index 0000000..3c37ed4 --- /dev/null +++ b/qusal/dotfiles/copy-ssh.sls @@ -0,0 +1,18 @@ +"{{ slsdotpath }}-copy-ssh-home": + file.recurse: + - name: /home/user/ + - source: salt://{{ slsdotpath }}/files/ssh/ + - file_mode: '0600' + - dir_mode: '0700' + - user: user + - group: user + - backup: minion + +"{{ slsdotpath }}-copy-ssh-skel": + file.recurse: + - name: /etc/skel/ + - source: salt://{{ slsdotpath }}/files/ssh/ + - file_mode: '0600' + - dir_mode: '0700' + - user: root + - group: root diff --git a/qusal/dotfiles/copy-ssh.top b/qusal/dotfiles/copy-ssh.top new file mode 100644 index 0000000..6e8be25 --- /dev/null +++ b/qusal/dotfiles/copy-ssh.top @@ -0,0 +1,3 @@ +base: + '*': + - dotfiles.copy-ssh diff --git a/qusal/dotfiles/copy-tmux.sls b/qusal/dotfiles/copy-tmux.sls new file mode 100644 index 0000000..c7657ea --- /dev/null +++ b/qusal/dotfiles/copy-tmux.sls @@ -0,0 +1,31 @@ +"{{ slsdotpath }}-copy-tmux-home": + file.recurse: + - name: /home/user/ + - source: salt://{{ slsdotpath }}/files/tmux/ + - file_mode: '0644' + - dir_mode: '0700' + - user: user + - group: user + +"{{ slsdotpath }}-fix-executables-tmux-home": + file.directory: + - name: /home/user/.local/bin + - mode: '0755' + - recurse: + - mode + +"{{ slsdotpath }}-copy-tmux-skel": + file.recurse: + - name: /etc/skel + - source: salt://{{ slsdotpath }}/files/tmux/ + - file_mode: '0644' + - dir_mode: '0700' + - user: root + - group: root + +"{{ slsdotpath }}-fix-executables-tmux-skel": + file.directory: + - name: /home/user/.local/bin + - mode: '0755' + - recurse: + - mode diff --git a/qusal/dotfiles/copy-tmux.top b/qusal/dotfiles/copy-tmux.top new file mode 100644 index 0000000..3525d2b --- /dev/null +++ b/qusal/dotfiles/copy-tmux.top @@ -0,0 +1,3 @@ +base: + '*': + - dotfiles.copy-tmux diff --git a/qusal/dotfiles/copy-vim.sls b/qusal/dotfiles/copy-vim.sls new file mode 100644 index 0000000..9ffc1fd --- /dev/null +++ b/qusal/dotfiles/copy-vim.sls @@ -0,0 +1,17 @@ +"{{ slsdotpath }}-copy-vim-home": + file.recurse: + - name: /home/user/ + - source: salt://{{ slsdotpath }}/files/vim/ + - file_mode: '0644' + - dir_mode: '0700' + - user: user + - group: user + +"{{ slsdotpath }}-copy-vim-skel": + file.recurse: + - name: /etc/skel + - source: salt://{{ slsdotpath }}/files/vim/ + - file_mode: '0644' + - dir_mode: '0700' + - user: root + - group: root diff --git a/qusal/dotfiles/copy-vim.top b/qusal/dotfiles/copy-vim.top new file mode 100644 index 0000000..ed65b15 --- /dev/null +++ b/qusal/dotfiles/copy-vim.top @@ -0,0 +1,3 @@ +base: + '*': + - dotfiles.copy-vim diff --git a/qusal/dotfiles/copy-x11.sls b/qusal/dotfiles/copy-x11.sls new file mode 100644 index 0000000..b9427c5 --- /dev/null +++ b/qusal/dotfiles/copy-x11.sls @@ -0,0 +1,21 @@ +"{{ slsdotpath }}-copy-x11-home": + file.recurse: + - name: /home/user/ + - source: salt://{{ slsdotpath }}/files/x11 + - file_mode: '0755' + - dir_mode: '0755' + - user: user + - group: user + - keep_symlinks: True + - force_symlinks: True + +"{{ slsdotpath }}-copy-x11-skel": + file.recurse: + - name: /etc/skel/ + - source: salt://{{ slsdotpath }}/files/x11 + - file_mode: '0755' + - dir_mode: '0755' + - user: root + - group: root + - keep_symlinks: True + - force_symlinks: True diff --git a/qusal/dotfiles/copy-x11.top b/qusal/dotfiles/copy-x11.top new file mode 100644 index 0000000..027a4d9 --- /dev/null +++ b/qusal/dotfiles/copy-x11.top @@ -0,0 +1,3 @@ +base: + '*': + - dotfiles.copy-x11 diff --git a/qusal/dotfiles/files/dom0/The Qubes Project/qubes-qube-manager.conf b/qusal/dotfiles/files/dom0/The Qubes Project/qubes-qube-manager.conf new file mode 100644 index 0000000..4df0569 --- /dev/null +++ b/qusal/dotfiles/files/dom0/The Qubes Project/qubes-qube-manager.conf @@ -0,0 +1,32 @@ +# vim: ft=toml +[General] +window_size=@Size(824 500) + +[columns] +Backup=true +Default%20DispVM=true +Disk%20Usage=true +IP=true +Internal=false +Is%20DVM%20Template=false +Label=true +Last%20backup=true +Name=true +NetVM=true +State=true +Template=true +Type=false +Virt%20Mode=false + +[show] +all=true +halted=true +network=true +running=true +standalone=true +templates=true + +[view] +compactview=true +sort_column=3 +sort_order=0 diff --git a/qusal/dotfiles/files/git/.config/git/config b/qusal/dotfiles/files/git/.config/git/config new file mode 100644 index 0000000..b672124 --- /dev/null +++ b/qusal/dotfiles/files/git/.config/git/config @@ -0,0 +1,144 @@ +; Global Git Config +; vim: ft=gitconfig +[alias] + ; https://git.wiki.kernel.org/index.php/Aliases + ; Abbreviations + co = checkout + br = branch + ci = commit + cm = commit + st = status + df = diff + dc = diff --cached + gi = init + gib = init --bare + cu = rev-parse --abbrev-ref --symbolic-full-name @{upstream} + lg = !sh -c 'git log --color \"$@\"|fmt -s -w 79|less -FRSX' _ + lgg = log --graph --pretty='format:%C(yellow)%h%C(reset) %C(magenta)%G?%C(reset) -%C(red)%d%C(reset) %C(reset)%s %C(green)(%cs)%C(reset) %C(blue)%aN%C(reset)' + r = remote + rl = remote -v + cf = config --file "$HOME/.gitconfig.local" + ; Helpers + aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /' + aliases-get = "!f() { git config --get alias.$1;}; f" + ; Patch with subject prefix containing repository name and output + ; directory has the child directories the repository and branch name. + fp = "!sh -c '\ + git rev-parse --show-toplevel 2>&1 >/dev/null || return; \ + repo=\"$(basename $(git rev-parse --show-toplevel) | \ + sed s/^qubes-//)\"; \ + outdir=\"$(git config format.outputDirectory)\"; \ + ref=\"$(git symbolic-ref --short HEAD)\"; \ + git format-patch \ + --output-directory \"${outdir%*/}/${repo}/${ref}\" \ + --subject-prefix=\"PATCH ${repo}\" \"${@}\" \ + --diff-algorithm=histogram \ + '" - + last = log -1 HEAD + unstage = reset HEAD -- + undo = reset --soft HEAD^ + changes = diff --name-status -r + diffstat = diff --stat -r + who = shortlog -s -- + ; whois + whois = log -i -1 --pretty='format:%an <%ae>' --author + ; whatis + whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short + ; See what commits have been created by the last command, eg: git pull + new = !sh -c 'git log $1@{1}..$1@{0} "$@"' + ; List commits with the same the abbreviated hash. + abbr = "!sh -c 'git rev-list --all | grep ^$1 | while read commit; do git --no-pager log -n1 --pretty=format:\"%H %ci %an %s%n\" $commit; done' -" + ; Solve merge conflicts + edit-unmerged = "!f() { git diff --name-status --diff-filter=U | cut -f2 ; }; vim $(f)" + add-unmerged = "!f() { git diff --name-status --diff-filter=U | cut -f2 ; }; git add $(f)" + ; List tips of branches that are not in the first arg. + ; git tips origin/master ^origin/alternate | git oneline + oneline ="!_() { $(test $# -eq 0 && echo xargs -L1) git log --no-walk --decorate --oneline \"$@\"; }; _" + tips = "!_() { t=$(git rev-list --no-merges --max-count=1 \"$@\"); if test -n \"$t\"; then echo $t; _ \"$@\" ^$t; fi; }; _" + ; Submodules. + sub-update-recurse = !sh -c 'git checkout $1 && git submodule update --recursive' + ; Signed tags and commits + stag = "!sh -c '\ + commit_id=\"$(git rev-parse --verify HEAD)\"; \ + tag_name=\"signed_tag_for_$(echo $commit_id | head -c 8)\"; \ + git tag -s \"$tag_name\" -m \"Tag for commit $commit_id\"; \ + echo \"$tag_name\"'" + ptag = !git push $(git config branch.$(git branch --show-current).remote) $(git describe) + vtag = !git verify-tag -v $(git describe) + vhead = !git verify-commit -v $(git rev-parse HEAD) +[blame] + coloring = repeatedLines +[branch] + autoSetupMerge = always +[color] + ui = auto + diff = auto + status = auto + branch = auto + interactive = auto + grep = auto +[commit] + gpgSign = true + verbose = true + template = ~/.config/git/message +[core] + excludesFile = ~/.config/git/ignore + pager = git-pager +[delta] + navigate = true + light = false +[diff] + algorithm = histogram + colorMoved = default +[diff "image"] + textConv = identify +[format] + coverLetter = auto + coverFromDescription = auto + thread = shallow + signOff = true + signatureFile = ~/.signature + outputDirectory = /tmp/patch +[gpg] + program = gpgw + minTrustLevel = fully +[grep] + extendedRegexp = true + lineNumber = true +[init] + defaultbranch = main + templatedir = ~/.config/git/template +[interactive] + diffFilter = delta --color-only +[mailinfo] + scissors = true +[merge] + verifySignatures = true + tool = vimdiff + conflictStyle = diff3 + summary = true +[pull] + ; Rebase does not verify signatures. Does not prevent manual rebase. + rebase = false +[push] + autoSetupRemote = true + default = nothing + followTags = true +[rebase] + autoSquash = true +[sendemail] + annotate = true + multiEdit = true + confirm = always + thread = shallow + chainReplyTo = true + xmailer = false +[tag] + forceSignAnnotated = true + gpgSign = true +[user] + hideTimezone = true +[includeIf "gitdir:~/**/qubes-*/**"] + path = ~/.config/git/config.d/qubes-devel +[include] + path = ~/.gitconfig.local diff --git a/qusal/dotfiles/files/git/.config/git/config.d/qubes-devel b/qusal/dotfiles/files/git/.config/git/config.d/qubes-devel new file mode 100644 index 0000000..6603797 --- /dev/null +++ b/qusal/dotfiles/files/git/.config/git/config.d/qubes-devel @@ -0,0 +1,5 @@ +; vim: ft=gitconfig +[format] + to = qubes-devel@googlegroups.com +[sendemail] + to = qubes-devel@googlegroups.com diff --git a/qusal/dotfiles/files/git/.config/git/ignore b/qusal/dotfiles/files/git/.config/git/ignore new file mode 100644 index 0000000..69d5db8 --- /dev/null +++ b/qusal/dotfiles/files/git/.config/git/ignore @@ -0,0 +1,31 @@ +# Local +*.local +!.local/ +!rc.local + +# Code +*.patch +*.diff + +# Editor +.*.sw? +.*.tmp +*~ +.#* +[#]*# +Session.vim +/tags +/doc/tags + +## Debian build artifacts +**/debhelper-build-stamp +**/debian/files +**/debian/*.debhelper* +debian/*.postinst.debhelper +debian/*.postrm.debhelper +debian/*.preinst.debhelper +debian/*.prerm.debhelper +debian/*.substvars +*-build-deps_*.deb +*-build-deps_*.buildinfo +*-build-deps_*.changes diff --git a/qusal/dotfiles/files/git/.config/git/message b/qusal/dotfiles/files/git/.config/git/message new file mode 100644 index 0000000..780b832 --- /dev/null +++ b/qusal/dotfiles/files/git/.config/git/message @@ -0,0 +1,3 @@ + +# Title: 50c, summary, imperative, start uppercase, end without period +# Body: 72c, explain 'what' and 'why' vs. 'how', include task ID diff --git a/qusal/dotfiles/files/git/.config/git/sample/gitconfig.local.sample b/qusal/dotfiles/files/git/.config/git/sample/gitconfig.local.sample new file mode 100644 index 0000000..5d67eac --- /dev/null +++ b/qusal/dotfiles/files/git/.config/git/sample/gitconfig.local.sample @@ -0,0 +1,6 @@ +; ~/.gitconfig.local +; vim: ft=gitconfig +[user] + email = your-mail@your-provider.domain + name = Your Name + signingKey = 0x012345678ABC diff --git a/qusal/dotfiles/files/git/.config/git/shell/.git-shell-lib b/qusal/dotfiles/files/git/.config/git/shell/.git-shell-lib new file mode 100644 index 0000000..848e7a0 --- /dev/null +++ b/qusal/dotfiles/files/git/.config/git/shell/.git-shell-lib @@ -0,0 +1,24 @@ +## guarantee commands are run from $HOME +cd + +base="src" + +fail_invalid_name(){ + printf '%s\n' "error: invalid $1 name" + exit 1 +} + +test_name(){ + name="$1" + if ! (echo "$name" | grep -q "^[A-Za-z0-9][A-Za-z0-9_.-]\+[A-Za-z0-9]$") + then + fail_invalid_name repository + fi +} + +clean_repo_name(){ + case "${repo-}" in + *.git) repo="";; + *) repo="$repo.git";; + esac +} diff --git a/qusal/dotfiles/files/git/.config/git/shell/description b/qusal/dotfiles/files/git/.config/git/shell/description new file mode 100755 index 0000000..c321893 --- /dev/null +++ b/qusal/dotfiles/files/git/.config/git/shell/description @@ -0,0 +1,21 @@ +#!/bin/sh +set -eu + +# shellcheck disable=SC1090 +. ~/git-shell-commands/.git-shell-lib + +usage(){ + printf '%s\n' "usage: ${0##*/} SECTION REPOSITORY" + printf '%s\n' "regex: ^[A-Za-z0-9][A-Za-z0-9_.-]\+[A-Za-z0-9]$" + exit 1 +} + +test -n "${2-}" || usage +section="$2" +test_name "$section" +repo="$2" +test_name "$repo" +clean_repo_name + +# shellcheck disable=SC2154 +cat | cut -c 1-80 | tee "$base/$section/$repo/description" diff --git a/qusal/dotfiles/files/git/.config/git/shell/help b/qusal/dotfiles/files/git/.config/git/shell/help new file mode 100755 index 0000000..e36381c --- /dev/null +++ b/qusal/dotfiles/files/git/.config/git/shell/help @@ -0,0 +1,4 @@ +#!/bin/sh +set -eu + +ls ~/git-shell-commands diff --git a/qusal/dotfiles/files/git/.config/git/shell/init b/qusal/dotfiles/files/git/.config/git/shell/init new file mode 100755 index 0000000..f02bb60 --- /dev/null +++ b/qusal/dotfiles/files/git/.config/git/shell/init @@ -0,0 +1,30 @@ +#!/bin/sh +set -eu + +# shellcheck disable=SC1090 +. ~/git-shell-commands/.git-shell-lib + +usage(){ + printf '%s\n' "usage: ${0##*/} SECTION REPOSITORY [BRANCH]" + printf '%s\n' "regex: ^[A-Za-z0-9][A-Za-z0-9_.-]\+[A-Za-z0-9]$" + exit 1 +} + +test -n "${1-}" || usage +section="$1" +test_name "$section" +repo="$2" +test_name "$repo" +clean_repo_name +branch="" +test -n "${3-}" && branch="$3" + +if test -n "${branch}"; then + test_name "$branch" +fi + +# shellcheck disable=SC2154 +git init \ + --bare \ + ${branch:+--initial-branch $branch} \ + -- "$base/$section/$repo" diff --git a/qusal/dotfiles/files/git/.config/git/shell/list b/qusal/dotfiles/files/git/.config/git/shell/list new file mode 100755 index 0000000..c9cb114 --- /dev/null +++ b/qusal/dotfiles/files/git/.config/git/shell/list @@ -0,0 +1,12 @@ +#!/bin/sh +set -eu + +# shellcheck disable=SC1090 +. ~/git-shell-commands/.git-shell-lib + +# shellcheck disable=SC2154 +if command -v tree >/dev/null; then + tree -L 1 "$base" +else + find "$base" -maxdepth 1 -type d +fi diff --git a/qusal/dotfiles/files/git/.config/git/shell/no-interactive-login b/qusal/dotfiles/files/git/.config/git/shell/no-interactive-login new file mode 100755 index 0000000..440c37d --- /dev/null +++ b/qusal/dotfiles/files/git/.config/git/shell/no-interactive-login @@ -0,0 +1,18 @@ +#!/bin/sh +set -eu + +command -v git >/dev/null || exit 1 +printf '%s\n' "Hi $USER! You've successfully authenticated, but I do not" +printf '%s\n' "provide interactive shell access." +printf '%s\n' "You have access to these repositories:" + +for dir in ~/src/*.git; do + test -d "$dir" || continue + test git -C "$dir" rev-parse --is-bare-repository = "true" || continue + printf '%s\t\t' "${dir##*/}" + if grep -q "^Unnamed repository" "$dir"/description; then + printf '\n'; continue + fi + cat "$dir"/description +done +exit 128 diff --git a/qusal/dotfiles/files/git/.config/git/template/config b/qusal/dotfiles/files/git/.config/git/template/config new file mode 100644 index 0000000..5779f73 --- /dev/null +++ b/qusal/dotfiles/files/git/.config/git/template/config @@ -0,0 +1,12 @@ +; vim: ft=gitconfig +[branch "main"] + remote = origin + merge = refs/heads/main + rebase = true +[core] + repositoryFormatVersion = 0 + fileMode = true + bare = false + logAllRefUpdates = true +[init] + defaultBranch = main diff --git a/qusal/dotfiles/files/git/.config/git/template/hooks/pre-receive b/qusal/dotfiles/files/git/.config/git/template/hooks/pre-receive new file mode 100755 index 0000000..6fb2e16 --- /dev/null +++ b/qusal/dotfiles/files/git/.config/git/template/hooks/pre-receive @@ -0,0 +1,46 @@ +#!/bin/sh +## TODO: unfinished +# shellcheck disable=SC2317 +exit 0 + +set -eu + +command -v git >/dev/null || exit 1 + +exit_code=0 +zero_commit="0000000000000000000000000000000000000000" + +while read -r oldrev newrev ref; do +#read -r oldrev newrev ref + echo "$oldrev $newrev $ref" + test "$newrev" = "$zero_commit" && continue + + if test "$oldrev" = "$zero_commit"; then + objects="$(git rev-list "$newrev")" + else + objects="$(git rev-list "$oldrev..$newrev")" + fi + + for commit in $objects; do + git verify-commit "$commit" >/dev/null 2>&1 && return + + ## WARNING: tag verification is not working as expected. + commit_tag="$(git tag --points-at="$commit")" + if test -z "$commit_tag"; then + echo "Commit couldn't be verified and no tag points to it: $commit" + exit_code=1 + continue + fi + + if git verify-tag "$commit_tag" >/dev/null 2>&1; then + echo "Tag verification succeeded for commit: $commit" + continue + fi + + echo "Commit verification failed: $commit" + exit_code=1 + done + if test "$exit_code" != "0"; then + exit "$exit_code" + fi +done diff --git a/qusal/dotfiles/files/git/.config/git/template/info/exclude b/qusal/dotfiles/files/git/.config/git/template/info/exclude new file mode 100644 index 0000000..2ad9294 --- /dev/null +++ b/qusal/dotfiles/files/git/.config/git/template/info/exclude @@ -0,0 +1 @@ +*.local diff --git a/qusal/dotfiles/files/git/.config/tig/config b/qusal/dotfiles/files/git/.config/tig/config new file mode 100644 index 0000000..f206f26 --- /dev/null +++ b/qusal/dotfiles/files/git/.config/tig/config @@ -0,0 +1,71 @@ +# Key binding source: https://github.com/jonas/tig/blob/master/contrib/vim.tigrc + +bind generic h scroll-left +bind generic j move-down +bind generic k move-up +bind generic l scroll-right + +bind generic g none +bind generic gg move-first-line +bind generic gj next +bind generic gk previous +bind generic gp parent +bind generic gP back +bind generic gn view-next + +bind main G move-last-line +bind generic G move-last-line + +bind generic move-page-down +bind generic move-page-up + +bind generic v none +bind generic vm view-main +bind generic vd view-diff +bind generic vl view-log +bind generic vt view-tree +bind generic vb view-blob +bind generic vx view-blame +bind generic vr view-refs +bind generic vs view-status +bind generic vu view-stage +bind generic vy view-stash +bind generic vg view-grep +bind generic vp view-pager +bind generic vh view-help + +bind generic o none +bind generic oo :toggle sort-order +bind generic os :toggle sort-field +bind generic on :toggle line-number +bind generic od :toggle date +bind generic oa :toggle author +bind generic og :toggle line-graphics +bind generic of :toggle file-name +bind generic op :toggle ignore-space +bind generic oi :toggle id +bind generic ot :toggle commit-title-overflow +bind generic oF :toggle file-filter +bind generic or :toggle commit-title-refs + +bind generic @ none +bind generic @j :/^@@ +bind generic @k :?^@@ +bind generic @- :toggle diff-context -1 +bind generic @+ :toggle diff-context +1 + +bind status u none +bind stage u none +bind generic uu status-update +bind generic ur status-revert +bind generic um status-merge +bind generic ul stage-update-line +# bind generic up stage-update-parte +bind generic us stage-split-chunk + +bind generic c none +bind generic cc !git commit +bind generic ca !?@git commit --amend --no-edit + +bind generic K view-help +bind generic view-next diff --git a/qusal/dotfiles/files/gtk/.config/gtk-2.0/bookmarks b/qusal/dotfiles/files/gtk/.config/gtk-2.0/bookmarks new file mode 100644 index 0000000..010e834 --- /dev/null +++ b/qusal/dotfiles/files/gtk/.config/gtk-2.0/bookmarks @@ -0,0 +1 @@ +file:///home/user/QubesIncoming diff --git a/qusal/dotfiles/files/gtk/.config/gtk-2.0/gtkrc-2.0 b/qusal/dotfiles/files/gtk/.config/gtk-2.0/gtkrc-2.0 new file mode 100644 index 0000000..e437794 --- /dev/null +++ b/qusal/dotfiles/files/gtk/.config/gtk-2.0/gtkrc-2.0 @@ -0,0 +1,15 @@ +gtk-theme-name=Adwaita-Dark +gtk-icon-theme-name=Adwaita +gtk-font-name="Sans 10" +gtk-cursor-theme-size=0 +gtk-toolbar-style=GTK_TOOLBAR_TEXT +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=0 +gtk-menu-images=1 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=1 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle=hintfull +gtk-xft-rgba=rgb +gtk-cursor-theme-name=Adwaita diff --git a/qusal/dotfiles/files/gtk/.config/gtk-2.0/qubes-incoming-bookmark-created b/qusal/dotfiles/files/gtk/.config/gtk-2.0/qubes-incoming-bookmark-created new file mode 100644 index 0000000..e69de29 diff --git a/qusal/dotfiles/files/gtk/.config/gtk-3.0/bookmarks b/qusal/dotfiles/files/gtk/.config/gtk-3.0/bookmarks new file mode 100644 index 0000000..010e834 --- /dev/null +++ b/qusal/dotfiles/files/gtk/.config/gtk-3.0/bookmarks @@ -0,0 +1 @@ +file:///home/user/QubesIncoming diff --git a/qusal/dotfiles/files/gtk/.config/gtk-3.0/qubes-incoming-bookmark-created b/qusal/dotfiles/files/gtk/.config/gtk-3.0/qubes-incoming-bookmark-created new file mode 100644 index 0000000..e69de29 diff --git a/qusal/dotfiles/files/gtk/.config/gtk-3.0/settings.ini b/qusal/dotfiles/files/gtk/.config/gtk-3.0/settings.ini new file mode 100644 index 0000000..cafc62d --- /dev/null +++ b/qusal/dotfiles/files/gtk/.config/gtk-3.0/settings.ini @@ -0,0 +1,16 @@ +[Settings] +gtk-theme-name=Adwaita-Dark +gtk-icon-theme-name=Adwaita +gtk-font-name=Sans 10 +gtk-cursor-theme-size=0 +gtk-toolbar-style=GTK_TOOLBAR_TEXT +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=0 +gtk-menu-images=1 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=1 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle=hintfull +gtk-xft-rgba=rgb +gtk-cursor-theme-name=Adwaita diff --git a/qusal/dotfiles/files/gtk/.config/gtk-4.0/bookmarks b/qusal/dotfiles/files/gtk/.config/gtk-4.0/bookmarks new file mode 100644 index 0000000..010e834 --- /dev/null +++ b/qusal/dotfiles/files/gtk/.config/gtk-4.0/bookmarks @@ -0,0 +1 @@ +file:///home/user/QubesIncoming diff --git a/qusal/dotfiles/files/gtk/.config/gtk-4.0/qubes-incoming-bookmark-created b/qusal/dotfiles/files/gtk/.config/gtk-4.0/qubes-incoming-bookmark-created new file mode 100644 index 0000000..e69de29 diff --git a/qusal/dotfiles/files/gtk/.config/gtk-4.0/settings.ini b/qusal/dotfiles/files/gtk/.config/gtk-4.0/settings.ini new file mode 100644 index 0000000..cafc62d --- /dev/null +++ b/qusal/dotfiles/files/gtk/.config/gtk-4.0/settings.ini @@ -0,0 +1,16 @@ +[Settings] +gtk-theme-name=Adwaita-Dark +gtk-icon-theme-name=Adwaita +gtk-font-name=Sans 10 +gtk-cursor-theme-size=0 +gtk-toolbar-style=GTK_TOOLBAR_TEXT +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=0 +gtk-menu-images=1 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=1 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle=hintfull +gtk-xft-rgba=rgb +gtk-cursor-theme-name=Adwaita diff --git a/qusal/dotfiles/files/net/.config/curl/.curlrc b/qusal/dotfiles/files/net/.config/curl/.curlrc new file mode 120000 index 0000000..402ec5c --- /dev/null +++ b/qusal/dotfiles/files/net/.config/curl/.curlrc @@ -0,0 +1 @@ +curlrc \ No newline at end of file diff --git a/qusal/dotfiles/files/net/.config/curl/curlrc b/qusal/dotfiles/files/net/.config/curl/curlrc new file mode 100644 index 0000000..1bfc5d9 --- /dev/null +++ b/qusal/dotfiles/files/net/.config/curl/curlrc @@ -0,0 +1 @@ +show-error diff --git a/qusal/dotfiles/files/net/.config/urlview/urlview b/qusal/dotfiles/files/net/.config/urlview/urlview new file mode 100644 index 0000000..287fda0 --- /dev/null +++ b/qusal/dotfiles/files/net/.config/urlview/urlview @@ -0,0 +1 @@ +REGEXP \b(((https?|ftp|gopher)|mailto):(//)?[^ <>"\t]*|(www|ftp)[0-9]?\.[-a-z0-9.]+)[^ .,;\t\n\r<">\):]?[^, <>"\t]*[^] .,;\t\n\r<">\):] diff --git a/qusal/dotfiles/files/net/.config/wget/wgetrc b/qusal/dotfiles/files/net/.config/wget/wgetrc new file mode 100644 index 0000000..4fd7999 --- /dev/null +++ b/qusal/dotfiles/files/net/.config/wget/wgetrc @@ -0,0 +1 @@ +hsts-file=~/.cache/wget-hsts diff --git a/qusal/dotfiles/files/net/.urlview b/qusal/dotfiles/files/net/.urlview new file mode 120000 index 0000000..8f575f3 --- /dev/null +++ b/qusal/dotfiles/files/net/.urlview @@ -0,0 +1 @@ +.config/urlview/urlview \ No newline at end of file diff --git a/qusal/dotfiles/files/net/.w3m/keymap b/qusal/dotfiles/files/net/.w3m/keymap new file mode 100644 index 0000000..f5dca55 --- /dev/null +++ b/qusal/dotfiles/files/net/.w3m/keymap @@ -0,0 +1,252 @@ +## w3m vim-like keymap file +## https://github.com/sansna/keymap.w3m/blob/master/keymap.w3m + +########## invalidate defaults ########## +keymap K NULL +keymap J NULL +keymap SPC NULL +keymap - NULL +keymap + NULL +keymap C-v NULL +keymap ESC-v NULL +keymap C-f NULL +keymap C-b NULL +keymap C-n NULL +keymap C-p NULL +keymap < NULL +keymap > NULL +keymap . NULL +keymap , NULL +keymap ^ NULL +keymap C-a NULL +keymap W NULL +keymap ^[[6~ NULL +keymap ^[[5~ NULL +keymap g NULL +keymap ^[[1~ NULL +keymap ^[[4~ NULL +keymap ESC-< NULL +keymap ESC-> NULL +keymap [ NULL +keymap ] NULL +keymap ^[[Z NULL +keymap ESC-m NULL +keymap ( NULL +keymap ) NULL +keymap C-j NULL +keymap C-m NULL +keymap ESC-C-j NULL +keymap ESC-C-m NULL +keymap ESC-w NULL +keymap ESC-W NULL +keymap C-s NULL +keymap = NULL +keymap ESC-l NULL +keymap U NULL +keymap V NULL +keymap v NULL +keymap R NULL +keymap ESC-s NULL +keymap : NULL +keymap C-q NULL +keymap T NULL +keymap } NULL +keymap { NULL +keymap ESC-a NULL +keymap ESC-b NULL +keymap c NULL +keymap ESC-: NULL +keymap C-h NULL +keymap q NULL +keymap Q NULL +keymap C-w NULL +keymap C-d NULL +keymap C-u NULL +keymap RIGHT NULL +keymap l NULL +keymap LEFT NULL +keymap h NULL +keymap j NULL +keymap DOWN NULL +keymap k NULL +keymap UP NULL +keymap C-e NULL +keymap C-y NULL +keymap 0 NULL +keymap $ NULL +keymap Z NULL +keymap z NULL +keymap ESC-g NULL +keymap gg NULL +keymap G NULL +keymap w NULL +keymap b NULL +keymap C-n NULL +keymap C-p NULL +keymap ESC-TAB NULL +keymap f NULL +keymap C-o NULL +keymap TAB NULL +keymap C-j NULL +keymap C-] NULL +keymap I NULL +keymap ESC-I NULL +keymap ESC-C-j NULL +keymap y NULL +keymap u NULL +keymap i NULL +keymap gC-g NULL +keymap C-g NULL +keymap ";" NULL +keymap M NULL +keymap ESC-M NULL +keymap F NULL +keymap ESC-u NULL +keymap t NULL +keymap @ NULL +keymap "#" NULL +keymap | NULL +keymap B NULL +keymap L NULL +keymap H NULL +keymap s NULL +keymap gf NULL +keymap S NULL +keymap E NULL +keymap ESC-e NULL +keymap C-r NULL +keymap r NULL +keymap C-l NULL +keymap C-t NULL +keymap d NULL +keymap gt NULL +keymap gT NULL +keymap ESC-t NULL +keymap C-wL NULL +keymap C-wH NULL +keymap a NULL +keymap n NULL +keymap N NULL +keymap / NULL +keymap ? NULL +keymap C-@ NULL +keymap ESC-n NULL +keymap ESC-p NULL +keymap \" NULL +keymap ^[[2~ NULL +keymap ^[[28~ NULL +keymap ^[[E NULL +keymap ^[[L NULL +keymap o NULL +keymap C-k NULL +keymap D NULL +keymap m NULL +keymap ESC-c NULL +keymap ESC-o NULL +keymap ESC-k NULL +keymap \\ NULL +keymap ! NULL +keymap C-z NULL +keymap ZZ NULL +keymap ZQ NULL + + +########## command ########## +keymap :: COMMAND +keymap :H HELP +keymap :O OPTIONS +keymap :d DOWNLOAD_LIST + +########## history navigation ########## +keymap L NEXT +keymap H PREV +keymap :p SELECT_MENU +keymap :h HISTORY + +########## scrolling ########## +keymap C-e UP +keymap C-y DOWN +keymap gg BEGIN +keymap G END +keymap C-f NEXT_PAGE +keymap C-d NEXT_PAGE +keymap d NEXT_PAGE +keymap C-b PREV_PAGE +keymap C-u PREV_PAGE +keymap u PREV_PAGE +keymap zz CENTER_V +########## cursor ########## +#keymap l MOVE_RIGHT +keymap l NEXT_TAB +#keymap h MOVE_LEFT +keymap h PREV_TAB +#keymap j MOVE_DOWN1 +keymap j UP +#keymap k MOVE_UP1 +keymap k DOWN +keymap RIGHT MOVE_RIGHT +keymap LEFT MOVE_LEFT +keymap DOWN MOVE_DOWN1 +keymap UP MOVE_UP1 +keymap 0 LINE_BEGIN +keymap $ LINE_END +keymap w NEXT_WORD +keymap b PREV_WORD +########## cursor history ########## +keymap C-i REDO +keymap C-o UNDO +########## navigation ########## +keymap f MOVE_LIST_MENU +keymap F LIST_MENU +keymap C-n NEXT_LINK +keymap C-p PREV_LINK +keymap :l PEEK_LINK + +# reload +keymap r RELOAD +keymap C-r RELOAD + +# save/load +keymap :w SAVE +keymap :W PRINT +keymap :o GOTO +keymap :e LOAD + +# jump +keymap ESC-C-j SUBMIT +keymap C-] TAB_LINK +keymap C-j GOTO_LINK + +########## info ########## +keymap y PEEK +keymap gC-g INFO +keymap C-g LINE_INFO +keymap gf VIEW + +########## search ########## +keymap / ISEARCH +keymap ? ISEARCH_BACK +keymap n SEARCH_NEXT +keymap N SEARCH_PREV + +########## bookmarks ########## +keymap a ADD_BOOKMARK +keymap :b VIEW_BOOKMARK + +########## tab ########## +keymap x CLOSE_TAB +keymap gh GOTO http://www.google.com/en +keymap gH TAB_GOTO http://www.google.com/en +keymap C-t NEW_TAB +keymap gt NEXT_TAB +keymap gT PREV_TAB +keymap C-wL TAB_RIGHT +keymap C-wH TAB_LEFT +keymap t TAB_GOTO +keymap T TAB_MENU + +########## quit ########## +keymap ZZ EXIT +keymap C-Q EXIT +keymap ZQ QUIT +keymap :q QUIT diff --git a/qusal/dotfiles/files/pgp/.gnupg/gpg.conf b/qusal/dotfiles/files/pgp/.gnupg/gpg.conf new file mode 100644 index 0000000..b9930d4 --- /dev/null +++ b/qusal/dotfiles/files/pgp/.gnupg/gpg.conf @@ -0,0 +1,16 @@ +## Based on https://github.com/Whonix/anon-apps-config +no-emit-version +no-comments +display-charset utf-8 +personal-digest-preferences SHA512 +cert-digest-algo SHA512 +default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed +keyserver-options no-honor-keyserver-url +fixed-list-mode +keyid-format 0xlong +use-agent +verify-options show-uid-validity +list-options show-uid-validity +with-fingerprint +sig-notation issuer-fpr@notations.openpgp.fifthhorseman.net=%g +## vim: set ft=gpg diff --git a/qusal/dotfiles/files/qvm-copy-dotfiles b/qusal/dotfiles/files/qvm-copy-dotfiles new file mode 100755 index 0000000..8e81634 --- /dev/null +++ b/qusal/dotfiles/files/qvm-copy-dotfiles @@ -0,0 +1,34 @@ +#!/bin/sh +## +## Benefits of this method: +## - faster than salt, no need for a dispvm. +## - preserve permisions, salt-ssh doesnt. +## Disadvantages: +## - files need be copied to dom0 preserving permissions or setting again. +## +## Commands to run: +## sudo ./qvm-copy-dotfiles QUBE +set -eu + +test -n "${1:-}" || { echo "usage: ${0##*/} QUBE"; exit 1; } +test "$(id -u)" = "0" || { echo "Program requires root."; exit 1; } + +vm="$1" +qvm-check "$vm" >/dev/null 2>&1 || { echo "VM doesn't exist: '$vm'"; exit 1; } +test -f ./setup.sh || { echo "File doesn't exist: './setup.sh'"; exit 1; } + +if test "$vm" = "dom0"; then + sh ./dotfiles/setup.sh + sudo -u user mkdir -pv /home/user/.cache + tmpdir="$(sudo -u user mktemp -d /home/user/.cache/XXXXXX)" + trap 'rm -rf -- "$tmpdir"' EXIT INT HUP QUIT ABRT + cp -r ./dotfiles "$tmpdir" + chown -R user:user "$tmpdir" + sudo -u user "$tmpdir/dotfiles/setup.sh" + exit +fi + +qvm-run -q "$vm" -- "rm -rf ~/QubesIncoming/dom0/files" +qvm-copy-to-vm "$vm" ../files +qvm-run -q "$vm" -- "sh ~/QubesIncoming/dom0/files/setup.sh" +qvm-run -q "$vm" -- "rm -rf ~/QubesIncoming/dom0/files" diff --git a/qusal/dotfiles/files/setup.sh b/qusal/dotfiles/files/setup.sh new file mode 100755 index 0000000..161fcc8 --- /dev/null +++ b/qusal/dotfiles/files/setup.sh @@ -0,0 +1,40 @@ +#!/bin/sh +set -eu + +prg="$0" +if ! test -e "$prg"; then + case "$prg" in + (*/*) exit 1;; + (*) prg=$(command -v -- "$prg") || exit;; + esac +fi +dir="$(cd -P -- "$(dirname -- "$prg")" && pwd -P)" || exit 1 +prg="$dir/$(basename -- "$prg")" || exit 1 +cd -- "$dir" || exit 1 + +usage(){ + printf '%s\n' "Usage: ${0##*/} [-h|--help] DIR [DIR2...]" + printf '%s\n' "Example: ${0##*/} # deploy all" + printf '%s\n' "Example: ${0##*/} sh vim ... # deploy specific dirs" +} + +case "${1-}" in + -h|--help) usage; exit 1;; + ""|--all) args="$(find . -maxdepth 1 -type d)";; + *) args="${*}";; +esac + +for dir in $args; do + case "${dir##*/}" in "."|"..") continue;; esac + dir="${dir%*/}" + test -f "$dir" && continue + if ! test -d "$dir"; then + printf '%s\n' "Directory doesn't exist: '$dir'." >&2 + exit 1 + fi + for file in "$dir"/.*; do + test -e "$file" || continue + case "${file##*/}" in "."|"..") continue;; esac + cp -rv "$file" "$HOME" + done +done diff --git a/qusal/dotfiles/files/sh/.bash_env b/qusal/dotfiles/files/sh/.bash_env new file mode 120000 index 0000000..0897744 --- /dev/null +++ b/qusal/dotfiles/files/sh/.bash_env @@ -0,0 +1 @@ +.config/bash/bash_env \ No newline at end of file diff --git a/qusal/dotfiles/files/sh/.bash_logout b/qusal/dotfiles/files/sh/.bash_logout new file mode 120000 index 0000000..ae553ad --- /dev/null +++ b/qusal/dotfiles/files/sh/.bash_logout @@ -0,0 +1 @@ +.config/bash/bash_logout \ No newline at end of file diff --git a/qusal/dotfiles/files/sh/.bash_profile b/qusal/dotfiles/files/sh/.bash_profile new file mode 120000 index 0000000..e03d784 --- /dev/null +++ b/qusal/dotfiles/files/sh/.bash_profile @@ -0,0 +1 @@ +.config/bash/bash_profile \ No newline at end of file diff --git a/qusal/dotfiles/files/sh/.bashrc b/qusal/dotfiles/files/sh/.bashrc new file mode 120000 index 0000000..6d5541f --- /dev/null +++ b/qusal/dotfiles/files/sh/.bashrc @@ -0,0 +1 @@ +.config/bash/bashrc \ No newline at end of file diff --git a/qusal/dotfiles/files/sh/.config/bash/bash_env b/qusal/dotfiles/files/sh/.config/bash/bash_env new file mode 100644 index 0000000..c613826 --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/bash/bash_env @@ -0,0 +1,9 @@ +#!/bin/sh +# shellcheck disable=SC1090,SC1091 + +if test -z "$ENV" && test -n "$PATH"; then + case $- in + *l*) ;; + *) . "$HOME/.bash_profile" >/dev/null ;; + esac +fi diff --git a/qusal/dotfiles/files/sh/.config/bash/bash_logout b/qusal/dotfiles/files/sh/.config/bash/bash_logout new file mode 100644 index 0000000..7b134f7 --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/bash/bash_logout @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +test "0${SHLVL-}" -le 1 && test -z "${SSH_TTY-}" && + test "${TERM-}" = linux && clear diff --git a/qusal/dotfiles/files/sh/.config/bash/bash_profile b/qusal/dotfiles/files/sh/.config/bash/bash_profile new file mode 100644 index 0000000..19b59a9 --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/bash/bash_profile @@ -0,0 +1,5 @@ +#!/bin/sh +# shellcheck disable=SC1090,1091 + +. "$HOME/.profile" +case $- in *i*) . "$HOME/.bashrc";; esac diff --git a/qusal/dotfiles/files/sh/.config/bash/bashrc b/qusal/dotfiles/files/sh/.config/bash/bashrc new file mode 100644 index 0000000..fce396a --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/bash/bashrc @@ -0,0 +1,102 @@ +#!/usr/bin/env bash + +## {{{ Requirements +## If not running interactively, return. +case $- in + *i*) ;; + *) return;; +esac + +## Source default files. +# shellcheck disable=SC1090,SC1091 +source "$HOME/.profile" +# shellcheck disable=SC1090 +source "$ENV" +## }}} +## {{{ Options +HISTCONTROL=ignoredups +shopt -s autocd +shopt -s direxpand +shopt -s cdspell +shopt -s dirspell +shopt -s histappend +shopt -s checkwinsize +shopt -s extglob +shopt -s globstar +## }}} +## {{{ Alias +alias reload="exec bash" +## }}} +## {{{ Prompt +if test -z "${debian_chroot:-}" && test -r /etc/debian_chroot; then + debian_chroot="$(cat /etc/debian_chroot)" +fi + +_reset_line() { + ## Credit: Can't find the source, posted on StackExchange or alike. + ## Does not work well on Bash 5.0 and older. + test "$(echo "${BASH_VERSION%.*}" | tr -d ".")" -lt 51 && return + + local termios cur_y + ## Ask the terminal for any pending (line buffered) input. + termios=$(stty --save) && stty -icanon && stty "$termios" + ## On pending input, assume it's been echoed and we're not in first column. + ## Otherwise ask the terminal for current column and read it from input. + if read -t 0 || { + IFS='[;' read -s -r -d'R' -p$'\033[6n' _ _ cur_y && [[ $cur_y != 1 ]] + } + then + ## Print line ending char with reversed video and end with newline. + printf '%b' "\033[41m\033[0m\033[7m%\033[m\n\r" + fi +} + +_print_ec(){ + test "${_ec_ps1}" = "0" && return + if test "${color_prompt:-}" = "yes"; then + printf %s"(\001\033[31m\002${_ec_ps1}\001\033[0m\002)" + else + printf '%s' "(${_ec_ps1})" + fi +} + +_save_ec() { _ec_ps1=$?; } +PROMPT_COMMAND=(_save_ec) +newline=$'\n' + +if test "${color_prompt:-}" = "yes"; then + # shellcheck disable=SC2154 + PS1="\$(_reset_line)\[\033[35m\][\[${reset_color}\]${debian_chroot:+($debian_chroot)}\[${usercolor}\]\u@\h \[${dircolor}\]\w\[${reset_color}\]\$(_git_prompt_info)\[\033[35m\]]\[${reset_color}\]${newline-}\$(_print_ec)${ps1_symbol} " +else + PS1="\$(_reset_line)[${debian_chroot:+($debian_chroot)}\u@\h:\w\$(_git_prompt_info)]${newline-}\$(_print_ec)${ps1_symbol} " +fi + +## If this is an xterm set the title to user@host:dir +case "$TERM" in + xterm*|rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +esac + +## Reset cursor to steady block after command input and before execution. +# shellcheck disable=SC2034 +PS0="\e[2 q\2" + +if ! shopt -oq posix; then + source_readable /usr/share/bash-completion/bash_completion +fi + +unset newline ps1_symbol +## }}} +## {{{ Plugins +if has zoxide; then + eval "$(zoxide init bash)" +fi + +source_readable /usr/share/doc/fzf/examples/key-bindings.bash +source_readable /usr/share/doc/fzf/examples/completion.bash +## }}} +## {{{ End +## Source local bash configuration. +source_readable "$HOME/.bashrc.local" +## }}} diff --git a/qusal/dotfiles/files/sh/.config/bash/inputrc b/qusal/dotfiles/files/sh/.config/bash/inputrc new file mode 100644 index 0000000..674d9ea --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/bash/inputrc @@ -0,0 +1,131 @@ +# inputrc +$include /etc/inputrc + +## Options +set bell-style none +set show-all-if-ambiguous on +set colored-stats on +set visible-stats on +set mark-symlinked-directories on +set colored-completion-prefix on +set menu-complete-display-prefix on +set skip-completed-text +set editing-mode emacs +set show-mode-in-prompt on + +$if term=linux + set emacs-mode-string "\1\e[?0c\2" + set vi-ins-mode-string "\1\e[?0c\2" + set vi-cmd-mode-string "\1\e[?8c\2" +$else + set emacs-mode-string "\1\e[6 q\2" + set vi-ins-mode-string "\1\e[6 q\2" + set vi-cmd-mode-string "\1\e[2 q\2" +$endif + +## Mode +$if mode=emacs + + set keymap emacs-ctlx + v: vi-editing-mode + Control-v: "\C-xv\e" + Esc: "\C-xv\e" + set keymap emacs + +$else + + set keymap vi-insert + Control-a: beginning-of-line + Control-b: backward-char + Control-d: delete-char + Control-e: end-of-line + Control-f: forward-char + Control-j: accept-line + Control-k: kill-line + Control-l: clear-screen + Control-m: accept-line + Control-n: next-history + Control-p: previous-history + Control-r: reverse-search-history + Control-s: forward-search-history + Control-t: transpose-chars + Control-u: unix-line-discard + Control-v: quoted-insert + Control-w: backward-kill-word + Control-y: yank + Control-[: vi-movement-mode + Control-_: undo + Control-?: backward-delete-char + Space: self-insert + + set keymap vi-command + Control-d: vi-eof-maybe + Control-h: backward-char + Control-j: accept-line + Control-k: kill-line + Control-l: clear-screen + Control-m: accept-line + Control-n: next-history + Control-p: previous-history + Control-q: quoted-insert + Control-r: vi-redo + Control-t: transpose-chars + Control-u: unix-line-discard + Control-v: quoted-insert + Control-w: backward-kill-word + Control-y: yank + Control-u: vi-undo + Control-?: backward-delete-char + Space: forward-char +$endif + +## Application +$if Bash + Control-w: backward-kill-word +$endif + + +## Home +"\e[1~": beginning-of-line +"\e[H": beginning-of-line +"\eOH": beginning-of-line + +## End +"\e[4~": end-of-line +"\e[F": end-of-line +"\eOF": end-of-line + +## Delete +"\e[3~": delete-char +"\e[P": delete-char +"\eOP": delete-char + +## Insert +"\e[2~": quoted-insert +"\e[L": quoted-insert + +## PgUp +"\e[5~": beginning-of-history +"\e[I": beginning-of-history + +## PgDown +"\e[6~": end-of-history +"\e[G": end-of-history + +## Ctrl+RighArrow +"\e[1;5C": forward-word +"\e[5C": forward-word +"\e\e[C": forward-word + +## Ctrl+LeftArrow +"\e[1;5D": backward-word +"\e[5D": backward-word +"\e\e[D": backward-word + +## Terminal +$if term=rxvt + "\e[7~": beginning-of-line + "\e[8~": end-of-line + "\eOc": forward-word + "\eOd": backward-word +$endif diff --git a/qusal/dotfiles/files/sh/.config/dircolors/dircolors b/qusal/dotfiles/files/sh/.config/dircolors/dircolors new file mode 100644 index 0000000..25e5e9e --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/dircolors/dircolors @@ -0,0 +1,168 @@ +# dircolors +# Credits: https://github.com/tpope/dotfiles/blob/master/.dir_colors +# vim: set ft=dircolors + +# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the +# slackware version of dircolors) are recognized but ignored. +# Below are TERM entries, which can be a glob patterns, to match +# against the TERM environment variable to determine if it is colorizable. +TERM Eterm +TERM ansi +TERM *color* +TERM con[0-9]*x[0-9]* +TERM cons25 +TERM console +TERM cygwin +TERM dtterm +TERM gnome +TERM hurd +TERM jfbterm +TERM konsole +TERM kterm +TERM linux +TERM linux-c +TERM mlterm +TERM putty +TERM rxvt* +TERM screen* +TERM st +TERM terminator +TERM tmux* +TERM vt100 +TERM xterm* + +# Below are the color init strings for the basic file types. +# One can use codes for 256 or more colors supported by modern terminals. +# The default color codes use the capabilities of an 8 color terminal +# with some additional attributes as per the following codes: +# Attribute codes: +# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed +# Text color codes: +# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white +# Background color codes: +# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white +#NORMAL 00 # no color code at all +#FILE 00 # regular file: use no color at all +#RESET 0 # reset to "normal" color +DIR 01;34 # directory +LINK 01;36 # symbolic link. (If you set this to 'target' instead of a + # numerical value, the color is as for the file pointed to.) +# MULTIHARDLINK 00 # regular file with more than one link +FIFO 33 # pipe +SOCK 01;35 # socket +# DOOR 01;44 # door +BLK 00;35 # block device driver +CHR 01;33 # character device driver +ORPHAN 00;41 # symlink to nonexistent file +MISSING 00;45 # said nonexistent file + +SETUID 37;41 # file that is setuid (u+s) +SETGID 30;43 # file that is setgid (g+s) +#CAPABILITY 30;41 # file with capability +STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) +OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky +STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable +# This is for files with execute permission: +EXEC 01;32 + +# List any file extensions like '.gz' or '.tar' that you would like ls +# to colorize below. Put the extension, a space, and the color init string. +# (and any comments you want to add after a '#') +# If you use DOS-style suffixes, you may want to uncomment the following: +.cmd 00;32 +.exe 00;32 +.com 00;32 +.btm 00;32 +.bat 00;32 +# Or if you want to colorize scripts even if they do not have the +# executable bit actually set. +#.sh 01;32 +#.csh 01;32 + +# archives or compressed (bright red) +.tar 01;31 +.tgz 01;31 +.arc 01;31 +.arj 01;31 +.taz 01;31 +.lha 01;31 +.lz4 01;31 +.lzh 01;31 +.lzma 01;31 +.tlz 01;31 +.txz 01;31 +.tzo 01;31 +.t7z 01;31 +.zip 01;31 +.ZIP 01;31 +.z 01;31 +.Z 01;31 +.dz 01;31 +.gz 01;31 +.lrz 01;31 +.lz 01;31 +.lzo 01;31 +.xz 01;31 +.zst 01;31 +.tzst 01;31 +.bz2 01;31 +.bz 01;31 +.tbz 01;31 +.tbz2 01;31 +.tz 01;31 +.deb 01;31 +.rpm 01;31 +.jar 01;31 +.war 01;31 +.ear 01;31 +.sar 01;31 +.rar 01;31 +.alz 01;31 +.ace 01;31 +.zoo 01;31 +.cpio 01;31 +.7z 01;31 +.rz 01;31 +.cab 01;31 +.wim 01;31 +.swm 01;31 +.dwm 01;31 +.esd 01;31 + +# backup and temporary files +*~ 01;30 +*- 01;30 +.old 01;30 +.OLD 01;30 +.bak 01;30 +.BAK 01;30 +.back 01;30 +.dpkg-old 01;30 +.swp 01;30 +.swo 01;30 +.aux 01;30 +.bbl 01;30 +.glo 01;30 +.gls 01;30 +.ind 01;30 +.idx 01;30 +.blg 01;30 + +# system libraries, etc. +.so 00;33 +.o 00;33 +.a 00;33 +.dll 00;33 +.rbc 00;33 +.pyc 00;33 +.class 00;33 + +# patches +.diff 00;31 +.patch 00;31 + +# misc. +.dpkg-dist 01;37 +*core 01;37 +.lnk 01;36 +.url 01;36 diff --git a/qusal/dotfiles/files/sh/.config/less/lessfilter b/qusal/dotfiles/files/sh/.config/less/lessfilter new file mode 100755 index 0000000..12465e2 --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/less/lessfilter @@ -0,0 +1,13 @@ +#!/bin/sh +## Credits: https://github.com/tpope/dotfiles/blob/master/.lessfilter +set -eu + +if test -d "$1"; then + exec ls -lF "$1" +else + case $1 in + *.json) has jq && exec jq -C . "$1";; + esac +fi + +exit 1 diff --git a/qusal/dotfiles/files/sh/.config/less/lesskey b/qusal/dotfiles/files/sh/.config/less/lesskey new file mode 100644 index 0000000..6df7e1a --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/less/lesskey @@ -0,0 +1,17 @@ +## Credits: https://github.com/tpope/dotfiles/blob/master/.lesskey +#command +h left-scroll +l right-scroll +i toggle-option i +\b back-screen +^H back-screen +^? back-screen +\\ quit +#line-edit +^A home +^B left +^E end +^F right +^N down +^P up +\ef word-right diff --git a/qusal/dotfiles/files/sh/.config/less/lesskey-old b/qusal/dotfiles/files/sh/.config/less/lesskey-old new file mode 100644 index 0000000000000000000000000000000000000000..5e2a428b56e3c28cb19eb43b1ca45f286105a471 GIT binary patch literal 62 zcmZSZ)pk!7XUJgC%wf>VWLTfcz`?)_MDh&GF$@x^VhoH7oJ/dev/null +fi + +## Source local profile. +# shellcheck disable=SC1090,SC1091 +! test -r "$HOME/.profile.local" || . "$HOME/.profile.local" diff --git a/qusal/dotfiles/files/sh/.config/sh/shrc b/qusal/dotfiles/files/sh/.config/sh/shrc new file mode 100644 index 0000000..1a688d2 --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/sh/shrc @@ -0,0 +1,286 @@ +#!/bin/sh +## Credits: https://github.com/tpope/dotfiles/blob/master/.shrc + +## {{{ Requirements +## If not running interactively, return. +case $- in + *i*) ;; + *) return;; +esac + +## Source profile. +# shellcheck disable=SC1091 +. "$HOME/.profile" +## }}} +## {{{ Options +stty -ixon +set -o noclobber +set -o notify +## Vi-mode does not work on Debian Bullseye with Dash 5.11 (2020). +## Debian Boowkworm has Dash >5.11 (2021) with adds libedit to the shell. +## https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561663 +#set -o vi +#stty quit undef +stty werase undef +## }}} +## {{{ Alias +## Standard commands. +test -n "$VISUAL" && alias vi='$VISUAL' +alias du="du -h" +alias df="df -h" +alias cp="cp -i" +alias mv="mv -i" +alias ls="ls -hF --group-directories-first --color=auto" +if has lsblk; then + _lsblk_options="NAME,FSTYPE,LABEL,SIZE,FSAVAIL,FSUSE%,MOUNTPOINT" + alias lsblk='lsblk -o $_lsblk_options' + alias lsblku='lsblk -o $_lsblk_options,UUID,PARTUUID' +fi +if ! grep --color 2>&1 | grep -q "unrecognized option"; then + alias grep="grep --exclude='.*.swp' --exclude='*~' --color=auto" +fi +alias fgrep="grep -F" +alias egrep="grep -E" +alias diff="diff --color=auto" +has dir && alias dir="dir --color=auto" +has vdir && alias vdir="vdir --color=auto" +alias ip="ip -color=auto" +has highlight && alias highlight="highlight --out-format=ansi" +has pygmentize && alias pygmentize="pygmentize -f terminal" + +## Helpers. +alias reload='. $ENV' r="reload" +alias reload-xprofile='. $XDG_CONFIG_HOME/x11/xprofile' rx="reload-xprofile" +## POSIX cd does not allow '--' and other shells breaks when not using it. +alias -- -="cd -" 2>/dev/null || true +up(){ + ## Credits: https://stackoverflow.com/a/26134858 + case "${1-}" in + [1-9]) cd "$(printf "%0.0s../" $(seq 1 "$1"))" || return;; + "") cd .. || return;; + *) cd "$(pwd | sed -r "s|(.*/$1[^/]*/).*|\1|")" || return + esac +} +test -n "$EDITOR" && alias e='$EDITOR' +test -n "$VISUAL" && alias v='$VISUAL' +alias j="jobs" +alias h="history" +alias l="ls -CF" +alias ll="ls -Fl" +alias la="ls -Fa" +alias lla="ls -Fla" +alias laa='ls -Fd .* 2>/dev/null' +alias llaa='ls -Fdl .* 2>/dev/null' +alias lr='ls -R' +alias lx='ll -BX' +alias lz='ll -rS' +alias lt='ll -rt' +alias lm='la | more' +alias now="date +%a\ %Y-%m-%d\ %T" +alias mkd="mkdir -pv" +mkcd(){ mkd "$1" && cd "$1" || return; } + +## Non-standard programs. +has info && alias info="info --vi-keys" +has htop && alias top="htop" +has yt-dlp && alias yt="yt-dlp --add-metadata -ic" +has fdfind && alias fd="fdfind" +has lynx && alias lynx="lynx -vikeys" +has qubesctl && alias qubesctl="sudo qubesctl --show-output" qctl="qubesctl" +has gpg && alias gpgs="gpg --show-keys" +has gpg2 && alias gpg="gpg2" +if has qubes-gpg-client-wrapper; then + alias qubes-gpg="qubes-gpg-client-wrapper" + alias qgpg="qubes-gpg" +fi +## {{{ Tmux +has tmux && { + alias t="tmux" + alias td="t detach" + alias tls="t list-sessions" tl="tls" + alias tlw="t list-windows" + alias tlp="t list-panes" + alias tcl="clear && t clear-history" # clear buffer cus memory + tcla(){ + ## Clear all the panes of the current session. + for _t_pane in $(tmux list-panes -s -F '#{pane_id}'); do + tmux clear-history -t "$_t_pane" + done + } +} +## }}} +## {{{ Mutt +if has mutt; then + alias m="mutt" + alias mp="mutt -e 'unset signature' -e 'set pgp_autoinline=yes crypt_autosign=yes' -H" +fi +## }}} +## {{{ Git +if has git; then + alias g="git" + alias gcd='cd "$(git rev-parse --show-toplevel)"' + ## Use git aliases with 'g' prefix. + g_alias="$(git config --get-regexp 'alias.*' | sed 's/^alias\.//;s/ .*//')" + for key in $(printf '%s\n' "${g_alias}"); do + # shellcheck disable=SC2139,SC2140 + alias "g$key"="git $key" + done + unset g_alias +fi +## }}} +## }}} +## {{{ Colors +## Colorise "ls" output. +if has dircolors; then + ## Use dircolors if available. + if test -r "$XDG_CONFIG_HOME/dircolors/dircolors"; then + eval "$(dircolors -b "$XDG_CONFIG_HOME/dircolors/dircolors")" + else + eval "$(dircolors -b)" + fi + ## Fix bold on some terminals. + case "$TERM" in + xterm*|screen*) + LS_COLORS="$(echo "$LS_COLORS" | sed -e 's/01;3/00;9/g')" + ;; + esac + export LS_COLORS +else + ## BSD + CLICOLOR=1 CLICOLOR_FORCE=1 LSCOLORS=ExGxFxdxCxfxDxxbadacad ls -hF + export CLICOLOR CLICOLOR_FORCE LSCOLORS +fi + +## Set gcc colors. +GCC_COLORS="error=00;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01" +export GCC_COLORS + +## Colors for programs that uses less such as 'man'. +GROFF_NO_SGR=1 +LESS_TERMCAP_mb="$(tput bold; tput setaf 2)" # begin blink +LESS_TERMCAP_md="$(tput bold; tput setaf 6)" # begin bold +LESS_TERMCAP_me="$(tput sgr0)" # reset bold/blink +LESS_TERMCAP_so="$(tput bold; tput setaf 7; tput setab 4)" # begin reverse video +LESS_TERMCAP_se="$(tput rmso; tput sgr0)" # reset reverse video +LESS_TERMCAP_us="$(tput smul; tput bold; tput setaf 2)" # begin underline +LESS_TERMCAP_ue="$(tput rmul; tput sgr0)" # reset underline +LESS_TERMCAP_mr="$(tput rev)" # revert +LESS_TERMCAP_mh="$(tput dim)" # dimerize +export GROFF_NO_SGR +export LESS_TERMCAP_mb LESS_TERMCAP_md LESS_TERMCAP_me +export LESS_TERMCAP_so LESS_TERMCAP_se LESS_TERMCAP_us +export LESS_TERMCAP_ue LESS_TERMCAP_mr LESS_TERMCAP_mh + +## }}} +## {{{ Prompt +## Set ability to color terminal. +color_prompt="" +# shellcheck disable=2034 +case "$TERM" in + iterm|*-truecolor) + export COLORTERM=truecolor; color_prompt=yes + ;; + *-color|*-256color) + color_prompt=yes + ;; + vte*) ;; +esac + +# shellcheck disable=SC3028 +_get_prompt_time(){ + test -n "${SECONDS:-}" || return + # shellcheck disable=SC2154 + _ptime="$((SECONDS-_saved_prompt_time))" + printf "%02d:%02d:%02d" \ + "$((_ptime/3600))" "$(((_ptime%3600)/60))" "$((_ptime%60))" +} + +_git_prompt_info(){ + has git || return + ref="$(git symbolic-ref HEAD 2>/dev/null | cut -d '/' -f3)" + test "${ref-}" || ref="$(git describe --tags --exact-match HEAD 2>/dev/null)" + test "${ref-}" || ref="$(git rev-parse HEAD 2>/dev/null | head -c 7)" + test "${ref-}" || return + # shellcheck disable=2039,3003 + case "$TERM" in + *-256color|xterm-kitty) branchcolor=$'\e[38;5;31m' ;; + *-88color|rxvt-unicode) branchcolor=$'\e[38;5;22m' ;; + *) branchcolor=$'\e[00;94m' ;; + esac + if test -n "${ZSH_VERSION-}"; then + # shellcheck disable=2016 + print -Pn '(%%{$branchcolor%%}%20>...>$ref%<<%%{\e[00m%%})' + else + printf '%s' "($branchcolor$ref$reset_color)" + fi +} + +# shellcheck disable=SC2034 +usercolor="$(printf '%b' "\e[00;93m")" +dircolor="$(printf '%b' "\e[01;34m")" +# shellcheck disable=SC2034 +## Use echotc Co? Only available by default for zsh, not bash. +case "$TERM" in + *-256color|xterm-kitty) + usercolor="$(printf '%b' "\e[38;5;184m")" + dircolor="$(printf '%b' "\e[38;5;27m")" + ;; + *-88color|rxvt-unicode) + usercolor="$(printf '%b' "\e[38;5;56m")" + dircolor="$(printf '%b' "\e[38;5;23m")" + ;; +esac +# shellcheck disable=SC2034 +test "$(id -u)" -eq 0 && usercolor="$(printf '%b' "\e[00;97m")" +# shellcheck disable=SC2034 +reset_color="$(printf '%b' '\e[00m')" + +case "${ZSH_VERSION-}" in + "") ps1_symbol="$";; + *) ps1_symbol="%%";; +esac +test "$(id -u)" = "0" && ps1_symbol="#" + +## Do not colorize this prompt, Sh fails to count the correct number of +## characters on the prompt leading to problems. +PS1="$(id -un)@$(hostname -s)${ps1_symbol} " +## }}} +## {{{ External Functions + +## Source file if it is readable. +## Usage: source_readable FILE +source_readable(){ + for _file in "$@"; do + # shellcheck disable=SC1090 + ! test -r "${_file}" || . "${_file}" + done +} + +_fzf_comprun() { + _fzf_command="$1" + shift + + case "$_fzf_command" in + cd) if has tree; then + fzf --preview 'tree -C {} | head -200' "$@" + else + fzf "$@" + fi + ;; + export|unset) + fzf --preview "eval 'echo \$'{}" "$@" + ;; + ssh) + fzf --preview 'dig {}' "$@" + ;; + *) + fzf --preview 'test -d {} || cat {}' "$@" + ;; + esac +} + +## }}} +## {{{ End +## Source local shell configuration file. +source_readable "$HOME/.shrc.local" +## }}} diff --git a/qusal/dotfiles/files/sh/.config/user-dirs.dirs b/qusal/dotfiles/files/sh/.config/user-dirs.dirs new file mode 100644 index 0000000..ef51449 --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/user-dirs.dirs @@ -0,0 +1,15 @@ +# This file is written by xdg-user-dirs-update +# If you want to change or add directories, just edit the line you're +# interested in. All local changes will be retained on the next run. +# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped +# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an +# absolute path. No other format is supported. +# +XDG_DESKTOP_DIR="$HOME/" +XDG_DOWNLOAD_DIR="$HOME/" +XDG_TEMPLATES_DIR="$HOME/" +XDG_PUBLICSHARE_DIR="$HOME/" +XDG_DOCUMENTS_DIR="$HOME/" +XDG_MUSIC_DIR="$HOME/" +XDG_PICTURES_DIR="$HOME/" +XDG_VIDEOS_DIR="$HOME/" diff --git a/qusal/dotfiles/files/sh/.config/user-dirs.locale b/qusal/dotfiles/files/sh/.config/user-dirs.locale new file mode 100644 index 0000000..3e0b419 --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/user-dirs.locale @@ -0,0 +1 @@ +en_US \ No newline at end of file diff --git a/qusal/dotfiles/files/sh/.config/zsh/.zlogout b/qusal/dotfiles/files/sh/.config/zsh/.zlogout new file mode 120000 index 0000000..4a52f7a --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/zsh/.zlogout @@ -0,0 +1 @@ +zlogout \ No newline at end of file diff --git a/qusal/dotfiles/files/sh/.config/zsh/.zprofile b/qusal/dotfiles/files/sh/.config/zsh/.zprofile new file mode 120000 index 0000000..018fc86 --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/zsh/.zprofile @@ -0,0 +1 @@ +zprofile \ No newline at end of file diff --git a/qusal/dotfiles/files/sh/.config/zsh/.zshenv b/qusal/dotfiles/files/sh/.config/zsh/.zshenv new file mode 120000 index 0000000..65979f5 --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/zsh/.zshenv @@ -0,0 +1 @@ +zshenv \ No newline at end of file diff --git a/qusal/dotfiles/files/sh/.config/zsh/.zshrc b/qusal/dotfiles/files/sh/.config/zsh/.zshrc new file mode 120000 index 0000000..c8b42f4 --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/zsh/.zshrc @@ -0,0 +1 @@ +zshrc \ No newline at end of file diff --git a/qusal/dotfiles/files/sh/.config/zsh/zlogout b/qusal/dotfiles/files/sh/.config/zsh/zlogout new file mode 100644 index 0000000..6df431a --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/zsh/zlogout @@ -0,0 +1,3 @@ +#!/usr/bin/env zsh +test "0${SHLVL-}" -le 1 && test -z "${SSH_TTY-}" && + test "${TERM-}" = linux && clear diff --git a/qusal/dotfiles/files/sh/.config/zsh/zprofile b/qusal/dotfiles/files/sh/.config/zsh/zprofile new file mode 100644 index 0000000..1c2a27b --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/zsh/zprofile @@ -0,0 +1,7 @@ +#!/usr/bin/env zsh +## Zsh does not source /etc/profile as it is not a Bourne based Shell, but +## some distributions such as Qubes, Whonix, Debian, Gentoo ship files to +## /etc/profile.d. + +emulate sh -c "source /etc/profile" +. "$HOME/.profile" diff --git a/qusal/dotfiles/files/sh/.config/zsh/zshenv b/qusal/dotfiles/files/sh/.config/zsh/zshenv new file mode 100644 index 0000000..58620c6 --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/zsh/zshenv @@ -0,0 +1,8 @@ +#!/usr/bin/env zsh + +if test -z "$ENV" && test -n "$PATH"; then + case $- in + *l*) ;; + *) . "$HOME/.zprofile" >/dev/null ;; + esac +fi diff --git a/qusal/dotfiles/files/sh/.config/zsh/zshrc b/qusal/dotfiles/files/sh/.config/zsh/zshrc new file mode 100644 index 0000000..b013753 --- /dev/null +++ b/qusal/dotfiles/files/sh/.config/zsh/zshrc @@ -0,0 +1,458 @@ +#!/usr/bin/env zsh + +## {{{ Requirements +## If not running interactively, return. +case $- in + *i*) ;; + *) return;; +esac + +## Source default files. +# shellcheck disable=SC1090 +source "$HOME/.zprofile" +source "$ENV" +## }}} +## {{{ Options +## - Quiet +setopt no_beep +## - Words +setopt interactive_comments +## - History +SAVEHIST="$HISTSIZE" +setopt hist_expire_dups_first # purge dups first +setopt hist_ignore_dups # ignore dups in history list +setopt hist_verify # if command has hist expansion, show it before executing +## - Expansion +setopt auto_cd +setopt no_no_match # if a pattern has no matches print an error +setopt numeric_glob_sort # sort file names numerically when relevant +setopt magic_equal_subst # filename expansion for opt=arg +setopt no_equals # don't interpret =string as a command +## - Prompt +setopt prompt_subst +setopt transient_rprompt +setopt print_exit_value + +set zle_bracketed_paste +autoload -Uz bracketed-paste-magic +zle -N bracketed-paste bracketed-paste-magic +autoload -Uz url-quote-magic +zle -N self-insert url-quote-magic + +# https://github.com/zsh-users/zsh-autosuggestions/issues/511#issuecomment-962671126 +pasteinit() { + OLD_SELF_INSERT=${${(s.:.)widgets[self-insert]}[2,3]} + zle -N self-insert url-quote-magic +} +pastefinish() { + zle -N self-insert $OLD_SELF_INSERT +} +zstyle :bracketed-paste-magic paste-init pasteinit +zstyle :bracketed-paste-magic paste-finish pastefinish +## }}} +## {{{ Alias +alias reload="exec zsh" +## }}} +## {{{ Prompt +## https://github.com/zsh-users/zsh/blob/master/Functions/Misc/colors +autoload -U colors && colors +[[ "${COLORTERM-}" == (24bit|truecolor) || "${terminfo[colors]}" -eq '16777216' ]] || zmodload zsh/nearcolor + +newline=$'\n' +if test "$color_prompt" = "yes"; then + PS1="%F{magenta}[%{$usercolor%}%n@%M%F{reset_color%} %{$dircolor%}%50<...<%~%<<%F{reset_color%}\$(_git_prompt_info)%F{magenta}]%F{reset_color}${newline-}${ps1_symbol} " + RPS1="%(?..(%{"$'\e[31m'"%}%?%{$reset_color%}%)%<<)" +else + PS1="[%n@%M %~\$(_git_prompt_info)]${newline}${ps1_symbol} " + RPS1="%(?..(%?%)%<<)" +fi + +## Set window title +## Credits: https://github.com/tpope/dotfiles/blob/master/.zshrc +_set_title() { + case "${1:-}" in + *install*) + hash -r ;; + esac + print -Pn '\e]1;%l@%m${1+*}\a' + print -Pn '\e]2;%n@%m:%~' + if test -n "${1:-}"; then + print -Pnr ' (%24>..>$1%>>)' | tr '\0-\037' '?' + fi + print -Pn " [%l]\a" +} + +case $TERM in + screen*) + precmd() { + _set_title "$@" + if [ "${STY:-}" -o "${TMUX:-}" ]; then + # print -Pn "\e]1;\a\e]1;@%m\a" + print -Pn '\ek@\e\\' + else + print -Pn '\ek@%m\e\\' + fi + } + preexec() { + _set_title "$@" + print -n "\ek" + print -Pnr '%10>..>$1' | tr '\0-\037' '?' + if [ "${STY:-}" -o "${TMUX:-}" ]; then + print -Pn '@\e\\' + else + print -Pn '@%m\e\\' + fi + } + ;; + + xterm*|rxvt*|Eterm*|kterm*|putty*|dtterm*|ansi*|cygwin*) + precmd () { _set_title "$@" } + preexec() { _set_title "$@" } + ;; + + linux*|vt220*) ;; + + *) + PS1="%n@%m:%~%# " + RPS1="%(?..(%?%)%<<)" + ;; +esac + +unset hostcolor hostletter hostcode dircolor usercolor usercode reset_color +unset newline +## }}} +## {{{ Completions + +## Enable completion. +zstyle ':completion:*' use-cache on +zstyle ':completion:*' cache-path $XDG_CACHE_HOME/zsh/zcompcache +zstyle ':completion:*' auto-description 'Specify: %d' +zstyle ':completion:*' completer _expand _complete _ignored _approximate +zstyle ':completion:*' expand prefix suffix +zstyle ':completion:*' file-sort name +zstyle ':completion:*' group-name '' +zstyle ':completion:*' ignore-parents parent pwd .. +zstyle ':completion:*' insert-unambiguous true +zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s +zstyle ':completion:*' list-suffixes true +zstyle ':completion:*' matcher-list '' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'r:|[._-]=** r:|=**' 'l:|=* r:|=*' +zstyle ':completion:*' menu select=1 +zstyle ':completion:*' original true +zstyle ':completion:*' preserve-prefix '//[^/]##/' +zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s +zstyle ':completion:*' special-dirs true +zstyle ':completion:*' squeeze-slashes true +zstyle ':completion:*' use-compctl true +zstyle ':completion:*' verbose true +zstyle ':completion:*:*:-command-:*:*' file-patterns \ + '*(#q-*):executables:Executables *(-/):directories:Directories' +zstyle -e ':completion:*:*:-command-:*:*' tag-order ' + reply=(" + executables:Executables:Executables + builtins:Builtins:Builtins + commands:Commands:Commands + aliases:Aliases:Aliases + functions:Functions:Functions + parameters:Variables:Variables + reserved-words:Keywords:Keywords + directories:Directories + " - + )' + +## Completion per utility. +zstyle ':completion:*:sudo::' environ \ + HOME="/root" \ + PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" +zstyle ':completion:*:doas::' environ \ + HOME="/root" \ + PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + +## Colored completions. +# zstyle ':completion:*' format 'Completing %d' +zstyle ':completion:*:*:*:*:descriptions' format '%B%F{blue}-- %d --%b%f' +zstyle ':completion:*:messages' format ' %B%F{purple} -- %d --%f%b' +zstyle ':completion:*:warnings' format ' %B%F{red}-- no matches found --%f%b' + +zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} +zstyle ':completion:*:*:kill:*' list-colors '=(#b) #([0-9]#)*( *[a-z])*=94=91=93' + +## Load completions. +autoload -Uz compinit +zmodload zsh/complist +mkdir -p $XDG_CACHE_HOME/zsh +compinit -u -d $XDG_CACHE_HOME/zsh/zcompdump +# _comp_options+=(globdots) +if has zoxide; then + eval "$(zoxide init zsh)" +fi +## }}} +## {{{ Plugins +source_readable /usr/share/doc/fzf/examples/key-bindings.zsh +source_readable /usr/share/doc/fzf/examples/completion.zsh + +if test "$color_prompt" = "yes"; then + ## Enable auto-suggestions based on the history + if test -f /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh; then + ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=30 + ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=7,bg=8,underline" + typeset -a ZSH_AUTOSUGGEST_CLEAR_WIDGETS + ZSH_AUTOSUGGEST_CLEAR_WIDGETS+=(bracketed-paste) + source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh + fi + ## Highlight commands as you type + if test -f /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh; then + ## https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters + ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern regexp) + typeset -A ZSH_HIGHLIGHT_STYLES + ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=red' + ZSH_HIGHLIGHT_STYLES[default]='fg=white' + ZSH_HIGHLIGHT_STYLES[alias]='fg=cyan' + ZSH_HIGHLIGHT_STYLES[function]='fg=cyan' + ZSH_HIGHLIGHT_STYLES[builtin]='fg=green' + ZSH_HIGHLIGHT_STYLES[command]='fg=green' + ZSH_HIGHLIGHT_STYLES[precommand]='fg=green' + ZSH_HIGHLIGHT_STYLES[comment]='fg=black,bold' + ZSH_HIGHLIGHT_STYLES[globbing]='fg=cyan' + typeset -A ZSH_HIGHLIGHT_REGEXP + ZSH_HIGHLIGHT_REGEXP+=('^sudo' 'fg=magenta') + ZSH_HIGHLIGHT_REGEXP+=('^doas' 'fg=magenta') + source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh + fi +fi +## }}} +## {{{ Bindkeys + +## Widgets +## +function bindkey-multi () { + ## Usage: bindkey-multi mode Nmode -- bind nbind terminfoname -- widgetname + local i j widget nomap + local -a maps sequences + + test "$1" = "--" && nomap=1 + + while [[ "$1" != "--" ]]; do + maps+=( "$1" ) + shift + done + shift + + while [[ "$1" != "--" ]]; do + sequences+=( "$1" ) + shift + done + shift + + widget="$1" + test -z "$widget" && return 1 + + if test -n "$nomap"; then + for j in "${sequences[@]}"; do + test "$j" || continue + bindkey -- "$j" "$widget" + done + return 0 + fi + + for i in "${maps[@]}"; do + test "$i" || continue + for j in "${sequences[@]}"; do + test "$j" || continue + bindkey -M "$i" -- "$j" "$widget" + done + done + return 0 +} + +function clear-screen-and-scrollback() { + test -n "${TTY-}" || return + echoti civis >"$TTY" + printf '%b' "\e[H\e[2J" >"$TTY" + zle .reset-prompt + zle -R + printf '%b' "\e[3J" >"$TTY" + echoti cnorm >"$TTY" +} +zle -N clear-screen-and-scrollback + +fg-widget() { + if [[ $#BUFFER -eq 0 ]]; then + if jobs %- >/dev/null 2>&1; then + BUFFER='fg %-' + else + BUFFER='fg' + fi + zle accept-line + else + zle push-input + zle clear-screen + fi +} +zle -N fg-widget + +change-first-word(){ + zle beginning-of-line -N + zle kill-word +} +zle -N change-first-word + +new-screen() { + test -z "$STY" || screen < "$TTY" + test -z "$TMUX" || tmux new-window +} +zle -N new-screen + +zle-keymap-select zle-line-init() { + case $KEYMAP in + vicmd) print -n -- "\e[2 q";; + viins|main) print -n -- "\e[5 q";; + esac + + zle reset-prompt + zle -R +} +zle-line-finish() { + print -n -- "\e[2 q" +} +zle -N zle-line-init +zle -N zle-line-finish +zle -N zle-keymap-select + +set-keymap-vi(){ + export KEYTIMEOUT=1 + bindkey -v +} + +set-keymap-emacs(){ + bindkey -e + bindkey -r "^Q" +} + +## Keymap mode +set-keymap-emacs + +autoload -Uz select-word-style +select-word-style bash + +## Viins +bindkey -M viins "^A" beginning-of-line +bindkey -M viins "^B" backward-char +bindkey -M viins "^D" delete-char-or-list +bindkey -M viins "^E" end-of-line +bindkey -M viins "^F" forward-char +bindkey-multi emacs viins vicmd -- "^G" -- which-command +bindkey -M viins "^J" accept-search +bindkey -M viins "^K" kill-line +bindkey -M viins "^L" clear-screen-and-scrollback +bindkey -M viins "^M" accept-line +bindkey -M viins "^N" down-line-or-history +bindkey -M viins "^P" up-line-or-history +bindkey -M viins "^R" history-incremental-search-backward +bindkey -M viins "^S" history-incremental-search-forward +bindkey -M viins "^T" transpose-chars +bindkey-multi emacs viins -- "^W" -- vi-backward-kill-word +bindkey -M viins "^U" backward-kill-line +bindkey -M emacs "^U" backward-kill-line +bindkey -M viins "^Y" yank +bindkey-multi emacs viins vicmd -- "^Z" -- fg-widget +bindkey -M viins "^_" undo +bindkey -M viins "^@" redo +bindkey -M viins " " magic-space +bindkey -M emacs " " magic-space +bindkey -M emacs "^X^[" vi-cmd-mode +## Viins alt +bindkey -M viins "^[u" undo +bindkey -M viins "^[r" redo +bindkey -M viins "^[m" copy-prev-shell-word + +## Misc +bindkey -M isearch "^J" accept-search 2>/dev/null +bindkey -M menuselect "h" vi-backward-char +bindkey -M menuselect "k" vi-up-line-or-history +bindkey -M menuselect "l" vi-forward-char +bindkey -M menuselect "j" vi-down-line-or-history +bindkey -M menuselect "^C" send-break +bindkey -M menuselect "^J" accept-and-infer-next-history # accept-search +bindkey -M menuselect "^M" accept-line + +## Keys for multiple modes and multiple bindings. +## https://invisible-island.net/xterm/xterm-function-keys.html +## +## Shit+Tab +bindkey-multi viins menuselect -- "\E[Z" "${terminfo[kcbt]}" \ + -- reverse-menu-complete +## Backspace +bindkey-multi viins vicmd menuselect -- "^H" "^?" "${terminfo[kbs]}" \ + -- backward-delete-char +## Home +bindkey-multi viins vicmd -- "\E[1~" "\E[7~" "\E[H" "\EOH" \ + "${terminfo[khome]}" \ + -- beginning-of-line +## Insert +bindkey-multi viins vicmd -- "\E[2~" "\E[L" "${terminfo[kich1]}" \ + -- overwrite-mode +## Delete +bindkey-multi viins vicmd -- "\E[3~" "\E[P" "\EOP" "${terminfo[kdch1]}" \ + -- vi-delete-char +## End +bindkey-multi viins vicmd -- "\E[4~" "\E[8~" "\E[F" "\EOF" \ + "${terminfo[kend]}" \ + -- end-of-line +## PgUp +bindkey-multi viins -- "\E[5~" "\E[I" "${terminfo[kpp]}" \ + -- beginning-of-buffer-or-history +## PgDown +bindkey-multi viins -- "\E[6~" "\E[G" "${terminfo[knp]}" \ + -- end-of-buffer-or-history +## Up arrow +bindkey-multi viins vicmd -- "\E[A" "\EOA" "${terminfo[kcuu1]}" \ + -- up-line-or-history +## Down arrow +bindkey-multi viins vicmd -- "\E[B" "\EOB" "${terminfo[kcud1]}" \ + -- down-line-or-history +## Right arrow +bindkey-multi viins vicmd -- "\E[C" "\EOC" "${terminfo[kcuf1]}" \ + -- forward-char +## Left arrow +bindkey-multi viins vicmd -- "\E[D" "\EOD" "${terminfo[kcub1]}" \ + -- backward-char +## Ctrl-Delete +bindkey-multi viins vicmd -- "\E[3;5~" "\E[3\^" "${terminfo[kDC5]}" \ + -- kill-word +## Ctrl-RightArrow +bindkey-multi viins vicmd -- "\E[1;5C" "\E0c" "${terminfo[kRIT5]}" \ + -- forward-word +## Ctrl-LeftArrow +bindkey-multi viins vicmd -- "\E[1;5D" "\E0d" "${terminfo[kLFT5]}" \ + -- backward-word +## F11 +bindkey-multi viins -- "\E[23~" "${terminfo[kf11]}" -- new-screen + +autoload -Uz edit-command-line +zle -N edit-command-line +bindkey -M emacs "^[e" edit-command-line +bindkey -M emacs "^X^E" edit-command-line +bindkey -M vicmd "^E" edit-command-line + +bindkey -M emacs "\ea" change-first-word +bindkey -M emacs "^XD" describe-key-briefly + +for binding in ${(f)$(bindkey -M emacs|grep '^"\^X')}; do + bindkey -M viins "${(@Qz)binding}" +done +unset binding + +## Make sure the terminal is in application mode, when zle is active. +## Only then are the values from $terminfo valid. +if (( ${+terminfo[smkx]} && ${+terminfo[rmkx]} )); then + autoload -Uz add-zle-hook-widget + function zle_application_mode_start { echoti smkx } + function zle_application_mode_stop { echoti rmkx } + add-zle-hook-widget -Uz zle-line-init zle_application_mode_start + add-zle-hook-widget -Uz zle-line-finish zle_application_mode_stop +fi +## }}} +## {{{ End +## Source local zsh configuration. +source_readable "$HOME/.zshrc.local" +## }}} diff --git a/qusal/dotfiles/files/sh/.profile b/qusal/dotfiles/files/sh/.profile new file mode 120000 index 0000000..c8f95a8 --- /dev/null +++ b/qusal/dotfiles/files/sh/.profile @@ -0,0 +1 @@ +.config/sh/profile \ No newline at end of file diff --git a/qusal/dotfiles/files/sh/.zprofile b/qusal/dotfiles/files/sh/.zprofile new file mode 120000 index 0000000..9975264 --- /dev/null +++ b/qusal/dotfiles/files/sh/.zprofile @@ -0,0 +1 @@ +.config/zsh/zprofile \ No newline at end of file diff --git a/qusal/dotfiles/files/ssh/.ssh/config b/qusal/dotfiles/files/ssh/.ssh/config new file mode 100644 index 0000000..3e8276b --- /dev/null +++ b/qusal/dotfiles/files/ssh/.ssh/config @@ -0,0 +1,20 @@ +Host * + ## Distrust the remote + ForwardX11 no + ForwardX11Trusted no + ForwardAgent no + ## Authentication + UpdateHostKeys ask + PreferredAuthentications publickey,keyboard-interactive,password + HostbasedAuthentication no + StrictHostKeyChecking yes + ## Encryption + HostKeyAlgorithms ssh-ed25519,sk-ssh-ed25519@openssh.com + PubkeyAcceptedAlgorithms ssh-ed25519,sk-ssh-ed25519@openssh.com + KexAlgorithms sntrup761x25519-sha512@openssh.com,curve25519-sha256,curve25519-sha256@libssh.org + Ciphers aes256-gcm@openssh.com + MACs hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com + +UserKnownHostsFile ~/.ssh/known_hosts.d/%k.host ~/.ssh/known_hosts.d/%h.host +Include ~/.ssh/config.d/*.conf +# vim: ft=sshconfig diff --git a/qusal/dotfiles/files/tmux/.config/tmux/tmux.conf b/qusal/dotfiles/files/tmux/.config/tmux/tmux.conf new file mode 100644 index 0000000..a85bc19 --- /dev/null +++ b/qusal/dotfiles/files/tmux/.config/tmux/tmux.conf @@ -0,0 +1,137 @@ +## tmux.conf +## vim:set foldmethod=expr foldexpr=getline(v\:lnum)=~'^#!'?'>1'\:'=': + +#! {{{ Options +## Usage +set-window-option -g wrap-search off +set-window-option -g aggressive-resize on +set-window-option -g pane-base-index 1 +set-option -g base-index 1 +set-option -g status-keys emacs +set-option -g mode-keys vi +set-option -g mouse on +set-option -g history-limit 10000 +set-option -g repeat-time 2000 +set-option -g escape-time 50 +set-option -g status-position top +set-option -g default-terminal screen-256color +# set-option -g default-terminal tmux-256color # on newer ncurses +set-option -g display-panes-time 2000 +set-option -g display-time 2000 +set-option -g focus-events on +set-option -g status-interval 5 +set-option -g set-titles on + +## Visual +set-option -g display-panes-active-colour 'red' +set-option -g display-panes-colour 'white' +set-option -g message-command-style 'default' +set-option -g message-style 'default' +set-option -g clock-mode-colour 'red' +set-option -g clock-mode-style '24' +set-option -g mode-style 'bg=brightred' +set-option -g pane-active-border-style 'fg=brightcyan' +set-option -g pane-border-style 'default' +set-option -g window-status-activity-style 'fg=brightyellow,bg=black' +set-option -g window-status-current-format ' #I:#W#F ' +set-option -g window-status-current-style 'fg=black,bg=brightred' +set-option -g window-status-format ' #I:#W#F ' +set-option -g window-status-separator '' + +## Status +set-option -g status-interval '1' +set-option -g status-justify 'centre' +set-option -g status-style 'fg=brightcyan,bg=black' +set-option -g status-left '#{?client_prefix,#[bg=brightred]#[fg=black]+#[bg=black] , }#[bg=black]#[fg=brightgreen]#S #[fg=brightyellow]#I #[fg=brightcyan]#P' +set-option -g status-left-length '40' +set-option -g status-left-style 'fg=green,bg=black' +set-option -g status-right '#{tmux_mode_indicator} #[fg=brightcyan]#H #[fg=brightyellow]%H:%M:%S' +set-option -g status-right-length '40' +set-option -g status-right-style 'fg=brightcyan,bg=black' + +## Terminal capabilities and update environment +set-option -g terminal-overrides '*256color:Tc,xterm*:XT:Cc=\E]12;%p1%s\007:Cr=\E]112\007:Cs=\E[%p1%d q,rxvt-unicode*:XT:sitm@:ritm@' +set-option -g update-environment "DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PI +D SSH_CONNECTION WINDOWID XAUTHORITY XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP" +set-environment -gu DBUS_SESSION_BUS_ADDRESS + +## }}} +#! {{{ Bindings +## Prefix +set-option -g prefix C-s +unbind-key C-b +bind-key C-s send-prefix +bind-key C-s last-window +## Prompt +unbind-key \; +bind-key \; command-prompt +## Window +bind-key | split-window -h +bind-key - split-window -v +unbind-key '"' +unbind-key % +bind-key C-c new-window +bind-key ` select-window -t 0 +bind-key -r C-p select-window -t :- # equiv: previous-window +bind-key -r C-n select-window -t :+ # equiv: next-window +## Pane +bind-key h select-pane -L +bind-key j select-pane -D +bind-key k select-pane -U +bind-key l select-pane -R +bind-key -r C-h resize-pane -L 5 +bind-key -r C-j resize-pane -D 5 +bind-key -r C-k resize-pane -U 5 +bind-key -r C-l resize-pane -R 5 +bind-key _ resize-pane -Z +bind-key H join-pane -b -h -t ! +bind-key J join-pane -t ! +bind-key @ join-pane -t ! +bind-key K kill-pane +bind-key -r "<" swap-window -d -t -1 +bind-key -r ">" swap-window -d -t +1 +## Copy mode +bind-key Escape copy-mode +unbind-key p +bind-key p paste-buffer +bind-key -T copy-mode-vi 'v' send -X begin-selection +bind-key -T copy-mode-vi 'y' send -X copy-selection +bind-key -T copy-mode-vi 'Space' send -X halfpage-down +bind-key -T copy-mode-vi 'Bspace' send -X halfpage-up +# bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xsel -i -p && xsel -o -p | xsel -i -b" +# bind p run "xsel -o | tmux load-buffer - ; tmux paste-buffer" +bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip -i -sel clip > /dev/null" +bind-key p run "xclip -o -sel clip | tmux load-buffer - ; tmux paste-buffer" +## Miscellaneous +bind-key C attach-session -t . -c '#{pane_current_path}' \; display-message "Session directory set to #{pane_current_path}" +bind-key E set-option mouse \; display-message "Mouse #{?mouse,on,off}" +bind-key X set-window-option synchronize-panes\; display-message "synchronize-panes is now #{?pane_synchronized,on,off}" +bind-key u capture-pane \; save-buffer /tmp/tmux-buffer \; new-window -n "urlview" '$SHELL -c "urlview < /tmp/tmux-buffer"' +bind-key R run-shell '\ +: "${XDG_CONFIG_HOME:=$HOME/.config}"; \ +if test -f "$XDG_CONFIG_HOME/tmux/tmux.conf"; then \ + tmux source "$XDG_CONFIG_HOME/tmux/tmux.conf"; \ + tmux display-message "Reloaded configuration: $XDG_CONFIG_HOME/tmux/tmux.conf"; \ +elif test -f "$HOME/.tmux/tmux.conf"; then \ + tmux source "$HOME/.tmux/tmux.conf"; \ + tmux display-message "Reloaded configuration: $HOME/.tmux/tmux.conf"; \ +elif test -f "$HOME/.tmux.conf"; then \ + tmux source "$HOME/.tmux.conf"; \ + tmux display-message "Reloaded configuration: $HOME/.tmux.conf"; \ +fi' +## }}} + +#! {{{ Plugins +## 'tmux-plugins/tmux-resurrect' +set -g @resurrect-capture-pane-contents 'on' +set -g @resurrect-save 'M-S' +set -g @resurrect-restore 'M-R' +## 'tmux-plugins/tmux-continuum', dep tmux-resurrect +set -g @continuum-restore 'on' +## 'MunifTanjim/tmux-suspend' +set -g @suspend_key 'F12' +## }}} + +#! {{{ End +if-shell 'test -f "$HOME/.tmux.conf.local"' 'tmux source "$HOME/.tmux.conf.local"' +run-shell 'command -v tmux-sorcerer >/dev/null && tmux-sorcerer ~/.config/tmux/plugins ~/src/tmux/plugins' +## }}} diff --git a/qusal/dotfiles/files/vim/.config/vim/after/autoload/pathogen.vim b/qusal/dotfiles/files/vim/.config/vim/after/autoload/pathogen.vim new file mode 100644 index 0000000..59a75c1 --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/after/autoload/pathogen.vim @@ -0,0 +1,353 @@ +" pathogen.vim - path option manipulation +" Maintainer: Tim Pope +" Version: 2.4 + +" Install in ~/.vim/autoload (or ~\vimfiles\autoload). +" +" For management of individually installed plugins in ~/.vim/bundle (or +" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your +" .vimrc is the only other setup necessary. +" +" The API is documented inline below. + +if exists("g:loaded_pathogen") || &cp + finish +endif +let g:loaded_pathogen = 1 + +" Point of entry for basic default usage. Give a relative path to invoke +" pathogen#interpose() (defaults to "bundle/{}"), or an absolute path to invoke +" pathogen#surround(). Curly braces are expanded with pathogen#expand(): +" "bundle/{}" finds all subdirectories inside "bundle" inside all directories +" in the runtime path. +function! pathogen#infect(...) abort + for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}'] + if path =~# '^\%({\=[$~\\/]\|{\=\w:[\\/]\).*[{}*]' + call pathogen#surround(path) + elseif path =~# '^\%([$~\\/]\|\w:[\\/]\)' + call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') + call pathogen#surround(path . '/{}') + elseif path =~# '[{}*]' + call pathogen#interpose(path) + else + call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') + call pathogen#interpose(path . '/{}') + endif + endfor + call pathogen#cycle_filetype() + if pathogen#is_disabled($MYVIMRC) + return 'finish' + endif + return '' +endfunction + +" Split a path into a list. +function! pathogen#split(path) abort + if type(a:path) == type([]) | return a:path | endif + if empty(a:path) | return [] | endif + let split = split(a:path,'\\\@]','\\&','') + endif +endfunction + +" Like findfile(), but hardcoded to use the runtimepath. +function! pathogen#runtime_findfile(file,count) abort + let rtp = pathogen#join(1,pathogen#split(&rtp)) + let file = findfile(a:file,rtp,a:count) + if file ==# '' + return '' + else + return fnamemodify(file,':p') + endif +endfunction + +" Section: Deprecated + +function! s:warn(msg) abort + echohl WarningMsg + echomsg a:msg + echohl NONE +endfunction + +" Prepend all subdirectories of path to the rtp, and append all 'after' +" directories in those subdirectories. Deprecated. +function! pathogen#runtime_prepend_subdirectories(path) abort + call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')') + return pathogen#surround(a:path . pathogen#slash() . '{}') +endfunction + +function! pathogen#incubate(...) abort + let name = a:0 ? a:1 : 'bundle/{}' + call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')') + return pathogen#interpose(name) +endfunction + +" Deprecated alias for pathogen#interpose(). +function! pathogen#runtime_append_all_bundles(...) abort + if a:0 + call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')') + else + call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()') + endif + return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}') +endfunction + +if exists(':Vedit') + finish +endif + +let s:vopen_warning = 0 + +function! s:find(count,cmd,file,lcd) + let rtp = pathogen#join(1,pathogen#split(&runtimepath)) + let file = pathogen#runtime_findfile(a:file,a:count) + if file ==# '' + return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'" + endif + if !s:vopen_warning + let s:vopen_warning = 1 + let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE' + else + let warning = '' + endif + if a:lcd + let path = file[0:-strlen(a:file)-2] + execute 'lcd `=path`' + return a:cmd.' '.pathogen#fnameescape(a:file) . warning + else + return a:cmd.' '.pathogen#fnameescape(file) . warning + endif +endfunction + +function! s:Findcomplete(A,L,P) + let sep = pathogen#slash() + let cheats = { + \'a': 'autoload', + \'d': 'doc', + \'f': 'ftplugin', + \'i': 'indent', + \'p': 'plugin', + \'s': 'syntax'} + if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0]) + let request = cheats[a:A[0]].a:A[1:-1] + else + let request = a:A + endif + let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*' + let found = {} + for path in pathogen#split(&runtimepath) + let path = expand(path, ':p') + let matches = split(glob(path.sep.pattern),"\n") + call map(matches,'isdirectory(v:val) ? v:val.sep : v:val') + call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]') + for match in matches + let found[match] = 1 + endfor + endfor + return sort(keys(found)) +endfunction + +command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(,'edit',,0) +command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(,'edit',,0) +command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(,'edit',,1) +command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(,'split',,1) +command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(,'vsplit',,1) +command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(,'tabedit',,1) +command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(,'pedit',,1) +command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(,'read',,1) + +" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=': diff --git a/qusal/dotfiles/files/vim/.config/vim/after/colors/tango2.vim b/qusal/dotfiles/files/vim/.config/vim/after/colors/tango2.vim new file mode 100644 index 0000000..330fe89 --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/after/colors/tango2.vim @@ -0,0 +1,62 @@ +" ============================================================================= +" Name: Tango2 +" Purpose: Another colour scheme using the Tango colour palette +" Maintainer: Pranesh Srinivasan +" Last Modified: Saturday 04 October 2008 02:06:26 AM IST +" ============================================================================= + +" Inspired from some Gnome renditions of the Tango colour scheme. + +" ============================================================================= +" Preamble +" ============================================================================= + +set background=dark + +hi clear + +if exists("syntax-on") +syntax reset +endif + +let colors_name = "tango2" + +" ============================================================================= +" Vim >= 7.0 specific colours +" ============================================================================= + +if version >= 700 +" No support for cursor line yet +" hi CursorLine term=underline cterm=underline guibg=#111133 +" hi CursorColoumn +" hi MatchParen +" hi Pmenu +" hi PmenuSel +endif + +" ============================================================================= +" General colours +" ============================================================================= + +hi Normal guibg=#2E3436 guifg=#eeeeec +hi Cursor gui=none guibg=White guifg=Black + +hi Folded guibg=#4D585B guibg=#d2d2d2 +" No fold column support yet +" hi FoldColumn guifg=Orange guibg=DarkBlue +" ============================================================================= +" Syntax highlighting +" ============================================================================= + +hi Comment gui=italic guifg=#6d7e8a ctermfg=Grey +hi Todo term=bold guifg=#EBC450 +hi Constant guifg=#8ae234 +hi Type guifg=#8AE234 +hi Function gui=bold guifg=#9BCF8D +hi Statement guifg=#729FCF +hi Identifier guifg=#AD7FA8 +hi PreProc guifg=#e9ba6e +hi Special term=underline guifg=#5EAFE5 + +hi Search guibg=#81ABBD +" hi QtClass guifg=Orange ctermfg=LightBlue diff --git a/qusal/dotfiles/files/vim/.config/vim/after/colors/torte.vim b/qusal/dotfiles/files/vim/.config/vim/after/colors/torte.vim new file mode 100644 index 0000000..f28ed60 --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/after/colors/torte.vim @@ -0,0 +1,51 @@ +" Vim color file +" Maintainer: Thorsten Maerz +" Last Change: 2001 Jul 23 +" grey on black +" optimized for TFT panels +" $Revision: 1.1 $ + +set background=dark +hi clear +if exists("syntax_on") + syntax reset +endif +"colorscheme default +let g:colors_name = "torte" + +" hardcoded colors : +" GUI Comment : #80a0ff = Light blue + +" GUI +highlight Normal guifg=Grey80 guibg=Black +highlight Search guifg=Black guibg=Red gui=bold +highlight Visual guifg=Grey25 gui=bold +highlight Cursor guifg=Black guibg=Green gui=bold +highlight Special guifg=Orange +highlight Comment guifg=#80a0ff +highlight StatusLine guifg=blue guibg=white +highlight Statement guifg=Yellow gui=NONE +highlight Type gui=NONE + +" Console +highlight Normal ctermfg=LightGrey ctermbg=Black +highlight Search ctermfg=Black ctermbg=Red cterm=NONE +highlight Visual cterm=reverse +highlight Cursor ctermfg=Black ctermbg=Green cterm=bold +highlight Special ctermfg=Brown +highlight Comment ctermfg=Blue +highlight StatusLine ctermfg=blue ctermbg=white +highlight Statement ctermfg=Yellow cterm=NONE +highlight Type cterm=NONE + +" only for vim 5 +if has("unix") + if v:version<600 + highlight Normal ctermfg=Grey ctermbg=Black cterm=NONE guifg=Grey80 guibg=Black gui=NONE + highlight Search ctermfg=Black ctermbg=Red cterm=bold guifg=Black guibg=Red gui=bold + highlight Visual ctermfg=Black ctermbg=yellow cterm=bold guifg=Grey25 gui=bold + highlight Special ctermfg=LightBlue cterm=NONE guifg=LightBlue gui=NONE + highlight Comment ctermfg=Cyan cterm=NONE guifg=LightBlue gui=NONE + endif +endif + diff --git a/qusal/dotfiles/files/vim/.config/vim/after/colors/vividchalk.vim b/qusal/dotfiles/files/vim/.config/vim/after/colors/vividchalk.vim new file mode 100644 index 0000000..72ea0ed --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/after/colors/vividchalk.vim @@ -0,0 +1,191 @@ +" Vim color scheme +" Name: vividchalk.vim +" Author: Tim Pope +" Version: 2.0 +" GetLatestVimScripts: 1891 1 :AutoInstall: vividchalk.vim + +" Based on the Vibrank Ink theme for TextMate +" Distributable under the same terms as Vim itself (see :help license) + +if has("gui_running") + set background=dark +endif +hi clear +if exists("syntax_on") + syntax reset +endif + +let colors_name = "vividchalk" + +" First two functions adapted from inkpot.vim + +" map a urxvt cube number to an xterm-256 cube number +fun! s:M(a) + return strpart("0245", a:a, 1) + 0 +endfun + +" map a urxvt colour to an xterm-256 colour +fun! s:X(a) + if &t_Co == 88 + return a:a + else + if a:a == 8 + return 237 + elseif a:a < 16 + return a:a + elseif a:a > 79 + return 232 + (3 * (a:a - 80)) + else + let l:b = a:a - 16 + let l:x = l:b % 4 + let l:y = (l:b / 4) % 4 + let l:z = (l:b / 16) + return 16 + s:M(l:x) + (6 * s:M(l:y)) + (36 * s:M(l:z)) + endif + endif +endfun + +function! E2T(a) + return s:X(a:a) +endfunction + +function! s:choose(mediocre,good) + if &t_Co != 88 && &t_Co != 256 + return a:mediocre + else + return s:X(a:good) + endif +endfunction + +function! s:hifg(group,guifg,first,second,...) + if a:0 && &t_Co == 256 + let ctermfg = a:1 + else + let ctermfg = s:choose(a:first,a:second) + endif + exe "highlight ".a:group." guifg=".a:guifg." ctermfg=".ctermfg +endfunction + +function! s:hibg(group,guibg,first,second) + let ctermbg = s:choose(a:first,a:second) + exe "highlight ".a:group." guibg=".a:guibg." ctermbg=".ctermbg +endfunction + +hi link railsMethod PreProc +hi link rubyDefine Keyword +hi link rubySymbol Constant +hi link rubyAccess rubyMethod +hi link rubyAttribute rubyMethod +hi link rubyEval rubyMethod +hi link rubyException rubyMethod +hi link rubyInclude rubyMethod +hi link rubyStringDelimiter rubyString +hi link rubyRegexp Regexp +hi link rubyRegexpDelimiter rubyRegexp +"hi link rubyConstant Variable +"hi link rubyGlobalVariable Variable +"hi link rubyClassVariable Variable +"hi link rubyInstanceVariable Variable +hi link javascriptRegexpString Regexp +hi link javascriptNumber Number +hi link javascriptNull Constant +highlight link diffAdded String +highlight link diffRemoved Statement +highlight link diffLine PreProc +highlight link diffSubname Comment + +call s:hifg("Normal","#EEEEEE","White",87) +if &background == "light" || has("gui_running") + hi Normal guibg=Black ctermbg=Black +else + hi Normal guibg=Black ctermbg=NONE +endif +highlight StatusLine guifg=Black guibg=#aabbee gui=bold ctermfg=232 ctermbg=15 cterm=bold +highlight StatusLineNC guifg=#444444 guibg=#aaaaaa gui=none ctermfg=Black ctermbg=Grey cterm=none +"if &t_Co == 256 + "highlight StatusLine ctermbg=117 +"else + "highlight StatusLine ctermbg=43 +"endif + +highlight Ignore ctermfg=Black +highlight WildMenu guifg=Black guibg=#ffff00 gui=bold ctermfg=Black ctermbg=Yellow cterm=bold +highlight Cursor guifg=Black guibg=White ctermfg=Black ctermbg=White +highlight CursorLine guibg=#333333 guifg=NONE +highlight CursorColumn guibg=#333333 guifg=NONE +highlight NonText guifg=#404040 ctermfg=8 +highlight SpecialKey guifg=#404040 ctermfg=8 +highlight Directory none +high link Directory Identifier +highlight ErrorMsg guibg=Red ctermbg=DarkRed guifg=NONE ctermfg=NONE +highlight Search guifg=NONE ctermfg=NONE gui=none cterm=none +call s:hibg("Search" ,"#555555","DarkBlue",81) +highlight IncSearch guifg=White guibg=Black ctermfg=White ctermbg=Black +highlight MoreMsg guifg=#00AA00 ctermfg=Green +highlight LineNr guifg=#DDEEFF ctermfg=White +call s:hibg("LineNr" ,"#222222","DarkBlue",80) +highlight Question none +high link Question MoreMsg +highlight Title guifg=Magenta ctermfg=Magenta +highlight VisualNOS gui=none cterm=none +call s:hibg("Visual" ,"#555577","LightBlue",83) +call s:hibg("VisualNOS" ,"#444444","DarkBlue",81) +call s:hibg("MatchParen","#1100AA","DarkBlue",18) +highlight WarningMsg guifg=Red ctermfg=Red +highlight Error ctermbg=DarkRed +highlight SpellBad ctermbg=DarkRed +" FIXME: Comments +highlight SpellRare ctermbg=DarkMagenta +highlight SpellCap ctermbg=DarkBlue +highlight SpellLocal ctermbg=DarkCyan + +call s:hibg("Folded" ,"#110077","DarkBlue",17) +call s:hifg("Folded" ,"#aaddee","LightCyan",63) +highlight FoldColumn none +high link FoldColumn Folded +highlight DiffAdd ctermbg=4 guibg=DarkBlue +highlight DiffChange ctermbg=5 guibg=DarkMagenta +highlight DiffDelete ctermfg=12 ctermbg=6 gui=bold guifg=Blue guibg=DarkCyan +highlight DiffText ctermbg=DarkRed +highlight DiffText cterm=bold ctermbg=9 gui=bold guibg=Red + +highlight Pmenu guifg=White ctermfg=White gui=bold cterm=bold +highlight PmenuSel guifg=White ctermfg=White gui=bold cterm=bold +call s:hibg("Pmenu" ,"#000099","Blue",18) +call s:hibg("PmenuSel" ,"#5555ff","DarkCyan",39) +highlight PmenuSbar guibg=Grey ctermbg=Grey +highlight PmenuThumb guibg=White ctermbg=White +highlight TabLine gui=underline cterm=underline +call s:hifg("TabLine" ,"#bbbbbb","LightGrey",85) +call s:hibg("TabLine" ,"#333333","DarkGrey",80) +highlight TabLineSel guifg=White guibg=Black ctermfg=White ctermbg=Black +highlight TabLineFill gui=underline cterm=underline +call s:hifg("TabLineFill","#bbbbbb","LightGrey",85) +call s:hibg("TabLineFill","#808080","Grey",83) + +hi Type gui=none +hi Statement gui=none +if !has("gui_mac") + " Mac GUI degrades italics to ugly underlining. + hi Comment gui=italic + hi railsUserClass gui=italic + hi railsUserMethod gui=italic +endif +hi Identifier cterm=none +" Commented numbers at the end are *old* 256 color values +"highlight PreProc guifg=#EDF8F9 +call s:hifg("Comment" ,"#9933CC","DarkMagenta",34) " 92 +" 26 instead? +call s:hifg("Constant" ,"#339999","DarkCyan",21) " 30 +call s:hifg("rubyNumber" ,"#CCFF33","Yellow",60) " 190 +call s:hifg("String" ,"#66FF00","LightGreen",44,82) " 82 +call s:hifg("Identifier" ,"#FFCC00","Yellow",72) " 220 +call s:hifg("Statement" ,"#FF6600","Brown",68) " 202 +call s:hifg("PreProc" ,"#AAFFFF","LightCyan",47) " 213 +call s:hifg("railsUserMethod","#AACCFF","LightCyan",27) +call s:hifg("Type" ,"#AAAA77","Grey",57) " 101 +call s:hifg("railsUserClass" ,"#AAAAAA","Grey",7) " 101 +call s:hifg("Special" ,"#33AA00","DarkGreen",24) " 7 +call s:hifg("Regexp" ,"#44B4CC","DarkCyan",21) " 74 +call s:hifg("rubyMethod" ,"#DDE93D","Yellow",77) " 191 +"highlight railsMethod guifg=#EE1122 ctermfg=1 diff --git a/qusal/dotfiles/files/vim/.config/vim/after/ftplugin/markdown.vim b/qusal/dotfiles/files/vim/.config/vim/after/ftplugin/markdown.vim new file mode 100644 index 0000000..45dffbc --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/after/ftplugin/markdown.vim @@ -0,0 +1,33 @@ +" Author: Maxim Kim +" Source: https://vi.stackexchange.com/a/21689 +function! MarkdownFold() + let line = getline(v:lnum) + + " Regular headers + let depth = match(line, '\(^#\+\)\@<=\( .*$\)\@=') + if depth > 0 + " check syntax, it should be markdownH1-6 + let syncode = synstack(v:lnum, 1) + if len(syncode) > 0 && synIDattr(syncode[0], 'name') =~ 'markdownH[1-6]' + return ">" . depth + endif + endif + + " Setext style headings + let prevline = getline(v:lnum - 1) + let nextline = getline(v:lnum + 1) + if (line =~ '^.\+$') && (nextline =~ '^=\+$') && (prevline =~ '^\s*$') + return ">1" + endif + + if (line =~ '^.\+$') && (nextline =~ '^-\+$') && (prevline =~ '^\s*$') + return ">2" + endif + + " frontmatter + if (v:lnum == 1) && (line =~ '^----*$') + return ">1" + endif + + return "=" +endfunction diff --git a/qusal/dotfiles/files/vim/.config/vim/after/macros/less.vim b/qusal/dotfiles/files/vim/.config/vim/after/macros/less.vim new file mode 100644 index 0000000..2dd572d --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/after/macros/less.vim @@ -0,0 +1,2 @@ +set cmdheight=1 +set laststatus=0 diff --git a/qusal/dotfiles/files/vim/.config/vim/after/plugin/cool.vim b/qusal/dotfiles/files/vim/.config/vim/after/plugin/cool.vim new file mode 100644 index 0000000..6c78120 --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/after/plugin/cool.vim @@ -0,0 +1,128 @@ +" vim-cool - Disable hlsearch when you are done searching. +" Maintainer: romainl +" Version: 0.0.2 +" License: MIT License +" Location: plugin/cool.vim +" Website: https://github.com/romainl/vim-cool + +if exists("g:loaded_cool") || v:version < 704 || &compatible + finish +endif +let g:loaded_cool = 1 + +let s:save_cpo = &cpo +set cpo&vim + +augroup Cool + autocmd! +augroup END + +if exists('##OptionSet') + if !exists('*execute') + autocmd Cool OptionSet highlight let saveh = &highlight + endif + " toggle coolness when hlsearch is toggled + autocmd Cool OptionSet hlsearch call PlayItCool(v:option_old, v:option_new) +endif + +function! s:StartHL() + if !v:hlsearch || mode() isnot 'n' + return + endif + let g:cool_is_searching = 1 + let [pos, rpos] = [winsaveview(), getpos('.')] + silent! exe "keepjumps go".(line2byte('.')+col('.')-(v:searchforward ? 2 : 0)) + try + silent keepjumps norm! n + if getpos('.') != rpos + throw 0 + endif + catch /^\%(0$\|Vim\%(\w\|:Interrupt$\)\@!\)/ + call StopHL() + return + finally + call winrestview(pos) + endtry + if !get(g:,'cool_total_matches') || !exists('*reltimestr') + return + endif + exe "silent! norm! :let g:cool_char=nr2char(screenchar(screenrow(),1))\" + let cool_char = remove(g:,'cool_char') + if cool_char !~ '[/?]' + return + endif + let [f, ws, now, noOf] = [0, &wrapscan, reltime(), [0,0]] + set nowrapscan + try + while f < 2 + if reltimestr(reltime(now))[:-6] =~ '[1-9]' + " time >= 100ms + return + endif + let noOf[v:searchforward ? f : !f] += 1 + try + silent exe "keepjumps norm! ".(f ? 'n' : 'N') + catch /^Vim[^)]\+):E38[45]\D/ + call setpos('.',rpos) + let f += 1 + endtry + endwhile + finally + call winrestview(pos) + let &wrapscan = ws + endtry + redraw|echo cool_char.@/ 'match' noOf[0] 'of' noOf[0] + noOf[1] - 1 +endfunction + +function! s:StopHL() + if !v:hlsearch || mode() isnot 'n' || &buftype == 'terminal' + return + else + let g:cool_is_searching = 0 + silent call feedkeys("\(StopHL)", 'm') + endif +endfunction + +if !exists('*execute') + let s:saveh = &highlight + " toggle highlighting, a workaround for :nohlsearch in autocmds + function! s:AuNohlsearch() + noautocmd set highlight+=l:- + autocmd Cool Insertleave * + \ noautocmd let &highlight = s:saveh | autocmd! Cool InsertLeave * + return '' + endfunction +endif + +function! s:PlayItCool(old, new) + if a:old == 0 && a:new == 1 + " nohls --> hls + " set up coolness + noremap (StopHL) :nohlsearch + if !exists('*execute') + noremap! (StopHL) AuNohlsearch() + else + noremap! (StopHL) execute('nohlsearch')[-1] + endif + + autocmd Cool CursorMoved * call StartHL() + autocmd Cool InsertEnter * call StopHL() + elseif a:old == 1 && a:new == 0 + " hls --> nohls + " tear down coolness + nunmap (StopHL) + unmap! (StopHL) + + autocmd! Cool CursorMoved + autocmd! Cool InsertEnter + else + " nohls --> nohls + " do nothing + return + endif +endfunction + +" play it cool +call PlayItCool(0, &hlsearch) + +let &cpo = s:save_cpo diff --git a/qusal/dotfiles/files/vim/.config/vim/after/plugin/lastplace.vim b/qusal/dotfiles/files/vim/.config/vim/after/plugin/lastplace.vim new file mode 100644 index 0000000..51f0575 --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/after/plugin/lastplace.vim @@ -0,0 +1,49 @@ +" ============================================================================ +" File: vim-lastplace.vim +" Description: Reopen files where you left off. Configurable. +" Author: Greg Dietsche +" Licence: MIT +" Website: http://www.gregd.org/ +" Version: 3.0.0 +" ============================================================================ + +if exists("b:loaded_lastplace_plugin") || &cp + finish +endif +let b:loaded_lastplace_plugin = 1 + +scriptencoding utf-8 + +if !exists('g:lastplace_ignore') + let g:lastplace_ignore = "gitcommit,gitrebase,svn,hgcommit" +endif + +fu! s:lastplace() + if index(split(g:lastplace_ignore, ","), &filetype) == -1 + if line("'\"") > 0 && line("'\"") <= line("$") + if line("$") - line("'\"") > ((line("w$") - line("w0")) / 2) - 1 + "if we're not at the bottom of the file, center the + "cursor on the screen after we make the jump + execute "normal! g`\"zz" + else + "otherwise, show as much context as we can by jumping + "to the end of the file and then to the mark. If we + "pressed zz here, there would be blank lines at the + "bottom of the screen. We intentionally leave the + "last line blank by pressing so the user has a + "clue that they are near the end of the file. + " execute "normal! \G`\"\" + execute "normal! \G`\"" + endif + endif + if foldclosed(".") != -1 + "if we're in a fold, make the current line visible + execute "normal! zv" + endif + endif +endf + +augroup lastplace_plugin + autocmd! + autocmd BufReadPost * call s:lastplace() +augroup END diff --git a/qusal/dotfiles/files/vim/.config/vim/after/plugin/update-time.vim b/qusal/dotfiles/files/vim/.config/vim/after/plugin/update-time.vim new file mode 100644 index 0000000..a4a5c07 --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/after/plugin/update-time.vim @@ -0,0 +1,80 @@ +" File: update-time.vim +" Author: QianChenglong +" Create Time: 2013-12-04 19:36:21 CST +" Last Change: 2023 May 04 +" Description: Automatic update Last Change time + +if exists("g:loaded_update_time") + finish +endif +let g:loaded_update_time = 1 + +let s:save_cpo = &cpo +set cpo&vim + +if !exists('g:update_time_time_stamp_leader') + let s:time_stamp_leader = 'Last Change: ' +else + let s:time_stamp_leader = g:update_time_time_stamp_leader +endif + +if !exists('g:update_time_time_format') + let s:time_format = '%Y-%m-%d %H:%M:%S %Z' +else + let s:time_format = g:update_time_time_format +endif + +if !exists("g:update_time_begin_line") + let s:begin_line = 0 +else + let s:begin_line = g:update_time_begin_line +endif + +if !exists('g:update_time_end_line') + let s:end_line = 10 +else + let s:end_line = g:update_time_end_line +endif + +if !exists('g:update_time_enable') + let s:update_time_enable = 1 +else + let s:update_time_enable = g:update_time_enable +endif +"}}} +" SECTION: Funtions"{{{ +fun Update_time_update() + if ! &modifiable + return + endif + if ! s:update_time_enable + return + endif + let bufmodified = getbufvar('%', '&mod') + if ! bufmodified + return + endif + let pos = line('.').' | normal! '.virtcol('.').'|' + if pos == 1 + return + endif + exe s:begin_line + let line_num = search(s:time_stamp_leader, '', s:end_line) + if line_num > 0 + let line = getline(line_num) + let line = substitute(line, s:time_stamp_leader . '\zs.*', ' ' . strftime(s:time_format), '') + call setline(line_num, line) + endif + exe pos +endf + +fun Update_time_toggle() + let s:update_time_enable = !s:update_time_enable +endf + +com! -nargs=0 UpdateTimeToggle silent call Update_time_toggle() + +autocmd BufWritePre * silent call Update_time_update() + +let &cpo = s:save_cpo +unlet s:save_cpo diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftdetect/jinja.vim b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftdetect/jinja.vim new file mode 100644 index 0000000..994c80e --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftdetect/jinja.vim @@ -0,0 +1,19 @@ +" Source: https://github.com/lepture/vim-jinja/blob/master/ftdetect/jinja.vim +" Figure out which type of hilighting to use for html. +function! s:SelectHTML() + let n = 1 + while n < 50 && n <= line("$") + " check for jinja + if getline(n) =~ '{{.*}}\|{%-\?\s*\(end.*\|extends\|block\|macro\|set\|if\|for\|include\|trans\)\>' + setfiletype jinja.html + return + endif + let n = n + 1 + endwhile +endfunction + +autocmd BufNewFile,BufRead *.{html,htm,nunjucks,nunjs,njk} + \ call s:SelectHTML() + +autocmd BufNewFile,BufRead *.{jinja,jinja2,j2,tera} + \ setfiletype jinja diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftplugin/jinja.vim b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftplugin/jinja.vim new file mode 100644 index 0000000..624d26b --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftplugin/jinja.vim @@ -0,0 +1,20 @@ +" Source: https://github.com/Glench/Vim-Jinja2-Syntax/blob/master/ftplugin/jinja.vim + +if exists('b:did_ftplugin') + finish +endif + +" Setup matchit. +if exists('loaded_matchit') + let b:match_ignorecase = 1 + let b:match_skip = 's:Comment' + " From ftplugin/html.vim, plus block tag matching. + " With block tags the following is optional: + " - "+": disable the lstrip_blocks (only at start) + " - "-": the whitespaces before or after that block will be removed + let b:match_words = '<:>,' . + \ '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' . + \ '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' . + \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>,' . + \ '{%[-+]\? *\%(end\)\@!\(\w\+\)\>.\{-}%}:{%-\? *end\1\>.\{-}%}' +endif diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/syntax/jinja.vim b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/syntax/jinja.vim new file mode 100644 index 0000000..a371d0b --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/syntax/jinja.vim @@ -0,0 +1,124 @@ +" Vim syntax file +" Language: Jinja template +" Maintainer: Armin Ronacher +" Last Change: 2023 May 16 +" Version: 1.1 +" Source: https://github.com/Glench/Vim-Jinja2-Syntax/blob/master/syntax/jinja.vim + +if exists("b:current_syntax") + finish +endif + +if !exists('g:jinja_syntax_html') + let g:jinja_syntax_html=1 +endif + +if !exists("main_syntax") + let main_syntax = 'jinja' +endif + +" Pull in the HTML syntax. +if g:jinja_syntax_html + let ext = expand('%:e') + if ext !~ 'htm\|nunj|jinja\|j2' && + \ findfile(ext . '.vim', $VIMRUNTIME . '/syntax') != '' + execute 'runtime! syntax/' . ext . '.vim' + else + runtime! syntax/html.vim + endif + unlet b:current_syntax +endif + +syn case match +syn sync minlines=10 + +" Jinja template built-in tags and parameters (without filter, macro, is and +" raw, they have special treatment) +syn keyword jinjaStatement containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained and if else in not or recursive as import + +syn keyword jinjaStatement containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained is filter skipwhite nextgroup=jinjaFilter +syn keyword jinjaStatement containedin=jinjaTagBlock contained macro skipwhite nextgroup=jinjaFunction +syn keyword jinjaStatement containedin=jinjaTagBlock contained block skipwhite nextgroup=jinjaBlockName + +" Variable Names +syn match jinjaVariable containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[a-zA-Z_][a-zA-Z0-9_]*/ +syn keyword jinjaSpecial containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained false true none False True None loop super caller varargs kwargs + +" Filters +syn match jinjaOperator "|" containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained skipwhite nextgroup=jinjaFilter +syn match jinjaFilter contained /[a-zA-Z_][a-zA-Z0-9_]*/ +syn match jinjaFunction contained /[a-zA-Z_][a-zA-Z0-9_]*/ +syn match jinjaBlockName contained /[a-zA-Z_][a-zA-Z0-9_]*/ + +" Jinja template constants +syn region jinjaString containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained start=/"/ skip=/\(\\\)\@\)*\\"/ end=/"/ +syn region jinjaString containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained start=/'/ skip=/\(\\\)\@\)*\\'/ end=/'/ +syn match jinjaNumber containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[0-9]\+\(\.[0-9]\+\)\?/ + +" Operators +syn match jinjaOperator containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[+\-*\/<>=!,:]/ +syn match jinjaPunctuation containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[()\[\]]/ +syn match jinjaOperator containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /\./ nextgroup=jinjaAttribute +syn match jinjaAttribute contained /[a-zA-Z_][a-zA-Z0-9_]*/ + +" Jinja template tag and variable blocks +syn region jinjaNested matchgroup=jinjaOperator start="(" end=")" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained +syn region jinjaNested matchgroup=jinjaOperator start="\[" end="\]" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained +syn region jinjaNested matchgroup=jinjaOperator start="{" end="}" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained +syn region jinjaTagBlock matchgroup=jinjaTagDelim start=/{%[-+]\?/ end=/[-+]\?%}/ containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaRaw,jinjaString,jinjaNested,jinjaComment + +syn region jinjaVarBlock matchgroup=jinjaVarDelim start=/{{-\?/ end=/-\?}}/ containedin=ALLBUT,yamlComment,jinjaTagBlock,jinjaVarBlock,jinjaRaw,jinjaString,jinjaNested,jinjaComment + +" Jinja template 'raw' tag +syn region jinjaRaw matchgroup=jinjaRawDelim start="{%\s*raw\s*%}" end="{%\s*endraw\s*%}" containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaString,jinjaComment + +" Mark illegal characters within tag and variables blocks +syn match jinjaTagError contained "#}\|{{\|[^%]}}\|[&#]" +syn match jinjaVarError contained "#}\|{%\|%}\|[<>!&#%]" + +" Block start keywords. A bit tricker. We only highlight at the start of a +" tag block and only if the name is not followed by a comma or equals sign +" which usually means that we have to deal with an assignment. +syn match jinjaStatement containedin=jinjaTagBlock contained /\({%[-+]\?\s*\)\@<=\<[a-zA-Z_][a-zA-Z0-9_]*\>\(\s*[,=]\)\@!/ + +" and context modifiers +syn match jinjaStatement containedin=jinjaTagBlock contained /\/ + +" Keywords to highlight within comments +syn keyword jinjaTodo contained TODO FIXME XXX +syn cluster jinjaBlocks add=jinjaTagBlock,jinjaVarBlock,jinjaCommentBlock + +" Jinja comments +syn region jinjaComment display oneline matchgroup=jinjaCommentDelim containedin=@jinjaCommentDelim start='\%\(^\|\s\)#' end='$' +syn region jinjaComment matchgroup=jinjaCommentDelim start="{#" end="#}" containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaString contains=jinjaComment keepend extend + +" Define the default highlighting. +hi def link jinjaPunctuation jinjaOperator +hi def link jinjaAttribute jinjaVariable +hi def link jinjaFunction jinjaFilter + +hi def link jinjaTagDelim jinjaTagBlock +hi def link jinjaVarDelim jinjaVarBlock +hi def link jinjaCommentDelim jinjaComment +hi def link jinjaCommentBlock jinjaComment +hi def link jinjaCommentLine jinjaComment +hi def link jinjaRawDelim jinja + +hi def link jinjaSpecial Special +hi def link jinjaOperator Normal +hi def link jinjaRaw Normal +hi def link jinjaTagBlock PreProc +hi def link jinjaVarBlock PreProc +hi def link jinjaStatement Statement +hi def link jinjaFilter Function +hi def link jinjaBlockName Function +hi def link jinjaVariable Identifier +hi def link jinjaString Constant +hi def link jinjaNumber Constant +hi def link jinjaComment Comment + +let b:current_syntax = "jinja" + +if main_syntax ==# 'jinja' + unlet main_syntax +endif diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftdetect/salt.vim b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftdetect/salt.vim new file mode 100644 index 0000000..02f7243 --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftdetect/salt.vim @@ -0,0 +1,13 @@ +" Source: https://github.com/vmware-archive/salt-vim/blob/master/ftdetect/sls.vim +function! DetectSalt() + if !did_filetype() + if match(getline(1), '^#!py') > -1 + setfiletype python + else + setfiletype salt + endif + endif +endfunction + +autocmd BufNewFile,BufRead *.{sls,top},Saltfile,/etc/salt/* + \ call DetectSalt() diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftplugin/salt.vim b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftplugin/salt.vim new file mode 100644 index 0000000..65aa9f1 --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftplugin/salt.vim @@ -0,0 +1,27 @@ +" Vim filetype plugin file +" Language: YAML (YAML Ain't Markup Language) +" Previous Maintainer: Nikolai Weibull (inactive) +" Last Change: 2023 May 03 + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +let s:cpo_save = &cpo +set cpo&vim + +let b:undo_ftplugin = "setl tw< com< cms< et< fo<" + +" https://salt-lint.readthedocs.io/en/latest/rules/formatting/#204 +setlocal textwidth=160 +setlocal comments=:# commentstring=#\ %s expandtab +setlocal formatoptions-=t formatoptions+=croql + +if !exists("g:yaml_recommended_style") || g:yaml_recommended_style != 0 + let b:undo_ftplugin ..= " sw< ts< sts<" + setlocal shiftwidth=2 tabstop=2 softtabstop=2 +endif + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/indent/salt.vim b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/indent/salt.vim new file mode 100644 index 0000000..8dca5cd --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/indent/salt.vim @@ -0,0 +1,156 @@ +" Vim indent file +" Language: YAML +" Maintainer: Nikolai Pavlov +" Last Update: Lukas Reineke +" Last Change: 2021 Jan 19 + +" Only load this indent file when no other was loaded. +if exists('b:did_indent') + finish +endif + +let b:did_indent = 1 + +setlocal indentexpr=GetYAMLIndent(v:lnum) +setlocal indentkeys=!^F,o,O,0#,0},0],<:>,0- +setlocal nosmartindent + +let b:undo_indent = 'setlocal indentexpr< indentkeys< smartindent<' + +" Only define the function once. +if exists('*GetYAMLIndent') + finish +endif + +let s:save_cpo = &cpo +set cpo&vim + +function s:FindPrevLessIndentedLine(lnum, ...) + let prevlnum = prevnonblank(a:lnum-1) + let curindent = a:0 ? a:1 : indent(a:lnum) + while prevlnum + \&& indent(prevlnum) >= curindent + \&& getline(prevlnum) !~# '^\s*#' + let prevlnum = prevnonblank(prevlnum-1) + endwhile + return prevlnum +endfunction + +function s:FindPrevLEIndentedLineMatchingRegex(lnum, regex) + let plilnum = s:FindPrevLessIndentedLine(a:lnum, indent(a:lnum)+1) + while plilnum && getline(plilnum) !~# a:regex + let plilnum = s:FindPrevLessIndentedLine(plilnum) + endwhile + return plilnum +endfunction + +let s:mapkeyregex='\v^\s*\#@!\S@=%(\''%([^'']|\''\'')*\'''. + \ '|\"%([^"\\]|\\.)*\"'. + \ '|%(%(\:\ )@!.)*)\:%(\ |$)' +let s:liststartregex='\v^\s*%(\-%(\ |$))' + +let s:c_ns_anchor_char = '\v%([\n\r\uFEFF \t,[\]{}]@!\p)' +let s:c_ns_anchor_name = s:c_ns_anchor_char.'+' +let s:c_ns_anchor_property = '\v\&'.s:c_ns_anchor_name + +let s:ns_word_char = '\v[[:alnum:]_\-]' +let s:ns_tag_char = '\v%('.s:ns_word_char.'|[#/;?:@&=+$.~*''()])' +let s:c_named_tag_handle = '\v\!'.s:ns_word_char.'+\!' +let s:c_secondary_tag_handle = '\v\!\!' +let s:c_primary_tag_handle = '\v\!' +let s:c_tag_handle = '\v%('.s:c_named_tag_handle. + \ '|'.s:c_secondary_tag_handle. + \ '|'.s:c_primary_tag_handle.')' +let s:c_ns_shorthand_tag = '\v'.s:c_tag_handle . s:ns_tag_char.'+' +let s:c_non_specific_tag = '\v\!' +let s:ns_uri_char = '\v%('.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])' +let s:c_verbatim_tag = '\v\!\<'.s:ns_uri_char.'+\>' +let s:c_ns_tag_property = '\v'.s:c_verbatim_tag. + \ '\v|'.s:c_ns_shorthand_tag. + \ '\v|'.s:c_non_specific_tag + +let s:block_scalar_header = '\v[|>]%([+-]?[1-9]|[1-9]?[+-])?' + +function GetYAMLIndent(lnum) + if a:lnum == 1 || !prevnonblank(a:lnum-1) + return 0 + endif + + let prevlnum = prevnonblank(a:lnum-1) + let previndent = indent(prevlnum) + + let line = getline(a:lnum) + if line =~# '^\s*#' && getline(a:lnum-1) =~# '^\s*#' + " Comment blocks should have identical indent + return previndent + elseif line =~# '^\s*[\]}]' + " Lines containing only closing braces should have previous indent + return indent(s:FindPrevLessIndentedLine(a:lnum)) + endif + + " Ignore comment lines when calculating indent + while getline(prevlnum) =~# '^\s*#' + let prevlnum = prevnonblank(prevlnum-1) + if !prevlnum + return previndent + endif + endwhile + + let prevline = getline(prevlnum) + let previndent = indent(prevlnum) + + " Any examples below assume that shiftwidth=2 + if prevline =~# '\v[{[:]$|[:-]\ [|>][+\-]?%(\s+\#.*|\s*)$' + " Mapping key: + " nested mapping: ... + " + " - { + " key: [ + " list value + " ] + " } + " + " - |- + " Block scalar without indentation indicator + return previndent+shiftwidth() + elseif prevline =~# '\v[:-]\ [|>]%(\d+[+\-]?|[+\-]?\d+)%(\#.*|\s*)$' + " - |+2 + " block scalar with indentation indicator + "#^^ indent+2, not indent+shiftwidth + return previndent + str2nr(matchstr(prevline, + \'\v([:-]\ [|>])@<=[+\-]?\d+%([+\-]?%(\s+\#.*|\s*)$)@=')) + elseif prevline =~# '\v\"%([^"\\]|\\.)*\\$' + " "Multiline string \ + " with escaped end" + let qidx = match(prevline, '\v\"%([^"\\]|\\.)*\\') + return virtcol([prevlnum, qidx+1]) + elseif line =~# s:liststartregex + " List line should have indent equal to previous list line unless it was + " caught by one of the previous rules + return indent(s:FindPrevLEIndentedLineMatchingRegex(a:lnum, + \ s:liststartregex)) + elseif line =~# s:mapkeyregex + " Same for line containing mapping key + let prevmapline = s:FindPrevLEIndentedLineMatchingRegex(a:lnum, + \ s:mapkeyregex) + if getline(prevmapline) =~# '^\s*- ' + return indent(prevmapline) + 2 + else + return indent(prevmapline) + endif + elseif prevline =~# '^\s*- ' + " - List with + " multiline scalar + return previndent+2 + elseif prevline =~# s:mapkeyregex . '\v\s*%(%('.s:c_ns_tag_property. + \ '\v|'.s:c_ns_anchor_property. + \ '\v|'.s:block_scalar_header. + \ '\v)%(\s+|\s*%(\#.*)?$))*' + " Mapping with: value + " that is multiline scalar + return previndent+shiftwidth() + endif + return previndent +endfunction + +let &cpo = s:save_cpo diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/syntax/salt.vim b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/syntax/salt.vim new file mode 100644 index 0000000..d6b5593 --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/syntax/salt.vim @@ -0,0 +1,53 @@ +" Vim syntax file +" Language: Salt States template +" Maintainer: Seth House +" Last Change: 2023 Apr 17 +" Source: https://github.com/vmware-archive/salt-vim/blob/master/syntax/sls.vim + +if exists("b:current_syntax") + finish +endif + +if !exists("main_syntax") + let main_syntax = 'yaml' +endif + +if exists('b:current_syntax') + let s:current_syntax=b:current_syntax + unlet b:current_syntax +endif + +runtime! syntax/yaml.vim +unlet b:current_syntax + +let s:jinja_path = findfile("syntax/jinja.vim", &rtp, 1) +if s:jinja_path != "" + runtime! syntax/jinja.vim + unlet b:current_syntax +else + runtime! syntax/django.vim + unlet b:current_syntax +endif + +if exists('b:current_syntax') + let s:current_syntax=b:current_syntax + unlet b:current_syntax +endif + +" TODO: fix yamlBlockMappingKey not working with {{ jinja_variable }} +" Example key that fails: key {{ variable }}: +" Get its value: syn list yamlBlockMappingKey +" syn match yamlBlockMappingKey /\%#=1\s*\zs\%([^\-?:,[\]{}#&*!|>'"%@`\n\r\uFEFF \t]\|[?:\-]\%([^\n\r\uFEFF \t]\)\@=\)\%([^\n\r\uFEFF \t]#\|:[^\n\r\uFEFF \t]\|[^\n\r\uFEFF \t:#]\)*\%(\s\+\%([^\-?:,[\]{}#&*!|>'"%@`\n\r\uFEFF \t]\|[?:\-]\%([^\n\r\uFEFF \t]\)\@=\)\%([^\n\r\uFEFF \t]#\|:[^\n\r\uFEFF \t]\|[^\n\r\uFEFF \t:#]\)*\)*\ze\s*:\%(\s\|$\)/ contained nextgroup=yamlKeyValueDelimiter + +" TODO: improve: keyword is not great when the key contains it: include-ab: +syn keyword saltInclude include extend containedin=yamlBlockMappingKey nextgroup=yamlKeyValueDelimiter contained + +syn keyword saltSpecialArgs name names check_cmd listen listen_in onchanges onchanges_in onfail onfail_in onlyif prereq prereq_in require require_in unless use use_in watch watch_in containedin=yamlBlockMappingKey nextgroup=yamlKeyValueDelimiter contained + +syn keyword saltErrors requires requires_in watches watches_in includes extends containedin=yamlBlockMappingKey contained + +hi def link saltInclude Include +hi def link saltSpecialArgs Special +hi def link saltErrors Error + +let b:current_syntax = "salt" diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/test/file.sls b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/test/file.sls new file mode 100644 index 0000000..daa15fb --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/test/file.sls @@ -0,0 +1,22 @@ +{%- import "path/to/file.jinja" as tpl -%} + +include: + - test.file + +this-is-not-include: + - name: include should not be highlighted + +test-{{ tpl }}-test: + module.here: + - name: the jinja variable in the directive does not allow the rest of the key to be highlighted + +directive here: + module.here: + - require: + - sls: test.file + - name: tpl-test + - prefs: + - netvm: "" + - vpus: 1 + - memory: 400 + - autostart: False diff --git a/qusal/dotfiles/files/vim/.config/vim/vimrc b/qusal/dotfiles/files/vim/.config/vim/vimrc new file mode 100644 index 0000000..d84155c --- /dev/null +++ b/qusal/dotfiles/files/vim/.config/vim/vimrc @@ -0,0 +1,732 @@ +" Credits: https://github.com/tpope/dotfiles/blob/master/.vimrc + +" Section: Bootstrap + + +if v:version < 600 | finish | endif + +" Useful for when this configuration is in non-standard locations. +if empty($MYVIMRC) | let $MYVIMRC = expand(':p') | endif + +if !get(v:, 'vim_did_enter', !has('vim_starting')) + if empty($CODE_HOME) + let $CODE_HOME = expand('$HOME/src') + endif + if empty($XDG_CONFIG_HOME) + let $XDG_CONFIG_HOME = expand('$HOME/.config') + endif + if empty($XDG_DATA_HOME) + let $XDG_DATA_HOME = expand('$HOME/.local/share') + endif + if empty($XDG_CACHE_HOME) + let $XDG_CACHE_HOME = expand('$HOME/.cache') + endif + if empty($XDG_STATE_HOME) + let $XDG_STATE_HOME = expand('$HOME/.local/state') + endif + filetype off + set runtimepath^=$XDG_CONFIG_HOME/vim + set runtimepath+=$XDG_CONFIG_HOME/vim/after + let g:netrw_home = $XDG_DATA_HOME . "/vim" + if has('packages') + let &packpath = &runtimepath + else + let s:rtp = [] + for s:dir in split(&runtimepath, ',') + if $VIMRUNTIME ==# s:dir + call add(s:rtp, s:dir) + elseif s:dir =~# 'after$' + call extend(s:rtp, [s:dir[0:-6] . 'pack/*/start/*/after', s:dir]) + else + call extend(s:rtp, [s:dir, s:dir . '/pack/*/start/*']) + endif + endfor + let &runtimepath = join(s:rtp, ',') + unlet! s:rtp s:dir + endif +endif + +if $VIM_BARE + setglobal noloadplugins + finish +endif + +setglobal nocompatible +setglobal pastetoggle= + +" Fix Vim on XTerm to avoid raw-terminal-mode +let &t_TI="" +let &t_TE="" + +filetype plugin indent on +" vint: -ProhibitAutocmdWithNoGroup +exe 'augroup my' +autocmd! + + +" Section: Moving around, searching, patterns, and tags + +setglobal startofline +setglobal shortmess-=S +setglobal cpoptions+=J +if has('vim_starting') + setglobal noignorecase +endif +setglobal smartcase +setglobal incsearch +setglobal hlsearch +setglobal tags=./tags; +setglobal include= +setglobal path=.,, + +autocmd FileType c,cpp setlocal path+=/usr/include include& +autocmd FileType sh,zsh,csh,tcsh + \ setlocal include=^\\s*\\%(\\.\\\|source\\)\\s | + \ let &l:path = $PATH . ',.' +autocmd FileType lua + \ if expand('%:p') =~# '/awesome/' | + \ let &l:path = expand('~/.config/awesome') . ',/etc/xdg/awesome,/usr/share/awesome/lib,' . &l:path | + \ endif +autocmd FileType ruby setlocal tags-=./tags; + + +" Section: Displaying text + +if has('vim_starting') && exists('+breakindent') + setglobal breakindent showbreak=\ + +endif +setglobal modelineexpr +setglobal display=lastline +setglobal scrolloff=1 +setglobal sidescrolloff=5 +setglobal lazyredraw +if (&termencoding ==# 'utf-8' || &encoding ==# 'utf-8') && v:version >= 700 + let &g:listchars = "tab:\u21e5\u00b7,trail:\u2423,extends:\u21c9,precedes:\u21c7,nbsp:\u00b7" + let &g:fillchars = "vert:\u250b,fold:\u00b7" +else + setglobal listchars=tab:>\ ,trail:-,extends:>,precedes:< +endif + + +" Section: Windows + +setglobal laststatus=2 +setglobal showtabline=2 + +if empty(&g:statusline) + setglobal statusline=[%n]\ %<%.99f + setglobal statusline+=\ %y%h%w%m%r + if exists('*FugitiveStatusline') + setglobal statusline+=%{FugitiveStatusline()} + endif + setglobal statusline+=%=%-14.(%l,%c%V%) + setglobal statusline+=\ %P +endif + +setglobal titlestring=%{v:progname}\ %{tolower(empty(v:servername)?'':'--servername\ '.v:servername.'\ ')}%{fnamemodify(getcwd(),':~')}%{exists('$SSH_TTY')?'\ <'.hostname().'>':''} +setglobal iconstring=%{tolower(empty(v:servername)?v:progname\ :\ v:servername)}%{exists('$SSH_TTY')?'@'.hostname():''} + +if has('vim_starting') + setglobal nohidden +endif + +autocmd SourcePre */macros/less.vim setglobal laststatus=0 showtabline=0 + + +" Section: GUI + +setglobal printoptions=paper:letter +setglobal mousemodel=popup +if $TERM =~# '^screen' + if exists('+ttymouse') && &ttymouse ==# '' + setglobal ttymouse=sgr + endif +endif + +if !has('gui_running') && empty($DISPLAY) || !has('gui') + " Mouse in insert mode puts some weird characters to the file. + setglobal mouse=nv +else + setglobal mouse=nvi +endif +if exists('+macmeta') + setglobal macmeta +endif +setglobal winaltkeys=no + +function! s:font() + if has('mac') + return 'Monaco:h14' + else + return 'Monospace 14' + endif +endfunction + +autocmd VimEnter * if !has('gui_running') | set noicon background=dark | endif +autocmd GUIEnter * set background=light icon guioptions-=T guioptions-=m guioptions-=e guioptions-=r guioptions-=L +autocmd GUIEnter * silent! colorscheme vividchalk +autocmd GUIEnter * let &g:guifont = substitute(&g:guifont, '^$', s:font(), '') +autocmd FocusLost * let s:confirm = &confirm | setglobal noconfirm | silent! wall | let &confirm = s:confirm + + +" Section: Messages and info + +setglobal confirm +setglobal showcmd +setglobal belloff=all + + +" Section: Editing text and indent + +setglobal backspace=2 +setglobal complete-=i " Searching includes can be slow +setglobal completeopt=menuone,noselect +setglobal formatoptions= +if v:version + has('patch541') >= 704 + setglobal formatoptions+=j +endif +setglobal dictionary+=/usr/share/dict/words +setglobal infercase +setglobal showmatch +setglobal virtualedit=block + +setglobal shiftround +setglobal smarttab +if has('vim_starting') + let mapleader="\\" + set autoindent + set smartindent + set smarttab + set expandtab + set splitbelow splitright + set tabstop=8 softtabstop=0 + if exists('*shiftwidth') + set shiftwidth=0 softtabstop=-1 + endif + set omnifunc=syntaxcomplete#Complete + set completefunc=syntaxcomplete#Complete +endif + + +" Section: Folding and Comments + +if has('vim_starting') + if has('folding') + set foldmethod=marker + set foldopen+=jump + endif + set commentstring=#\ %s +endif + +autocmd FileType sh,zsh,csh,tcsh,python,desktop setlocal commentstring=##\ %s +autocmd FileType sql setlocal commentstring=--\ %s +autocmd FileType xdefaults setlocal commentstring=!%s +autocmd FileType git,gitcommit setlocal foldmethod=syntax foldlevel=1 + + +" Section: Maps + +setglobal timeoutlen=1200 +setglobal ttimeoutlen=50 + +inoremap `^ +inoremap `^ +inoremap `^ + +noremap Q gq +noremap :exe "normal i".nr2char(getchar()) + +vnoremap . :normal . +vnoremap > >gv +vnoremap < ge !gpgw -aser +vnoremap gs !gpgw -a --clear-sign +vnoremap gd !gpgw -d + +nnoremap r "hyiw:%s/h//g +nnoremap s "hyiw/h +vnoremap r "hy:%s/h//g +vnoremap s "hy/h + +function! ReplayLastMacro() + try + normal @@ + catch /E748/ + normal @q + endtry +endfunction +nnoremap m :call ReplayLastMacro() +vnoremap m norm :call ReplayLastMacro() + +cnoremap W!! execute 'silent! write !sudo tee % >/dev/null' edit! + +inoremap +inoremap + +" Shortcut split navigation +nnoremap h +nnoremap j +nnoremap k +nnoremap l +nnoremap w +nnoremap W + +nnoremap o :setlocal spell! +nnoremap cd :cd %:p:h:pwd +nnoremap l :bnext +nnoremap h :bprevious +nnoremap tn :tabnew +nnoremap to :tabonly +nnoremap tc :tabclose +nnoremap tm :tabmove +nnoremap t :tabnext +" Let 'tl' toggle between this and the last accessed tab. +let g:lasttab = 1 +nnoremap tl :exe "tabnext ".g:lasttab +autocmd TabLeave * let g:lasttab = tabpagenr() +" Opens a new tab with the current buffer's path. +nnoremap te :tabedit =escape(expand("%:p:h"), " ")/ + +nnoremap z :wincmd zccloselclose +nnoremap Q :tabclose +nnoremap , :if exists(':Wcd')exe 'Wcd'elseif exists(':Lcd')exe 'Lcd'elseif exists(':Glcd')exe 'Glcd'elselcd %:hendif +nmap cd , + +" Paste last thing yanked +nnoremap ,p "0p +nnoremap ,P "0P +" Interaction (cut/copy/paste) from system clibpboard. +vnoremap "+x +vnoremap "+y +noremap