aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Triguba <eugenetriguba@gmail.com>2022-05-30 10:03:45 -0500
committerEugene Triguba <eugenetriguba@gmail.com>2022-05-30 10:03:45 -0500
commit03a83252b0adc365bb183f77f555e2add33c1ba1 (patch)
tree450d2526ed03d24fb99afd7b411f6aeb4cc79f74
parentAdd wallpaper and vim navigation keys for i3 (diff)
downloaddotfiles-03a83252b0adc365bb183f77f555e2add33c1ba1.zip
Add bsd updates
-rw-r--r--src/configs/desktop/boot/loader.conf3
-rw-r--r--src/configs/desktop/etc/devfs.rules3
-rw-r--r--src/configs/desktop/etc/rc.conf4
-rw-r--r--src/configs/desktop/usr/local/etc/spotifyd.conf5
-rw-r--r--src/configs/shared/.zshrc6
-rw-r--r--src/configs/shared/i3/config23
-rw-r--r--src/configs/shared/i3status/config53
-rw-r--r--src/configs/shared/nvim/init.vim13
-rw-r--r--src/setup.yaml11
-rw-r--r--src/tasks/desktop.yaml5
-rw-r--r--src/tasks/pkg_packages.yaml3
-rw-r--r--src/tasks/shared_dotfiles.yaml5
12 files changed, 122 insertions, 12 deletions
diff --git a/src/configs/desktop/boot/loader.conf b/src/configs/desktop/boot/loader.conf
index 0305c24..fa8fccf 100644
--- a/src/configs/desktop/boot/loader.conf
+++ b/src/configs/desktop/boot/loader.conf
@@ -19,3 +19,6 @@ iwm9260fw_load="YES"
# Boot
autoboot_delay="5"
+# Virtualbox
+vboxdrv_load="YES"
+
diff --git a/src/configs/desktop/etc/devfs.rules b/src/configs/desktop/etc/devfs.rules
new file mode 100644
index 0000000..a717af9
--- /dev/null
+++ b/src/configs/desktop/etc/devfs.rules
@@ -0,0 +1,3 @@
+[system=10]
+add path 'usb/*' mode 0660 group operator
+
diff --git a/src/configs/desktop/etc/rc.conf b/src/configs/desktop/etc/rc.conf
index fd5d121..d14aabb 100644
--- a/src/configs/desktop/etc/rc.conf
+++ b/src/configs/desktop/etc/rc.conf
@@ -25,3 +25,7 @@ bthidd_enable="YES"
spotifyd_enable="YES"
+# Virtualbox
+vboxnet_enable="YES"
+devfs_system_ruleset="system"
+
diff --git a/src/configs/desktop/usr/local/etc/spotifyd.conf b/src/configs/desktop/usr/local/etc/spotifyd.conf
new file mode 100644
index 0000000..d9f7653
--- /dev/null
+++ b/src/configs/desktop/usr/local/etc/spotifyd.conf
@@ -0,0 +1,5 @@
+[global]
+username = "eugene.triguba"
+password = "ACq-mNn-SST-B4a"
+backend = "portaudio"
+device = "/dev/dsp"
diff --git a/src/configs/shared/.zshrc b/src/configs/shared/.zshrc
index 89f96cc..53ff1ac 100644
--- a/src/configs/shared/.zshrc
+++ b/src/configs/shared/.zshrc
@@ -5,7 +5,8 @@ precmd() {
vcs_info
}
setopt prompt_subst
-PROMPT=' %~ ${vcs_info_msg_0_}%# '
+NEWLINE=$'\n'
+PROMPT=' %2~ ${vcs_info_msg_0_}%# '
export EDITOR="nvim"
export BROWSER="firefox"
@@ -73,3 +74,6 @@ gocover() {
go test -coverprofile=$t $@ && go tool cover -html=$t && unlink $t
}
+ip() {
+ ifconfig | jc --ifconfig | jq '.[] | select(.name=="em0") | {ipv4_addr, ipv6_addr}'
+}
diff --git a/src/configs/shared/i3/config b/src/configs/shared/i3/config
index 6688365..993a56b 100644
--- a/src/configs/shared/i3/config
+++ b/src/configs/shared/i3/config
@@ -30,8 +30,8 @@ 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 XF86AudioRaiseVolume exec --no-startup-id mixer vol +10 && $refresh_i3status
+bindsym XF86AudioLowerVolume exec --no-startup-id mixer vol -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
@@ -188,12 +188,27 @@ bar {
status_command i3status
}
-exec --no-startup-id redshift -l 43.547302:-96.728333 -g 0.9
+exec --no-startup-id redshift -l 43.547302:-96.728333 -m randr -t 6500:3500
exec --no-startup-id feh --bg-scale $HOME/Pictures/wallpaper.jpg
+exec --no-startup-id spotifyd
for_window [class=".*"] border pixel 0
gaps inner 20
gaps outer 10
-smart_gaps on
+#smart_gaps on
smart_borders on
+#bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound
+
+# Sreen brightness controls
+#bindsym XF86MonBrightnessUp exec xbacklight -inc 20 # increase screen brightness
+#bindsym XF86MonBrightnessDown exec xbacklight -dec 20 # decrease screen brightness
+
+# Touchpad controls
+#bindsym XF86TouchpadToggle exec /some/path/toggletouchpad.sh # toggle touchpad
+
+# Media player controls
+#bindsym XF86AudioPlay exec playerctl play
+#bindsym XF86AudioPause exec playerctl pause
+#bindsym XF86AudioNext exec playerctl next
+#bindsym XF86AudioPrev exec playerctl previous
diff --git a/src/configs/shared/i3status/config b/src/configs/shared/i3status/config
new file mode 100644
index 0000000..ba81c3a
--- /dev/null
+++ b/src/configs/shared/i3status/config
@@ -0,0 +1,53 @@
+# i3status configuration file.
+# see "man i3status" for documentation.
+
+# It is important that this file is edited as UTF-8.
+# The following line should contain a sharp s:
+# ß
+# If the above line is not correctly displayed, fix your editor first!
+
+general {
+ colors = true
+ interval = 5
+}
+
+order += "ipv6"
+order += "wireless _first_"
+order += "ethernet _first_"
+order += "battery all"
+order += "disk /"
+order += "load"
+order += "memory"
+order += "tztime local"
+
+wireless _first_ {
+ format_up = "W: (%quality at %essid) %ip"
+ format_down = "W: down"
+}
+
+ethernet _first_ {
+ format_up = "E: %ip (%speed)"
+ format_down = "E: down"
+}
+
+battery all {
+ format = "%status %percentage %remaining"
+}
+
+disk "/" {
+ format = "%avail"
+}
+
+load {
+ format = "%1min"
+}
+
+memory {
+ format = "%used | %available"
+ threshold_degraded = "1G"
+ format_degraded = "MEMORY < %available"
+}
+
+tztime local {
+ format = "%Y-%m-%d %H:%M:%S"
+}
diff --git a/src/configs/shared/nvim/init.vim b/src/configs/shared/nvim/init.vim
index 09aca69..0c98b73 100644
--- a/src/configs/shared/nvim/init.vim
+++ b/src/configs/shared/nvim/init.vim
@@ -34,14 +34,13 @@ set backspace=indent,eol,start
" 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'
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
" Git gutter
Plug 'airblade/vim-gitgutter'
@@ -58,6 +57,9 @@ Plug 'editorconfig/editorconfig-vim'
" Theme
Plug 'sainnhe/everforest'
+" Terraform
+Plug 'hashivim/vim-terraform'
+
call plug#end()
if has('termguicolors')
@@ -66,14 +68,11 @@ 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
+let g:airline_theme = 'everforest'
+
syntax on
colorscheme everforest
-let g:airline_theme = 'everforest'
-
diff --git a/src/setup.yaml b/src/setup.yaml
index 3e72ae0..5534267 100644
--- a/src/setup.yaml
+++ b/src/setup.yaml
@@ -29,6 +29,17 @@
- include_tasks: tasks/desktop.yaml
when: ansible_os_family == "FreeBSD"
+ - name: Ensure user is setup correctly
+ become: yes
+ become_method: su
+ ansible.builtin.user:
+ name: eugene
+ groups: wheel,vboxusers,operator
+ state: present
+ generate_ssh_key: yes
+ ssh_key_bits: 2048
+ ssh_key_file: $HOME/.ssh/id_rsa
+
- name: Ensure shell is set to zsh
vars:
current_user: "{{ ansible_user_id }}"
diff --git a/src/tasks/desktop.yaml b/src/tasks/desktop.yaml
index 5bf3eb8..d3630b5 100644
--- a/src/tasks/desktop.yaml
+++ b/src/tasks/desktop.yaml
@@ -46,6 +46,11 @@
src: "{{playbook_dir}}/configs/desktop/etc/rc.conf"
dest: "/etc/rc.conf"
+ etc-devfs:
+ src: "{{playbook_dir}}/configs/desktop/etc/devfs.rules"
+ dest: "/etc/devfs.rules"
+
boot-loader:
src: "{{playbook_dir}}/configs/desktop/boot/loader.conf"
dest: "/boot/loader.conf"
+
diff --git a/src/tasks/pkg_packages.yaml b/src/tasks/pkg_packages.yaml
index f55cee2..edd3fb0 100644
--- a/src/tasks/pkg_packages.yaml
+++ b/src/tasks/pkg_packages.yaml
@@ -18,6 +18,7 @@
drm-kmod:
editors/py-pynvim:
en-freebsd-doc:
+ emulators/virtualbox-ose:
feh:
firefox:
fzf:
@@ -44,6 +45,8 @@
spotify-tui:
spotifyd:
sysutils/ansible:
+ sysutils/vagrant:
+ textproc/py-jc:
vim:
virtual_oss:
vscode:
diff --git a/src/tasks/shared_dotfiles.yaml b/src/tasks/shared_dotfiles.yaml
index 91c8788..f846372 100644
--- a/src/tasks/shared_dotfiles.yaml
+++ b/src/tasks/shared_dotfiles.yaml
@@ -42,3 +42,8 @@
i3:
src: "{{playbook_dir}}/configs/shared/i3"
dest: "{{ lookup('env', 'HOME') }}/.config/i3"
+
+ i3status:
+ src: "{{playbook_dir}}/configs/shared/i3status"
+ dest: "{{ lookup('env', 'HOME') }}/.config/i3status"
+