Merge branch 'master' of ssh://git.lyte.dev:2222/lytedev/dotfiles

This commit is contained in:
Daniel Flanagan 2021-03-01 14:49:18 -06:00
commit 0e75632ebe
Signed by: lytedev
GPG Key ID: 5B2020A0F9921EF4
8 changed files with 63 additions and 3 deletions

View File

@ -5,10 +5,12 @@ profile desktop-H {
exec "$HOME/.config/lytedev-dotfiles/apps/de/kanshi/desktop-H-workspaces.sh" exec "$HOME/.config/lytedev-dotfiles/apps/de/kanshi/desktop-H-workspaces.sh"
} }
profile desktop-H { profile tv4k {
output "Samsung Electric Company SyncMaster H1AK500000" enable mode 3840x2160 position 0,0 scale 1 transform normal output "Samsung Electric Company CF791 HTRJ500315" disable
output "Dell Inc. DELL U2719DC 5DL4QS2" disable output "Dell Inc. DELL U2719DC 5DL4QS2" disable
output "Dell Inc. DELL U2719DC 9DL4QS2" disable output "Dell Inc. DELL U2719DC 9DL4QS2" disable
output "Samsung Electric Company SyncMaster H1AK500000" enable mode 4096x2160@60Hz position 0,0 scale 1 transform normal
# exec "$HOME/.config/lytedev-dotfiles/apps/de/kanshi/desktop-H-workspaces.sh"
} }
profile desktop-H { profile desktop-H {

View File

@ -51,6 +51,7 @@ bindsym $mod+shift+alt+return exec kitty
bindsym $mod+c kill bindsym $mod+c kill
bindsym $mod+shift+c kill # TODO: kill -9? bindsym $mod+shift+c kill # TODO: kill -9?
bindsym $mod+space exec $dfpbin/app-launcher bindsym $mod+space exec $dfpbin/app-launcher
bindsym $mod+shift+s exec $dfpbin/clipshot
bindsym $mod+e exec thunar bindsym $mod+e exec thunar
bindsym $mod+shift+r reload bindsym $mod+shift+r reload
bindsym $mod+control+Escape exit bindsym $mod+control+Escape exit
@ -172,6 +173,7 @@ client.unfocused #111111 #111111 #ffffff #111111 #111111
exec_always 'killall kanshi; kanshi' exec_always 'killall kanshi; kanshi'
exec mako exec mako
exec pipewire
exec_always notify-send -a "Sway" -i ~/.wallpaper "Sway configuration loaded." exec_always notify-send -a "Sway" -i ~/.wallpaper "Sway configuration loaded."
bar { bar {

View File

@ -1,7 +1,7 @@
{ {
"layer": "top", "layer": "top",
"position": "bottom", "position": "bottom",
"output": ["DP-1", "eDP-1"], "output": ["DP-1"],
"height": 32, "height": 32,
"modules-left": ["sway/workspaces"], "modules-left": ["sway/workspaces"],
"modules-center": ["clock"], "modules-center": ["clock"],

View File

@ -19,6 +19,7 @@ set -Ux BROWSER firefox-developer-edition
set -Ux ERL_AFLAGS "-kernel shell_history enabled -kernel shell_history_file_bytes 1024000" # iex history set -Ux ERL_AFLAGS "-kernel shell_history enabled -kernel shell_history_file_bytes 1024000" # iex history
set -Ux LESS "-r" set -Ux LESS "-r"
set -Ux LS_COLORS 'ow=01;36;40' # more sane ls colors set -Ux LS_COLORS 'ow=01;36;40' # more sane ls colors
set -Ux EXA_COLORS '*=0'
set -Ux EDITOR nvim set -Ux EDITOR nvim
set -Ux VISUAL nvim set -Ux VISUAL nvim
set -Ux PAGER less set -Ux PAGER less

23
bin/backupify Executable file
View File

@ -0,0 +1,23 @@
#!/usr/bin/env fish
set host rift
set dir /storage/daniel/backups
set ext .tar.zstd.gpg
if not set -q argv[1]
echo "No directory provided"
exit 2
end
if not test -d $argv[1]
echo "Invalid directory given: $argv[1]"
exit 1
end
set fn (date +%Y%m%d_%H%M%S)(basename $argv[1])
pushd (dirname $argv[1])
tar cvf - (basename $argv[1]) 2>/dev/null |
zstd --ultra -T2 -22 |
gpg --encrypt --recipient daniel@lyte.dev |
ssh $host "cat - > $dir/$fn$ext"
popd
# TODO: checksum?
echo "Uploaded to host rift via ssh at $dir/$fn$ext"

14
bin/bupstash-wip Executable file
View File

@ -0,0 +1,14 @@
#!/usr/bin/env fish
set keyfile $HOME/.bupstash/backups.key
if not test -f $keyfile
echo Loading key from pass...
pass bupstash | tail -n+3 > $keyfile; or begin;
echo Failed to load key from pass
exit 1
end
end
set rift ssh://rift/storage/daniel-backups
bupstash init --repository $rift

18
bin/unbackupify Executable file
View File

@ -0,0 +1,18 @@
#!/usr/bin/env fish
set host rift
set dir /storage/daniel/backups
set ext .tar.zstd.gpg
if not set -q argv[1]
echo "No backup filename provided"
exit 2
end
# TODO: autocomplete?
# TODO: checksum?
set fn $argv[1]
ssh $host "cat $dir/$fn$ext" |
gpg --decrypt |
zstd --ultra -T2 -22 -dc |
tar -xvf -
echo "Restored!"

0
env/nix/machines/virt.nix vendored Normal file
View File