From 0e1c7c11d58e86a5a738a025e1afb69596f4d9b2 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 14 May 2022 10:29:07 -0500 Subject: Add more dotfiles --- .gitconfig | 3 + ansible/setup.yaml | 43 ----- ansible/tasks/desktop.yaml | 33 ---- ansible/tasks/dnf_packages.yaml | 57 ------ ansible/tasks/link_dotfiles.yaml | 32 ---- ansible/tasks/pkg_packages.yaml | 52 ------ configs/desktop/boot/loader.conf | 21 --- configs/desktop/etc/rc.conf | 27 --- configs/desktop/home/.xinitrc | 2 - configs/shared/.gdbinit | 1 - configs/shared/.gitconfig | 17 -- configs/shared/.tmux.conf | 1 - configs/shared/.vimrc | 52 ------ configs/shared/.zshrc | 73 -------- configs/shared/alacritty.yml | 11 -- install | 3 +- src/configs/desktop/boot/loader.conf | 21 +++ src/configs/desktop/etc/rc.conf | 27 +++ src/configs/desktop/home/.xinitrc | 2 + .../usr/local/etc/X11/xorg.conf.d/50-mouse.conf | 6 + src/configs/desktop/usr/local/etc/doas.conf | 6 + src/configs/shared/.gdbinit | 1 + src/configs/shared/.gitconfig | 22 +++ src/configs/shared/.tmux.conf | 1 + src/configs/shared/.zshrc | 75 ++++++++ src/configs/shared/alacritty/alacritty.yml | 13 ++ src/configs/shared/alacritty/themes.yml | 136 +++++++++++++++ src/configs/shared/i3/config | 194 +++++++++++++++++++++ src/configs/shared/nvim/init.vim | 79 +++++++++ src/setup.yaml | 40 +++++ src/tasks/desktop.yaml | 51 ++++++ src/tasks/dnf_packages.yaml | 58 ++++++ src/tasks/pkg_packages.yaml | 54 ++++++ src/tasks/shared_dotfiles.yaml | 44 +++++ 34 files changed, 834 insertions(+), 424 deletions(-) create mode 100644 .gitconfig delete mode 100644 ansible/setup.yaml delete mode 100644 ansible/tasks/desktop.yaml delete mode 100644 ansible/tasks/dnf_packages.yaml delete mode 100644 ansible/tasks/link_dotfiles.yaml delete mode 100644 ansible/tasks/pkg_packages.yaml delete mode 100644 configs/desktop/boot/loader.conf delete mode 100644 configs/desktop/etc/rc.conf delete mode 100644 configs/desktop/home/.xinitrc delete mode 100644 configs/shared/.gdbinit delete mode 100644 configs/shared/.gitconfig delete mode 100644 configs/shared/.tmux.conf delete mode 100644 configs/shared/.vimrc delete mode 100644 configs/shared/.zshrc delete mode 100644 configs/shared/alacritty.yml create mode 100644 src/configs/desktop/boot/loader.conf create mode 100644 src/configs/desktop/etc/rc.conf create mode 100644 src/configs/desktop/home/.xinitrc create mode 100644 src/configs/desktop/usr/local/etc/X11/xorg.conf.d/50-mouse.conf create mode 100644 src/configs/desktop/usr/local/etc/doas.conf create mode 100644 src/configs/shared/.gdbinit create mode 100644 src/configs/shared/.gitconfig create mode 100644 src/configs/shared/.tmux.conf create mode 100644 src/configs/shared/.zshrc create mode 100644 src/configs/shared/alacritty/alacritty.yml create mode 100644 src/configs/shared/alacritty/themes.yml create mode 100644 src/configs/shared/i3/config create mode 100644 src/configs/shared/nvim/init.vim create mode 100644 src/setup.yaml create mode 100644 src/tasks/desktop.yaml create mode 100644 src/tasks/dnf_packages.yaml create mode 100644 src/tasks/pkg_packages.yaml create mode 100644 src/tasks/shared_dotfiles.yaml diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..317d045 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,3 @@ +[core] + sharedRepository = wheel + fileMode = false diff --git a/ansible/setup.yaml b/ansible/setup.yaml deleted file mode 100644 index 05e7612..0000000 --- a/ansible/setup.yaml +++ /dev/null @@ -1,43 +0,0 @@ ---- -- name: Playbook to manage personal dotfiles - hosts: localhost - connection: local - tasks: - - name: Create folders - file: - path: "{{item}}" - state: directory - loop: - - "$HOME/.config/i3" - - "$HOME/.config/alacritty" - - "$HOME/.config/nvim/autoload" - - "$HOME/src" - - "$HOME/bin" - - - include_tasks: tasks/link_dotfiles.yaml - - - include_tasks: tasks/dnf_packages.yaml - when: ansible_os_family == "RedHat" - - - include_tasks: tasks/pkg_packages.yaml - when: ansible_os_family == "FreeBSD" - - - include_tasks: tasks/desktop.yaml - when: ansible_os_family == "FreeBSD" - - - name: Ensure shell is set to zsh - vars: - current_user: "{{ ansible_user_id }}" - become: yes - user: - name: "{{ current_user }}" - shell: /usr/local/bin/zsh - - - name: Install vim-plug - get_url: - url: https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim - dest: "$HOME/.config/nvim/autoload/plug.vim" - - - name: Install vim-plug plugins - shell: nvim +PlugInstall +qall --headless - diff --git a/ansible/tasks/desktop.yaml b/ansible/tasks/desktop.yaml deleted file mode 100644 index e9abdc2..0000000 --- a/ansible/tasks/desktop.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- name: Link user files - file: - src: "{{ item.value.src }}" - dest: "{{ item.value.dest }}" - state: link - with_dict: "{{user_desktop_files}}" - vars: - user_desktop_files: - xinitrc: - src: "{{playbook_dir}}/../configs/desktop/home/.xinitrc" - dest: "{{ lookup('env', 'HOME') }}/.xinitrc" - -- name: Link system files - become: true - become_method: su - copy: - src: "{{ item.value.src }}" - dest: "{{ item.value.dest }}" - backup: yes - owner: root - group: wheel - mode: u=rw,g=r,o=r - with_dict: "{{system_desktop_files}}" - vars: - system_desktop_files: - etc-rc: - src: "{{playbook_dir}}/../configs/desktop/etc/rc.conf" - dest: "/etc/rc.conf" - - boot-loader: - src: "{{playbook_dir}}/../configs/desktop/boot/loader.conf" - dest: "/boot/loader.conf" diff --git a/ansible/tasks/dnf_packages.yaml b/ansible/tasks/dnf_packages.yaml deleted file mode 100644 index 3786e86..0000000 --- a/ansible/tasks/dnf_packages.yaml +++ /dev/null @@ -1,57 +0,0 @@ ---- -- name: Import 1Password key - become: yes - ansible.builtin.rpm_key: - state: present - key: https://downloads.1password.com/linux/keys/1password.asc - -- name: Add 1Password YUM Repo - become: yes - yum_repository: - name: 1password - description: 1Password Stable Channel - baseurl: https://downloads.1password.com/linux/rpm/stable/$basearch - enabled: yes - gpgcheck: yes - repo_gpgcheck: yes - gpgkey: https://downloads.1password.com/linux/keys/1password.asc - state: present - -- name: Install dnf packages - become: yes - - dnf: - name: "{{ item.key }}" - state: "{{ item.value.state | default('present') }}" - - with_dict: "{{dnf}}" - vars: - dnf: - "@Development tools": - 1password: - alacritty: - cmake: - dmenu: - vim: - feh: - firefox: - fzf: - git: - go: - hack-fonts: - i3-gaps: - i3lock: - i3status: - jq: - neofetch: - neovim: - openssl: - python: - python-devel: - python-neovim: - redshift: - ripgrep: - rsync: - scrot: - wget: - zsh: diff --git a/ansible/tasks/link_dotfiles.yaml b/ansible/tasks/link_dotfiles.yaml deleted file mode 100644 index 454c3a7..0000000 --- a/ansible/tasks/link_dotfiles.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- name: Link shared dotfiles - file: - src: "{{ item.value.src }}" - dest: "{{ item.value.dest }}" - state: link - with_dict: "{{dotfiles}}" - vars: - dotfiles: - zshrc: - src: "{{playbook_dir}}/../configs/shared/.zshrc" - dest: "{{ lookup('env', 'HOME') }}/.zshrc" - - gitconfig: - src: "{{playbook_dir}}/../configs/shared/.gitconfig" - dest: "{{ lookup('env', 'HOME') }}/.gitconfig" - - gdbinit: - src: "{{playbook_dir}}/../configs/shared/.gdbinit" - dest: "{{ lookup('env', 'HOME') }}/.gdbinit" - - vimrc: - src: "{{playbook_dir}}/../configs/shared/.vimrc" - dest: "{{ lookup('env', 'HOME') }}/.config/nvim/init.vim" - - tmux: - src: "{{playbook_dir}}/../configs/shared/.tmux.conf" - dest: "{{ lookup('env', 'HOME') }}/.tmux.conf" - - alacritty: - src: "{{playbook_dir}}/../configs/shared/alacritty.yml" - dest: "{{ lookup('env', 'HOME') }}/.config/alacritty/alacritty.yml" diff --git a/ansible/tasks/pkg_packages.yaml b/ansible/tasks/pkg_packages.yaml deleted file mode 100644 index ad744fc..0000000 --- a/ansible/tasks/pkg_packages.yaml +++ /dev/null @@ -1,52 +0,0 @@ ---- -- name: Install pkg packages - become: yes - become_method: su - - community.general.pkgng: - name: "{{ item.key }}" - state: "{{ item.value.state | default('present') }}" - - with_dict: "{{pkg}}" - vars: - pkg: - 1password-client2: - audio/virtual_oss: - alacritty: - brlaser: - cmake: - devcpu-data: - devel/xdg-user-dirs: - dmenu: - drm-kmod: - editors/vim: - editors/vscode: - en-freebsd-doc: - feh: - firefox: - fzf: - git: - go: - hack-font: - i3-gaps: - i3lock: - i3status: - jq: - neovim: - openssl: - pfetch: - pkg: - poudriere: - editors/py-pynvim: - python: - redshift: - ripgrep: - rsync: - rust-analyzer: - scrot: - spotify-tui: - spotifyd: - wget: - x11/xclip: - x11/xorg: - zsh: diff --git a/configs/desktop/boot/loader.conf b/configs/desktop/boot/loader.conf deleted file mode 100644 index 0305c24..0000000 --- a/configs/desktop/boot/loader.conf +++ /dev/null @@ -1,21 +0,0 @@ -aesni_load="YES" -cryptodev_load="YES" -geom_eli_load="YES" -kern.geom.label.disk_ident.enable="0" -kern.geom.label.gptid.enable="0" -security.bsd.allow_destructive_dtrace=0 -zfs_load="YES" -ng_ubt_load="YES" -cuse_load="YES" - -# Intel Microcore -cpu_microcode_load="YES" -cpu_microcode_name="/boot/firmware/intel-ucode.bin" - -# Wireless -if_iwm_load="YES" -iwm9260fw_load="YES" - -# Boot -autoboot_delay="5" - diff --git a/configs/desktop/etc/rc.conf b/configs/desktop/etc/rc.conf deleted file mode 100644 index fd5d121..0000000 --- a/configs/desktop/etc/rc.conf +++ /dev/null @@ -1,27 +0,0 @@ -clear_tmp_enable="YES" -syslogd_flags="-ss" -sendmail_enable="NONE" -hostname="desktop" -ifconfig_em0="DHCP" -ifconfig_em0_ipv6="inet6 accept_rtadv" -local_unbound_enable="YES" -sshd_enable="YES" -ntpd_enable="YES" -powerd_enable="YES" -dumpdev="AUTO" -zfs_enable="YES" -keymap="us.kbd" -jail_enable="YES" - -dbus_enable="YES" -hald_enable="YES" - -kld_list="/boot/modules/i915kms.ko" - -# Bluetooth -hcsecd_enable="YES" -sdpd_enable="YES" -bthidd_enable="YES" - -spotifyd_enable="YES" - diff --git a/configs/desktop/home/.xinitrc b/configs/desktop/home/.xinitrc deleted file mode 100644 index 0da3109..0000000 --- a/configs/desktop/home/.xinitrc +++ /dev/null @@ -1,2 +0,0 @@ -exec /usr/local/bin/i3 - diff --git a/configs/shared/.gdbinit b/configs/shared/.gdbinit deleted file mode 100644 index 9422460..0000000 --- a/configs/shared/.gdbinit +++ /dev/null @@ -1 +0,0 @@ -set disassembly-flavor intel diff --git a/configs/shared/.gitconfig b/configs/shared/.gitconfig deleted file mode 100644 index 69db33b..0000000 --- a/configs/shared/.gitconfig +++ /dev/null @@ -1,17 +0,0 @@ -[user] - name = Eugene Triguba - email = eugenetriguba@gmail.com -[core] - editor = vim - whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol - excludesfile = ~/.gitignore -[alias] - undo = reset HEAD~ -[pull] - ff = only -[fetch] - prune = true -[diff] - colorMoved = zebra -[init] - defaultBranch = main diff --git a/configs/shared/.tmux.conf b/configs/shared/.tmux.conf deleted file mode 100644 index 207d7e8..0000000 --- a/configs/shared/.tmux.conf +++ /dev/null @@ -1 +0,0 @@ -set -g mouse on diff --git a/configs/shared/.vimrc b/configs/shared/.vimrc deleted file mode 100644 index 3e05ded..0000000 --- a/configs/shared/.vimrc +++ /dev/null @@ -1,52 +0,0 @@ -" Syntax highlighting -colorscheme pablo -syntax on - -" Flash screen instead of beep sound -set visualbell - -" Change how vim represents characters on the screen -set encoding=utf-8 - -" Set the encoding of files written -set fileencoding=utf-8 - -" Set line numbers -set number - -" don't break up words at end of window width -set linebreak - -" Specify different areas of the screen where splits should occur -set splitbelow -set splitright - -" Python-specific whitespace file settings -autocmd Filetype python setlocal expandtab tabstop=4 shiftwidth=4 softtabstop=4 -" ts - show existing tab with 4 spaces width -" sw - when indenting with '>', use 4 spaces width -" sts - control and keys to match tabstop - -" General whitespace settings -set shiftwidth=4 -filetype plugin indent on - -" Allow backspace to delete indentation and inserted text -" i.e. how it works in most programs -set backspace=indent,eol,start -" indent allow backspacing over autoindent -" eol allow backspacing over line breaks (join lines) -" start allow backspacing over the start of insert; CTRL-W and CTRL-U -" stop once at the start of insert. - -call plug#begin("$HOME/.config/nvim/plugged") - -Plug 'Valloric/YouCompleteMe' -Plug 'junegunn/fzf' - -Plug 'airblade/vim-gitgutter' -Plug 'tpope/vim-fugitive' - -Plug 'editorconfig/editorconfig-vim' - -call plug#end() diff --git a/configs/shared/.zshrc b/configs/shared/.zshrc deleted file mode 100644 index 4bbc3d8..0000000 --- a/configs/shared/.zshrc +++ /dev/null @@ -1,73 +0,0 @@ -autoload -Uz vcs_info -zstyle ":vcs_info:*" enable git svn -zstyle ':vcs_info:git:*' formats '%F{green}(%b)%f ' -precmd() { - vcs_info -} -setopt prompt_subst -PROMPT=' %~ ${vcs_info_msg_0_}%# ' - -export EDITOR="nvim" -export BROWSER="firefox" -export PAGER="less" - -export SRC_DIR="$HOME/src" -export BIN_DIR="$HOME/bin" - -export PATH="$HOME/.poetry/bin:$PATH" -export PATH="$HOME/.pyenv/bin:$PATH" -export PATH=$PATH:$GOPATH/bin -export PATH=$PATH:$GOROOT/bin -export PATH="$PATH:$HOME/.local/bin" -export PATH="$BIN_DIR:$PATH" - -export GOPATH=$SRC_DIR/go -export GOBIN=$SRC_DIR/go/bin - -alias gs="git status" -alias gc="git commit" -alias ga="git add" -alias gd="git diff" -alias gds="git diff --staged" -alias gp="git push" -alias gpo='git push origin' -alias gplrb='git pull --rebase' -alias gpl="git pull" -alias gl='git log' -alias gch="git checkout" -alias gcb='git checkout -b' -alias gv='git log --graph --decorate --oneline' - -alias h="history 25" -alias j="jobs -l" -alias l="ls -alG" -alias o="xdg-open ." -alias open="xdg-open" - -alias vi="nvim" -alias vim="nvim" - -# "Compile C Program" -# -# $1: Program Name -# $2: Output File (default: a.out) -# $3: C Standard (default: c11) -# -# Example: ccp main.c main c99 -ccp() { - local prog_name=$1 - local output_file=${2:a.out} - local std=${3:c11} - - cc -Wall -W -pedantic -ansi -std=$std -o $output_file $prog_name -} - -memcheck() { - G_DEBUG=always-malloc valgrind --tool=memcheck --leak-check=full --show-reachable=yes -s $1 -} - -gocover() { - t="/tmp/go-cover.$$.tmp" - go test -coverprofile=$t $@ && go tool cover -html=$t && unlink $t -} - diff --git a/configs/shared/alacritty.yml b/configs/shared/alacritty.yml deleted file mode 100644 index bbec93c..0000000 --- a/configs/shared/alacritty.yml +++ /dev/null @@ -1,11 +0,0 @@ -font: - normal: - family: Hack - style: Regular - -window: - padding: - x: 8 - y: 8 - dynamic_padding: true - diff --git a/install b/install index a803d0a..6f75951 100755 --- a/install +++ b/install @@ -37,5 +37,4 @@ if ! [ -x "$(command -v ansible-playbook)" ]; then fi export ANSIBLE_LOCALHOST_WARNING=false -ansible-playbook --ask-become-pass "$repo_dir/ansible/setup.yaml" - +ansible-playbook --ask-become-pass "$repo_dir/src/setup.yaml" diff --git a/src/configs/desktop/boot/loader.conf b/src/configs/desktop/boot/loader.conf new file mode 100644 index 0000000..0305c24 --- /dev/null +++ b/src/configs/desktop/boot/loader.conf @@ -0,0 +1,21 @@ +aesni_load="YES" +cryptodev_load="YES" +geom_eli_load="YES" +kern.geom.label.disk_ident.enable="0" +kern.geom.label.gptid.enable="0" +security.bsd.allow_destructive_dtrace=0 +zfs_load="YES" +ng_ubt_load="YES" +cuse_load="YES" + +# Intel Microcore +cpu_microcode_load="YES" +cpu_microcode_name="/boot/firmware/intel-ucode.bin" + +# Wireless +if_iwm_load="YES" +iwm9260fw_load="YES" + +# Boot +autoboot_delay="5" + diff --git a/src/configs/desktop/etc/rc.conf b/src/configs/desktop/etc/rc.conf new file mode 100644 index 0000000..fd5d121 --- /dev/null +++ b/src/configs/desktop/etc/rc.conf @@ -0,0 +1,27 @@ +clear_tmp_enable="YES" +syslogd_flags="-ss" +sendmail_enable="NONE" +hostname="desktop" +ifconfig_em0="DHCP" +ifconfig_em0_ipv6="inet6 accept_rtadv" +local_unbound_enable="YES" +sshd_enable="YES" +ntpd_enable="YES" +powerd_enable="YES" +dumpdev="AUTO" +zfs_enable="YES" +keymap="us.kbd" +jail_enable="YES" + +dbus_enable="YES" +hald_enable="YES" + +kld_list="/boot/modules/i915kms.ko" + +# Bluetooth +hcsecd_enable="YES" +sdpd_enable="YES" +bthidd_enable="YES" + +spotifyd_enable="YES" + diff --git a/src/configs/desktop/home/.xinitrc b/src/configs/desktop/home/.xinitrc new file mode 100644 index 0000000..0da3109 --- /dev/null +++ b/src/configs/desktop/home/.xinitrc @@ -0,0 +1,2 @@ +exec /usr/local/bin/i3 + diff --git a/src/configs/desktop/usr/local/etc/X11/xorg.conf.d/50-mouse.conf b/src/configs/desktop/usr/local/etc/X11/xorg.conf.d/50-mouse.conf new file mode 100644 index 0000000..0905b74 --- /dev/null +++ b/src/configs/desktop/usr/local/etc/X11/xorg.conf.d/50-mouse.conf @@ -0,0 +1,6 @@ +Section "InputClass" + Identifier "Mouse" + Driver "libinput" + MatchIsPointer "true" + Option "NaturalScrolling" "true" +EndSection diff --git a/src/configs/desktop/usr/local/etc/doas.conf b/src/configs/desktop/usr/local/etc/doas.conf new file mode 100644 index 0000000..1bde013 --- /dev/null +++ b/src/configs/desktop/usr/local/etc/doas.conf @@ -0,0 +1,6 @@ +# Sample file for doas +# Please see doas.conf manual page for information on setting +# up a doas.conf file. + +# Permit members of the wheel group to perform actions as root. +permit :wheel diff --git a/src/configs/shared/.gdbinit b/src/configs/shared/.gdbinit new file mode 100644 index 0000000..9422460 --- /dev/null +++ b/src/configs/shared/.gdbinit @@ -0,0 +1 @@ +set disassembly-flavor intel diff --git a/src/configs/shared/.gitconfig b/src/configs/shared/.gitconfig new file mode 100644 index 0000000..ccb1919 --- /dev/null +++ b/src/configs/shared/.gitconfig @@ -0,0 +1,22 @@ +[user] + name = Eugene Triguba + email = eugenetriguba@gmail.com + signingkey = E2C90ACA3CC16B98 +[core] + editor = vim + whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol + excludesfile = ~/.gitignore +[alias] + undo = reset HEAD~ +[pull] + ff = only +[fetch] + prune = true +[diff] + colorMoved = zebra +[init] + defaultBranch = main +[commit] + gpgsign = true + + diff --git a/src/configs/shared/.tmux.conf b/src/configs/shared/.tmux.conf new file mode 100644 index 0000000..207d7e8 --- /dev/null +++ b/src/configs/shared/.tmux.conf @@ -0,0 +1 @@ +set -g mouse on diff --git a/src/configs/shared/.zshrc b/src/configs/shared/.zshrc new file mode 100644 index 0000000..89f96cc --- /dev/null +++ b/src/configs/shared/.zshrc @@ -0,0 +1,75 @@ +autoload -Uz vcs_info +zstyle ":vcs_info:*" enable git svn +zstyle ':vcs_info:git:*' formats '%F{green}(%b)%f ' +precmd() { + vcs_info +} +setopt prompt_subst +PROMPT=' %~ ${vcs_info_msg_0_}%# ' + +export EDITOR="nvim" +export BROWSER="firefox" +export PAGER="less" + +export GPG_TTY=$(tty) + +export SRC_DIR="$HOME/src" +export BIN_DIR="$HOME/bin" + +export PATH="$HOME/.poetry/bin:$PATH" +export PATH="$HOME/.pyenv/bin:$PATH" +export PATH=$PATH:$GOPATH/bin +export PATH=$PATH:$GOROOT/bin +export PATH="$PATH:$HOME/.local/bin" +export PATH="$BIN_DIR:$PATH" + +export GOPATH=$SRC_DIR/go +export GOBIN=$SRC_DIR/go/bin + +alias gs="git status" +alias gc="git commit" +alias ga="git add" +alias gd="git diff" +alias gds="git diff --staged" +alias gp="git push" +alias gpo='git push origin' +alias gplrb='git pull --rebase' +alias gpl="git pull" +alias gl='git log' +alias gch="git checkout" +alias gcb='git checkout -b' +alias gv='git log --graph --decorate --oneline' + +alias h="history 25" +alias j="jobs -l" +alias l="ls -alG" +alias o="xdg-open ." +alias open="xdg-open" + +alias vi="nvim" +alias vim="nvim" + +# "Compile C Program" +# +# $1: Program Name +# $2: Output File (default: a.out) +# $3: C Standard (default: c11) +# +# Example: ccp main.c main c99 +ccp() { + local prog_name=$1 + local output_file=${2:a.out} + local std=${3:c11} + + cc -Wall -W -pedantic -ansi -std=$std -o $output_file $prog_name +} + +memcheck() { + G_DEBUG=always-malloc valgrind --tool=memcheck --leak-check=full --show-reachable=yes -s $1 +} + +gocover() { + t="/tmp/go-cover.$$.tmp" + go test -coverprofile=$t $@ && go tool cover -html=$t && unlink $t +} + diff --git a/src/configs/shared/alacritty/alacritty.yml b/src/configs/shared/alacritty/alacritty.yml new file mode 100644 index 0000000..8a5b556 --- /dev/null +++ b/src/configs/shared/alacritty/alacritty.yml @@ -0,0 +1,13 @@ +import: + - ~/.config/alacritty/themes.yml + +font: + normal: + family: Hack + style: Regular + +window: + padding: + x: 8 + y: 8 + dynamic_padding: true diff --git a/src/configs/shared/alacritty/themes.yml b/src/configs/shared/alacritty/themes.yml new file mode 100644 index 0000000..92fcab0 --- /dev/null +++ b/src/configs/shared/alacritty/themes.yml @@ -0,0 +1,136 @@ +schemes: + everforest_dark_hard: &everforest_dark_hard + primary: + background: '#2b3339' + foreground: '#d3c6aa' + normal: + black: '#4b565c' + red: '#e67e80' + green: '#a7c080' + yellow: '#dbbc7f' + blue: '#7fbbb3' + magenta: '#d699b6' + cyan: '#83c092' + white: '#d3c6aa' + bright: + black: '#4b565c' + red: '#e67e80' + green: '#a7c080' + yellow: '#dbbc7f' + blue: '#7fbbb3' + magenta: '#d699b6' + cyan: '#83c092' + white: '#d3c6aa' + everforest_dark_medium: &everforest_dark_medium + primary: + background: '#2f383e' + foreground: '#d3c6aa' + normal: + black: '#4b565c' + red: '#e67e80' + green: '#a7c080' + yellow: '#dbbc7f' + blue: '#7fbbb3' + magenta: '#d699b6' + cyan: '#83c092' + white: '#d3c6aa' + bright: + black: '#4b565c' + red: '#e67e80' + green: '#a7c080' + yellow: '#dbbc7f' + blue: '#7fbbb3' + magenta: '#d699b6' + cyan: '#83c092' + white: '#d3c6aa' + everforest_dark_soft: &everforest_dark_soft + primary: + background: '#323d43' + foreground: '#d3c6aa' + normal: + black: '#4b565c' + red: '#e67e80' + green: '#a7c080' + yellow: '#dbbc7f' + blue: '#7fbbb3' + magenta: '#d699b6' + cyan: '#83c092' + white: '#d3c6aa' + bright: + black: '#4b565c' + red: '#e67e80' + green: '#a7c080' + yellow: '#dbbc7f' + blue: '#7fbbb3' + magenta: '#d699b6' + cyan: '#83c092' + white: '#d3c6aa' + everforest_light_hard: &everforest_light_hard + primary: + background: '#fff9e8' + foreground: '#5c6a72' + normal: + black: '#5c6a72' + red: '#f85552' + green: '#8da101' + yellow: '#dfa000' + blue: '#3a94c5' + magenta: '#df69ba' + cyan: '#35a77c' + white: '#dfddc8' + bright: + black: '#5c6a72' + red: '#f85552' + green: '#8da101' + yellow: '#dfa000' + blue: '#3a94c5' + magenta: '#df69ba' + cyan: '#35a77c' + white: '#dfddc8' + everforest_light_medium: &everforest_light_medium + primary: + background: '#fdf6e3' + foreground: '#5c6a72' + normal: + black: '#5c6a72' + red: '#f85552' + green: '#8da101' + yellow: '#dfa000' + blue: '#3a94c5' + magenta: '#df69ba' + cyan: '#35a77c' + white: '#dfddc8' + bright: + black: '#5c6a72' + red: '#f85552' + green: '#8da101' + yellow: '#dfa000' + blue: '#3a94c5' + magenta: '#df69ba' + cyan: '#35a77c' + white: '#dfddc8' + everforest_light_soft: &everforest_light_soft + primary: + background: '#f8f0dc' + foreground: '#5c6a72' + normal: + black: '#5c6a72' + red: '#f85552' + green: '#8da101' + yellow: '#dfa000' + blue: '#3a94c5' + magenta: '#df69ba' + cyan: '#35a77c' + white: '#dfddc8' + bright: + black: '#5c6a72' + red: '#f85552' + green: '#8da101' + yellow: '#dfa000' + blue: '#3a94c5' + magenta: '#df69ba' + cyan: '#35a77c' + white: '#dfddc8' + +colors: *everforest_dark_soft + diff --git a/src/configs/shared/i3/config b/src/configs/shared/i3/config new file mode 100644 index 0000000..8d3e320 --- /dev/null +++ b/src/configs/shared/i3/config @@ -0,0 +1,194 @@ +# i3 config file (v4) +# +# Please see https://i3wm.org/docs/userguide.html for a complete reference! +# +# This config file uses keycodes (bindsym) and was written for the QWERTY +# layout. +# +# To get a config file with the same key positions, but for your current +# layout, use the i3-config-wizard +# + +# Font for window titles. Will also be used by the bar unless a different font +# is used in the bar {} block below. +font pango:Hack 16 + +#default_border pixel 1 +#default_floating_border pixel 1 + +# Start XDG autostart .desktop files using dex. See also +# https://wiki.archlinux.org/index.php/XDG_Autostart +exec --no-startup-id dex --autostart --environment i3 + +# The combination of xss-lock, nm-applet and pactl is a popular choice, so +# they are included here as an example. Modify as you see fit. + +# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the +# screen before suspend. Use loginctl lock-session to lock your screen. +exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork + +# NetworkManager is the most popular way to manage wireless networks on Linux, +# and nm-applet is a desktop environment-independent system tray GUI for it. +exec --no-startup-id nm-applet + +# Use pactl to adjust volume in PulseAudio. +set $refresh_i3status killall -SIGUSR1 i3status +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status +bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status +bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status + +# use these keys for focus, movement, and resize directions when reaching for +# the arrows is not convenient +set $up l +set $down k +set $left j +set $right semicolon + +# use Mouse+Mod1 to drag floating windows to their wanted position +floating_modifier Mod1 + +# start a terminal +bindsym Mod1+Return exec alacritty + +# kill focused window +bindsym Mod1+Shift+q kill + +# bindsym Mod1+d exec "rofi -modi drun,run -show drun" +bindsym Mod1+d exec "rofi -show drun -theme Arc-Dark -font 'Hack 16' -eh 1" + +# change focus +bindsym Mod1+$left focus left +bindsym Mod1+$down focus down +bindsym Mod1+$up focus up +bindsym Mod1+$right focus right + +# alternatively, you can use the cursor keys: +bindsym Mod1+Left focus left +bindsym Mod1+Down focus down +bindsym Mod1+Up focus up +bindsym Mod1+Right focus right + +# move focused window +bindsym Mod1+Shift+$left move left +bindsym Mod1+Shift+$down move down +bindsym Mod1+Shift+$up move up +bindsym Mod1+Shift+$right move right + +# alternatively, you can use the cursor keys: +bindsym Mod1+Shift+Left move left +bindsym Mod1+Shift+Down move down +bindsym Mod1+Shift+Up move up +bindsym Mod1+Shift+Right move right + +# split in horizontal orientation +bindsym Mod1+h split h + +# split in vertical orientation +bindsym Mod1+v split v + +# enter fullscreen mode for the focused container +bindsym Mod1+f fullscreen toggle + +# change container layout (stacked, tabbed, toggle split) +bindsym Mod1+s layout stacking +bindsym Mod1+w layout tabbed +bindsym Mod1+e layout toggle split + +# toggle tiling / floating +bindsym Mod1+Shift+space floating toggle + +# change focus between tiling / floating windows +bindsym Mod1+space focus mode_toggle + +# focus the parent container +bindsym Mod1+a focus parent + +# focus the child container +#bindsym Mod1+d focus child + +# move the currently focused window to the scratchpad +bindsym Mod1+Shift+minus move scratchpad + +# Show the next scratchpad window or hide the focused scratchpad window. +# If there are multiple scratchpad windows, this command cycles through them. +bindsym Mod1+minus scratchpad show + +# Define names for default workspaces for which we configure key bindings later on. +# We use variables to avoid repeating the names in multiple places. +set $ws1 "1" +set $ws2 "2" +set $ws3 "3" +set $ws4 "4" +set $ws5 "5" +set $ws6 "6" +set $ws7 "7" +set $ws8 "8" +set $ws9 "9" +set $ws10 "10" + +# switch to workspace +bindsym Mod1+1 workspace number $ws1 +bindsym Mod1+2 workspace number $ws2 +bindsym Mod1+3 workspace number $ws3 +bindsym Mod1+4 workspace number $ws4 +bindsym Mod1+5 workspace number $ws5 +bindsym Mod1+6 workspace number $ws6 +bindsym Mod1+7 workspace number $ws7 +bindsym Mod1+8 workspace number $ws8 +bindsym Mod1+9 workspace number $ws9 +bindsym Mod1+0 workspace number $ws10 + +# move focused container to workspace +bindsym Mod1+Shift+1 move container to workspace number $ws1 +bindsym Mod1+Shift+2 move container to workspace number $ws2 +bindsym Mod1+Shift+3 move container to workspace number $ws3 +bindsym Mod1+Shift+4 move container to workspace number $ws4 +bindsym Mod1+Shift+5 move container to workspace number $ws5 +bindsym Mod1+Shift+6 move container to workspace number $ws6 +bindsym Mod1+Shift+7 move container to workspace number $ws7 +bindsym Mod1+Shift+8 move container to workspace number $ws8 +bindsym Mod1+Shift+9 move container to workspace number $ws9 +bindsym Mod1+Shift+0 move container to workspace number $ws10 + +# reload the configuration file +bindsym Mod1+Shift+c reload +# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +bindsym Mod1+Shift+r restart +# exit i3 (logs you out of your X session) +bindsym Mod1+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" + +# resize window (you can also use the mouse for that) +mode "resize" { + # These bindings trigger as soon as you enter the resize mode + + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym $left resize shrink width 10 px or 10 ppt + bindsym $down resize grow height 10 px or 10 ppt + bindsym $up resize shrink height 10 px or 10 ppt + bindsym $right resize grow width 10 px or 10 ppt + + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + # back to normal: Enter or Escape or Mod1+r + bindsym Return mode "default" + bindsym Escape mode "default" + bindsym Mod1+r mode "default" +} + +bindsym Mod1+r mode "resize" + +# Start i3bar to display a workspace bar (plus the system information i3status +# finds out, if available) +bar { + status_command i3status +} + +exec --no-startup-id redshift -l 43.547302:-96.728333 -g 0.9 diff --git a/src/configs/shared/nvim/init.vim b/src/configs/shared/nvim/init.vim new file mode 100644 index 0000000..09aca69 --- /dev/null +++ b/src/configs/shared/nvim/init.vim @@ -0,0 +1,79 @@ +" Flash screen instead of beep sound +set visualbell + +" Change how vim represents characters on the screen +set encoding=utf-8 + +" Set the encoding of files written +set fileencoding=utf-8 + +" Set line numbers +set number + +" don't break up words at end of window width +set linebreak + +" Specify different areas of the screen where splits should occur +set splitbelow +set splitright + +" Python-specific whitespace file settings +autocmd Filetype python setlocal expandtab tabstop=4 shiftwidth=4 softtabstop=4 +" ts - show existing tab with 4 spaces width +" sw - when indenting with '>', use 4 spaces width +" sts - control and keys to match tabstop + +" General whitespace settings +set shiftwidth=4 +filetype plugin indent on + +" Allow backspace to delete indentation and inserted text +" i.e. how it works in most programs +set backspace=indent,eol,start +" indent allow backspacing over autoindent +" eol allow backspacing over line breaks (join lines) +" start allow backspacing over the start of insert; CTRL-W and CTRL-U +" stop once at the start of insert. + +call plug#begin("$HOME/.config/nvim/plugged") + +" Auto complete +Plug 'Valloric/YouCompleteMe' + +" Fuzzy finder +Plug 'junegunn/fzf' + +" Git gutter +Plug 'airblade/vim-gitgutter' + +" Status bar +Plug 'vim-airline/vim-airline' + +" Git wrapper with :G +Plug 'tpope/vim-fugitive' + +" Editorconfig file support +Plug 'editorconfig/editorconfig-vim' + +" Theme +Plug 'sainnhe/everforest' + +call plug#end() + +if has('termguicolors') + set termguicolors +endif + +set background=dark + +" Set contrast. +" This configuration option should be placed before `colorscheme everforest`. +" Available values: 'hard', 'medium'(default), 'soft' +let g:everforest_background = 'soft' +let g:everforest_better_performance = 1 +let g:everforest_disable_italic_comment = 1 +syntax on +colorscheme everforest + +let g:airline_theme = 'everforest' + diff --git a/src/setup.yaml b/src/setup.yaml new file mode 100644 index 0000000..ee8ca9f --- /dev/null +++ b/src/setup.yaml @@ -0,0 +1,40 @@ +--- +- name: Playbook to manage personal dotfiles + hosts: localhost + connection: local + tasks: + - name: Create folders + file: + path: "{{item}}" + state: directory + loop: + - "$HOME/src" + - "$HOME/bin" + + - include_tasks: tasks/shared_dotfiles.yaml + + - include_tasks: tasks/dnf_packages.yaml + when: ansible_os_family == "RedHat" + + - include_tasks: tasks/pkg_packages.yaml + when: ansible_os_family == "FreeBSD" + + - include_tasks: tasks/desktop.yaml + when: ansible_os_family == "FreeBSD" + + - name: Ensure shell is set to zsh + vars: + current_user: "{{ ansible_user_id }}" + become: yes + become_method: su + user: + name: "{{ current_user }}" + shell: /usr/local/bin/zsh + + - name: Install vim-plug + get_url: + url: https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + dest: "$HOME/.config/nvim/autoload/plug.vim" + + - name: Install vim-plug plugins + shell: nvim +PlugInstall +qall --headless diff --git a/src/tasks/desktop.yaml b/src/tasks/desktop.yaml new file mode 100644 index 0000000..5bf3eb8 --- /dev/null +++ b/src/tasks/desktop.yaml @@ -0,0 +1,51 @@ +--- +- name: Link user home files + file: + src: "{{ item.value.src }}" + dest: "{{ item.value.dest }}" + state: link + with_dict: "{{user_desktop_files}}" + vars: + user_desktop_files: + xinitrc: + src: "{{playbook_dir}}/configs/desktop/home/.xinitrc" + dest: "{{ lookup('env', 'HOME') }}/.xinitrc" + +- name: Copy /usr/local/etc files + become: true + become_method: su + copy: + src: "{{ item.value.src }}" + dest: "{{ item.value.dest }}" + owner: root + group: wheel + mode: u=rw,g=r,o=r + with_dict: "{{user_local_files}}" + vars: + user_local_files: + xorg.conf.d: + src: "{{playbook_dir}}/configs/desktop/usr/local/etc/X11/xorg.conf.d/50-mouse.conf" + dest: "/usr/local/etc/X11/xorg.conf.d/50-mouse.conf" + doas: + src: "{{playbook_dir}}/configs/desktop/usr/local/etc/doas.conf" + dest: "/usr/local/etc/doas.conf" + +- name: Copy system configuration files + become: true + become_method: su + copy: + src: "{{ item.value.src }}" + dest: "{{ item.value.dest }}" + owner: root + group: wheel + mode: u=rw,g=r,o=r + with_dict: "{{system_desktop_files}}" + vars: + system_desktop_files: + etc-rc: + src: "{{playbook_dir}}/configs/desktop/etc/rc.conf" + dest: "/etc/rc.conf" + + boot-loader: + src: "{{playbook_dir}}/configs/desktop/boot/loader.conf" + dest: "/boot/loader.conf" diff --git a/src/tasks/dnf_packages.yaml b/src/tasks/dnf_packages.yaml new file mode 100644 index 0000000..cbf0964 --- /dev/null +++ b/src/tasks/dnf_packages.yaml @@ -0,0 +1,58 @@ +--- +- name: Import 1Password key + become: yes + ansible.builtin.rpm_key: + state: present + key: https://downloads.1password.com/linux/keys/1password.asc + +- name: Add 1Password YUM Repo + become: yes + yum_repository: + name: 1password + description: 1Password Stable Channel + baseurl: https://downloads.1password.com/linux/rpm/stable/$basearch + enabled: yes + gpgcheck: yes + repo_gpgcheck: yes + gpgkey: https://downloads.1password.com/linux/keys/1password.asc + state: present + +- name: Install dnf packages + become: yes + + dnf: + name: "{{ item.key }}" + state: "{{ item.value.state | default('present') }}" + + with_dict: "{{dnf}}" + vars: + dnf: + "@Development tools": + 1password: + alacritty: + cmake: + dmenu: + vim: + feh: + firefox: + fzf: + git: + go: + hack-fonts: + i3-gaps: + i3lock: + i3status: + jq: + neofetch: + neovim: + opendoas: + openssl: + python: + python-devel: + python-neovim: + redshift: + ripgrep: + rsync: + scrot: + wget: + zsh: diff --git a/src/tasks/pkg_packages.yaml b/src/tasks/pkg_packages.yaml new file mode 100644 index 0000000..f55cee2 --- /dev/null +++ b/src/tasks/pkg_packages.yaml @@ -0,0 +1,54 @@ +--- +- name: Install pkg packages + become: yes + become_method: su + + community.general.pkgng: + name: "{{ item.key }}" + state: "{{ item.value.state | default('present') }}" + + with_dict: "{{pkg}}" + vars: + pkg: + 1password-client2: + alacritty: + brlaser: + cmake: + devcpu-data: + drm-kmod: + editors/py-pynvim: + en-freebsd-doc: + feh: + firefox: + fzf: + git: + gnupg: + go: + hack-font: + i3-gaps: + i3lock: + i3status: + jq: + neovim: + openssl: + pfetch: + pkg: + poudriere: + python: + redshift: + ripgrep: + rofi: + rsync: + rust-analyzer: + scrot: + spotify-tui: + spotifyd: + sysutils/ansible: + vim: + virtual_oss: + vscode: + wget: + xclip: + xdg-user-dirs: + xorg: + zsh: diff --git a/src/tasks/shared_dotfiles.yaml b/src/tasks/shared_dotfiles.yaml new file mode 100644 index 0000000..91c8788 --- /dev/null +++ b/src/tasks/shared_dotfiles.yaml @@ -0,0 +1,44 @@ +--- +- name: Create folders for dotfiles + file: + path: "{{item}}" + state: directory + loop: + - "$HOME/.config/nvim/autoload" + - "$HOME/.gnupg" + +- name: Link shared dotfiles + file: + src: "{{ item.value.src }}" + dest: "{{ item.value.dest }}" + state: link + with_dict: "{{dotfiles}}" + vars: + dotfiles: + zshrc: + src: "{{playbook_dir}}/configs/shared/.zshrc" + dest: "{{ lookup('env', 'HOME') }}/.zshrc" + + gitconfig: + src: "{{playbook_dir}}/configs/shared/.gitconfig" + dest: "{{ lookup('env', 'HOME') }}/.gitconfig" + + gdbinit: + src: "{{playbook_dir}}/configs/shared/.gdbinit" + dest: "{{ lookup('env', 'HOME') }}/.gdbinit" + + vimrc: + src: "{{playbook_dir}}/configs/shared/nvim/init.vim" + dest: "{{ lookup('env', 'HOME') }}/.config/nvim/init.vim" + + tmux: + src: "{{playbook_dir}}/configs/shared/.tmux.conf" + dest: "{{ lookup('env', 'HOME') }}/.tmux.conf" + + alacritty: + src: "{{playbook_dir}}/configs/shared/alacritty" + dest: "{{ lookup('env', 'HOME') }}/.config/alacritty" + + i3: + src: "{{playbook_dir}}/configs/shared/i3" + dest: "{{ lookup('env', 'HOME') }}/.config/i3" -- cgit v1.2.3