Compare commits

...

6 Commits

20 changed files with 179 additions and 149 deletions

View File

@ -31,11 +31,14 @@ if test -f ~/.cargo/env
source ~/.cargo/env
end
for f in (test -d $_agw_dir_local/fish &&
find $_agw_dir_local/fish -type f |
env LC_ALL=C sort) \
(find $_agw_dir_rc/fish -type f |
env LC_ALL=C sort)
function _agw_get_autoexec -d "Function for bootstrapping. Finds auto-execs."
if test -d $argv[1]
find $argv[1] -type f | env LC_ALL=C sort
end
end
for f in (_agw_get_autoexec $_agw_dir_local/fish) \
(_agw_get_autoexec $_agw_dir_rc/fish)
source $f
end

View File

@ -1,6 +1,6 @@
[Appearance]
ColorScheme=Magenta
Font=Go Mono,10,-1,5,50,0,0,0,0,0,Regular
ColorScheme=Gloom Dark
Font=Dina,10,-1,5,50,0,0,0,0,0,Regular
LineSpacing=0
UseFontLineChararacters=false

View File

@ -19,14 +19,19 @@ while read f t
end < files
# copy font configs
find /etc/fonts/conf.d/*.conf > fonts/conflist
function copy-confd -a path out
find $path/*.conf > $out/conflist
for f in /etc/fonts/conf.d/*.conf
if not test -L "$f"
cp $f fonts
for f in $path/*.conf
if not test -L "$f"
cp $f $out
end
end
end
copy-confd /etc/fonts/conf.d system/fonts/
copy-confd /etc/X11/xorg.conf.d system/xorg/
# copy vim package names
tree -dL 3 ~/.vim/pack > vim/packages

5
files
View File

@ -1,12 +1,11 @@
fonts/fontconfig.sh /etc/profile.d/freetype2.sh
system/fonts/fontconfig.sh /etc/profile.d/fontconfig.sh
network /etc/systemd/network/*
network/icecast.xml /etc/icecast.xml
network/motsognir.conf /etc/motsognir.conf
network/mpd.conf ~/.config/mpd/mpd.conf
network/nginx.conf /etc/nginx/nginx.conf
system/61-xwiimote-custom.conf /etc/X11/xorg.conf.d/61-xwiimote-custom.conf
system/grub /etc/default/grub
system/progm.xkb /usr/share/X11/xkb/symbols/progm
system/sans.service /etc/systemd/system/sans.service
system/services/sans.service /etc/systemd/system/sans.service
themes ~/.slade3/text_styles/*
themes/userChrome.css ~/.mozilla/firefox/*/chrome/userChrome.css

View File

@ -1,7 +1,83 @@
#!/usr/bin/env fish
function vm-qemu -d "Frontend to QEMU"
$_agw_dir_rc/virtual-machines/QEMU/vm-qemu $argv
# Args
argparse \
--name "vm-qemu" \
--min-args 1 \
'V/version=' \
'i/install' \
-- \
$argv
or exit 1
set cfg $argv[1]
set -e argv[1]
# Config
source $_agw_dir_rc/virtual-machines/QEMU/$cfg
# Devices
test "$_vga"
and set vga $_vga
or set vga vmware
test "$_soundhw"
and set soundhw $_soundhw
or set soundhw hda
for dev in $_devs
set -a _args --device $dev
end
# Machine
test "$_cpu"
and set cpu $_cpu
or set cpu host
if test "$_arch" = "i386" || test "$_arch" = "x86_64"
set -p _args \
--machine accel=kvm \
--usb
end
# Versioning
test "$_flag_version"
and set ver $_flag_version
or set ver $_ver
# Disk Media
set image "/media/store/vm/$cfg/image$ver"
set boot_order c
# Install Media
set media "/media/store/osmedia"
set install (string replace "_ver_" "$ver" "$_install")
set boot (string replace "_ver_" "$ver" "$_boot")
if test "$_flag_install"
set boot_order d
set -p _args --drive file="$media/$install",media=cdrom,readonly
if test "$boot"
set boot_order a
set -p _args --drive file="$media/$boot",format=raw,if=floppy,readonly
end
end
# Run!
set -a _args $argv
env QEMU_AUDIO_DRV=pa "qemu-system-$_arch" \
--boot order="$boot_order" \
--cpu "$cpu" \
--display sdl,gl=on \
--drive file="$image",format=qcow2,media=disk \
--monitor stdio \
--soundhw "$soundhw" \
--vga "$vga" \
-m "$_mem" \
$_args
end
complete -c vm-qemu -xa "(ls $_agw_dir_rc/virtual-machines/QEMU)"

View File

@ -1,6 +0,0 @@
Arch Linux uses presets for global font configs, so only font configs I've
written are stored here. The rest can be assumed to have been from Arch's
default packaged configurations.
I do not use per-user font configuration because it does not allow SDDM to use
the correct fonts. All of these configs come from </etc/fonts/conf.d/>.

View File

@ -10,7 +10,7 @@ state_file "~/.config/mpd/state"
sticker_file "~/.config/mpd/sticker.sql"
audio_output {
type "openal"
type "pulse"
name "Monitor Output"
}
@ -22,20 +22,3 @@ audio_output {
path "~/.config/mpd/fifo"
}
audio_output {
type "shout"
name "Heaven Is In Space"
always_on "yes"
encoder "vorbis"
format "44100:16:2"
quality "4.0"
host "127.0.0.1"
mount "/stream.ogg"
password "password removed"
port "8000"
protocol "icecast2"
public "yes"
}

View File

@ -1,19 +0,0 @@
Section "InputClass"
Identifier "Nintendo Wii Remote"
MatchProduct "Nintendo Wii Remote"
MatchDevicePath "/dev/input/event*"
Option "Ignore" "off"
Driver "xwiimote"
Option "MotionSource" "ir"
Option "MPNormalization" "On"
Option "MPCalibrationFactor" "5000"
Option "MPZScale" "-1"
Option "MapA" "left-button"
Option "MapIRA" "left-button"
Option "MapB" "right-button"
Option "MapIRB" "right-button"
Option "MapOne" "KEY_SPACE"
Option "MapIROne" "KEY_SPACE"
Option "MapTwo" "KEY_S"
Option "MapIRTwo" "KEY_S"
EndSection

View File

@ -2,9 +2,6 @@
/etc/fonts/conf.d/10-scale-bitmap-fonts.conf
/etc/fonts/conf.d/10-sub-pixel-rgb.conf
/etc/fonts/conf.d/11-lcdfilter-default.conf
/etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf
/etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf
/etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf
/etc/fonts/conf.d/20-unhint-small-vera.conf
/etc/fonts/conf.d/30-metric-aliases.conf
/etc/fonts/conf.d/30-win32-aliases.conf
@ -14,17 +11,11 @@
/etc/fonts/conf.d/49-sansserif.conf
/etc/fonts/conf.d/50-user.conf
/etc/fonts/conf.d/51-local.conf
/etc/fonts/conf.d/56-ttf-twemoji-color.conf
/etc/fonts/conf.d/60-generic.conf
/etc/fonts/conf.d/60-latin.conf
/etc/fonts/conf.d/65-fonts-persian.conf
/etc/fonts/conf.d/65-khmer.conf
/etc/fonts/conf.d/65-nonlatin.conf
/etc/fonts/conf.d/66-noto-mono.conf
/etc/fonts/conf.d/66-noto-sans.conf
/etc/fonts/conf.d/66-noto-serif.conf
/etc/fonts/conf.d/67-defaults.conf
/etc/fonts/conf.d/69-unifont.conf
/etc/fonts/conf.d/70-no-bitmaps.conf
/etc/fonts/conf.d/80-delicious.conf
/etc/fonts/conf.d/90-synthetic.conf

View File

@ -0,0 +1,7 @@
Section "ServerLayout"
Identifier "ServerLayout0"
Option "StandbyTime" "0"
Option "SuspendTime" "0"
Option "OffTime" "0"
Option "BlankTime" "0"
EndSection

View File

@ -0,0 +1,5 @@
Section "Device"
Identifier "AMD"
Driver "amdgpu"
Option "TearFree" "true"
EndSection

View File

@ -0,0 +1,20 @@
Section "InputClass"
Identifier "Nintendo Wii Remote Raw Input Blacklist"
MatchProduct "Nintendo Wii Remote"
MatchDevicePath "/dev/input/event*"
Option "Ignore" "on"
EndSection
Section "InputClass"
Identifier "Nintendo Wii Remote Classic Controller Whitelist"
MatchProduct "Nintendo Wii Remote Classic Controller"
MatchDevicePath "/dev/input/event*"
Option "Ignore" "off"
EndSection
Section "InputClass"
Identifier "Nintendo Wii Remote Pro Controller Whitelist"
MatchProduct "Nintendo Wii Remote Pro Controller"
MatchDevicePath "/dev/input/event*"
Option "Ignore" "off"
EndSection

View File

@ -0,0 +1,23 @@
Section "InputClass"
Identifier "Nintendo Wii Remote"
MatchProduct "Nintendo Wii Remote"
MatchDevicePath "/dev/input/event*"
Option "Ignore" "off"
Driver "xwiimote"
EndSection
Section "InputClass"
Identifier "Nintendo Wii Remote Classic Controller Whitelist"
MatchProduct "Nintendo Wii Remote Classic Controller"
MatchDevicePath "/dev/input/event*"
Option "Ignore" "off"
Driver "evdev"
EndSection
Section "InputClass"
Identifier "Nintendo Wii Remote Pro Controller Whitelist"
MatchProduct "Nintendo Wii Remote Pro Controller"
MatchDevicePath "/dev/input/event*"
Option "Ignore" "off"
Driver "evdev"
EndSection

View File

@ -0,0 +1,19 @@
Section "InputClass"
Identifier "Nintendo Wii Remote"
MatchProduct "Nintendo Wii Remote"
MatchDevicePath "/dev/input/event*"
Option "Ignore" "off"
Driver "xwiimote"
Option "MotionSource" "ir"
Option "MPNormalization" "On"
Option "MPCalibrationFactor" "5000"
Option "MPZScale" "-1"
Option "MapA" "left-button"
Option "MapIRA" "left-button"
Option "MapB" "right-button"
Option "MapIRB" "right-button"
Option "MapOne" "KEY_SPACE"
Option "MapIROne" "KEY_SPACE"
Option "MapTwo" "KEY_S"
Option "MapIRTwo" "KEY_S"
EndSection

5
system/xorg/conflist Normal file
View File

@ -0,0 +1,5 @@
/etc/X11/xorg.conf.d/10-monitor.conf
/etc/X11/xorg.conf.d/20-amdgpu.conf
/etc/X11/xorg.conf.d/50-fix-xwiimote.conf
/etc/X11/xorg.conf.d/60-xwiimote.conf
/etc/X11/xorg.conf.d/61-xwiimote-custom.conf

View File

@ -17,7 +17,7 @@
│   ├── vim-gdscript3
│   ├── vim-polyglot
│   ├── vim-qt-cpp -> /home/marrub/src/vim/vim-qt-cpp
│   ├── vim-quakec
│   ├── vim-quakec -> /home/marrub/src/vim/vim-quakec
│   └── vim-zscript -> /home/marrub/src/vim/vim-zscript
└── 20_features
├── opt

View File

@ -1,81 +0,0 @@
#!/usr/bin/env fish
# Args
argparse \
--name "vm-qemu" \
--min-args 1 \
'V/version=' \
'i/install' \
-- \
$argv
or exit 1
set cfg $argv[1]
set -e argv[1]
# Config
source $_agw_dir_rc/virtual-machines/QEMU/$cfg
# Devices
test "$_vga"
and set vga $_vga
or set vga vmware
test "$_soundhw"
and set soundhw $_soundhw
or set soundhw hda
for dev in $_devs
set -a _args --device $dev
end
# Machine
test "$_cpu"
and set cpu $_cpu
or set cpu host
if test "$_arch" = "i386" || test "$_arch" = "x86_64"
set -p _args \
--machine accel=kvm \
--usb
end
# Versioning
test "$_flag_version"
and set ver $_flag_version
or set ver $_ver
# Disk Media
set image "/media/store/vm/$cfg/image$ver"
set boot_order c
# Install Media
set media "/media/store/osmedia"
set install (string replace "_ver_" "$ver" "$_install")
set boot (string replace "_ver_" "$ver" "$_boot")
if test "$_flag_install"
set boot_order d
set -p _args --drive file="$media/$install",media=cdrom,readonly
if test "$boot"
set boot_order a
set -p _args --drive file="$media/$boot",format=raw,if=floppy,readonly
end
end
# Run!
set -a _args $argv
env QEMU_AUDIO_DRV=pa "qemu-system-$_arch" \
--boot order="$boot_order" \
--cpu "$cpu" \
--display sdl,gl=on \
--drive file="$image",format=qcow2,media=disk \
--monitor stdio \
--soundhw "$soundhw" \
--vga "$vga" \
-m "$_mem" \
$_args
## EOF