diff options
27 files changed, 191 insertions, 1040 deletions
diff --git a/boot/boot.txt b/boot/boot.txt new file mode 100755 index 00000000..1bb642a9 --- /dev/null +++ b/boot/boot.txt @@ -0,0 +1,34 @@ +gpio set 98 # Enable vibrator + +setenv bootargs loglevel=4 console=${console} console=tty0 cryptdevice=UUID=5f5bcfd4-816c-4a69-97b2-0dae88dc7c0c:root root=/dev/mapper/root rw rootwait quiet + +echo "Loading kernel..." +load mmc ${mmc_bootdev}:1 ${ramdisk_addr_r} ${bootdir}/Image.gz + +echo "Uncompressing kernel..." +unzip ${ramdisk_addr_r} ${kernel_addr_r} + +echo "Loading initramfs..." +load mmc ${mmc_bootdev}:1 ${ramdisk_addr_r} ${bootdir}/initramfs-linux.img +setenv ramdisk_size ${filesize} + +echo "Loading dtb..." +load mmc ${mmc_bootdev}:1 ${fdt_addr_r} ${bootdir}/dtbs/${fdtfile} + +echo Resizing FDT +fdt addr ${fdt_addr_r} +fdt resize + +echo Adding FTD RAM clock +fdt mknode / memory +fdt set /memory ram_freq ${ram_freq} +fdt list /memory + +echo Loading user script +setenv user_scriptaddr 0x61dbc200 +load mmc ${mmc_bootdev}:1 ${user_scriptaddr} ${bootdir}/user.scr +if test $? -eq 0; then source ${user_scriptaddr}; else echo No user script found; fi + +echo "Booting..." +gpio clear 98 # Disable vibrator +booti ${kernel_addr_r} ${ramdisk_addr_r}:0x${ramdisk_size} ${fdt_addr_r} diff --git a/etc/.cfgl/config b/etc/.cfgl/config index 57825631..4f0d404d 100644 --- a/etc/.cfgl/config +++ b/etc/.cfgl/config @@ -11,9 +11,9 @@ fetch = +refs/heads/*:refs/remotes/origin/* [commit] gpgsign = false -[branch "master"] +[branch "pp"] remote = origin - merge = refs/heads/master + merge = refs/heads/pp [remote "usb"] url = /run/media/xyz/bd0/git_repos/config_local_arch fetch = +refs/heads/*:refs/remotes/usb/* diff --git a/etc/NetworkManager/dispatcher.d/90-sbar b/etc/NetworkManager/dispatcher.d/90-sbar deleted file mode 100755 index c45232da..00000000 --- a/etc/NetworkManager/dispatcher.d/90-sbar +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -case "$2" in - up|down) kill -RTMIN+2 $(pidof -x sbar);; -esac diff --git a/etc/crypttab b/etc/crypttab index 902c1e99..dc3e2417 100644 --- a/etc/crypttab +++ b/etc/crypttab @@ -11,4 +11,4 @@ # swap /dev/sdx4 /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256 # vol /dev/sdb7 none -home UUID=869e19c8-ece3-46ee-8650-755fc73a6254 +home UUID=b719aa8b-1f53-4069-bd9b-5edfb450f85a /etc/cryptsetup-keys.d/home.key diff --git a/etc/crypttab.initramfs b/etc/crypttab.initramfs deleted file mode 100644 index 119203d4..00000000 --- a/etc/crypttab.initramfs +++ /dev/null @@ -1 +0,0 @@ -root UUID=c6017a51-e03f-488b-8fdc-50ea09b8b7e4 none password-echo=no diff --git a/etc/default/grub b/etc/default/grub deleted file mode 100644 index 968a60ca..00000000 --- a/etc/default/grub +++ /dev/null @@ -1,63 +0,0 @@ -# GRUB boot loader configuration - -GRUB_DEFAULT=0 -GRUB_TIMEOUT=5 -GRUB_DISTRIBUTOR="Arch" -GRUB_CMDLINE_LINUX_DEFAULT="loglevel=3 quiet intel_pstate=disable" -GRUB_CMDLINE_LINUX="" - -# Preload both GPT and MBR modules so that they are not missed -GRUB_PRELOAD_MODULES="part_gpt part_msdos" - -# Uncomment to enable booting from LUKS encrypted devices -#GRUB_ENABLE_CRYPTODISK=y - -# Set to 'countdown' or 'hidden' to change timeout behavior, -# press ESC key to display menu. -GRUB_TIMEOUT_STYLE=menu - -# Uncomment to use basic console -GRUB_TERMINAL_INPUT=console - -# Uncomment to disable graphical terminal -#GRUB_TERMINAL_OUTPUT=console - -# The resolution used on graphical terminal -# note that you can use only modes which your graphic card supports via VBE -# you can see them in real GRUB with the command `videoinfo' -GRUB_GFXMODE=auto - -# Uncomment to allow the kernel use the same resolution used by grub -GRUB_GFXPAYLOAD_LINUX=keep - -# Uncomment if you want GRUB to pass to the Linux kernel the old parameter -# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" -#GRUB_DISABLE_LINUX_UUID=true - -# Uncomment to disable generation of recovery mode menu entries -GRUB_DISABLE_RECOVERY=true - -# Uncomment and set to the desired menu colors. Used by normal and wallpaper -# modes only. Entries specified as foreground/background. -#GRUB_COLOR_NORMAL="light-blue/black" -#GRUB_COLOR_HIGHLIGHT="light-cyan/blue" - -# Uncomment one of them for the gfx desired, a image background or a gfxtheme -#GRUB_BACKGROUND="/path/to/wallpaper" -#GRUB_THEME="/path/to/gfxtheme" - -# Uncomment to get a beep at GRUB start -#GRUB_INIT_TUNE="480 440 1" - -# Uncomment to make GRUB remember the last selection. This requires -# setting 'GRUB_DEFAULT=saved' above. -#GRUB_SAVEDEFAULT=true - -# Uncomment to disable submenus in boot menu -#GRUB_DISABLE_SUBMENU=y - -# Probing for other operating systems is disabled for security reasons. Read -# documentation on GRUB_DISABLE_OS_PROBER, if still want to enable this -# functionality install os-prober and uncomment to detect and include other -# operating systems. -#GRUB_DISABLE_OS_PROBER=false @@ -3,12 +3,10 @@ # <file system> <dir> <type> <options> <dump> <pass> # /dev/mapper/root -UUID=e8eac98f-5a78-46fd-8d1f-e73d978c4e74 / ext4 rw,relatime 0 1 +UUID=ddd8d494-15e0-4eb7-850c-dcea34c678f3 / ext4 rw,relatime 0 1 -# /dev/sdb1 -UUID=86f035fe-aca9-4942-9d14-7473081352f8 /boot ext4 rw,relatime 0 2 +# /dev/sda1 +UUID=36CA-FD61 /boot vfat rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=ascii,shortname=mixed,utf8,errors=remount-ro 0 2 # /dev/mapper/home -UUID=a2aa24a7-27a4-419f-bbae-3d8c12331af8 /home ext4 rw,relatime 0 2 - -/swapfile none swap defaults 0 0 +UUID=c7852f40-5ff4-4dfe-afe9-842794617af3 /home ext4 rw,relatime 0 2 diff --git a/etc/mkinitcpio.conf b/etc/mkinitcpio.conf index 2909c571..30baa0ca 100644 --- a/etc/mkinitcpio.conf +++ b/etc/mkinitcpio.conf @@ -49,10 +49,10 @@ FILES=() # ## NOTE: If you have /usr on a separate partition, you MUST include the # usr and fsck hooks. -HOOKS=(base systemd autodetect keyboard modconf block sd-encrypt filesystems fsck) +HOOKS=(base udev autodetect keyboard modconf block osk-sdl encrypt filesystems fsck) # COMPRESSION -# Use this to compress the initramfs image. By default, zstd compression +# Use this to compress the initramfs image. By default, gazip compression # is used. Use 'cat' to create an uncompressed image. #COMPRESSION="zstd" #COMPRESSION="gzip" diff --git a/etc/myconf/cfgl_meta b/etc/myconf/cfgl_meta index 8b2cbd7a..19130d05 100644 --- a/etc/myconf/cfgl_meta +++ b/etc/myconf/cfgl_meta @@ -7,14 +7,8 @@ 700 root root //etc/.cfgl/info 600 root root //etc/.cfgl/info/sparse-checkout 644 root root //etc/chrony.conf -600 root root //etc/crypttab -600 root root //etc/crypttab.initramfs -755 root root //etc/default -644 root root //etc/default/grub -644 root root //etc/fstab 644 root root //etc/locale.conf 644 root root //etc/locale.gen -644 root root //etc/mkinitcpio.conf 755 root root //etc/myconf 600 root root //etc/myconf/cfgl_meta 755 root root //etc/NetworkManager @@ -22,30 +16,17 @@ 644 root root //etc/NetworkManager/conf.d/NetworkManager.conf 755 root root //etc/NetworkManager/dispatcher.d 755 root root //etc/NetworkManager/dispatcher.d/70-wifi-wired-exclusive -755 root root //etc/NetworkManager/dispatcher.d/90-sbar 644 root root //etc/nftables.conf 644 root root //etc/pacman.conf 440 root root //etc/sudoers -755 root root //etc/udev -755 root root //etc/udev/rules.d -644 root root //etc/udev/rules.d/90-backlight.rules -755 root root //etc/uwsgi -755 root root //etc/uwsgi/vassals -644 root root //etc/uwsgi/vassals/searxng.ini -755 root root //etc/wildmidi -644 root root //etc/wildmidi/wildmidi.cfg 755 root root //home 700 xyz wheel //home/xyz 644 xyz wheel //home/xyz/.bashrc -751 xyz wheel //home/xyz/.bitmonero -644 xyz wheel //home/xyz/.bitmonero/monero-wallet-cli.conf 755 xyz wheel //home/xyz/.config 755 xyz wheel //home/xyz/.config/alacritty 644 xyz wheel //home/xyz/.config/alacritty/alacritty.yml 755 xyz wheel //home/xyz/.config/aria2 600 xyz wheel //home/xyz/.config/aria2/aria2.conf -755 xyz wheel //home/xyz/.config/dunst -644 xyz wheel //home/xyz/.config/dunst/dunstrc 700 xyz wheel //home/xyz/.config/fcitx5 700 xyz wheel //home/xyz/.config/fcitx5/conf 600 xyz wheel //home/xyz/.config/fcitx5/conf/chttrans.conf @@ -70,7 +51,6 @@ 755 xyz wheel //home/xyz/.config/myconf 644 xyz wheel //home/xyz/.config/myconf/pacman_Qqme 644 xyz wheel //home/xyz/.config/myconf/pacman_Qqne -644 xyz wheel //home/xyz/.config/myconf/surfingkeys_config.js 644 xyz wheel //home/xyz/.config/myconf/upd_rsync_files 755 xyz wheel //home/xyz/.config/newsboat 644 xyz wheel //home/xyz/.config/newsboat/config @@ -104,9 +84,7 @@ 755 xyz wheel //home/xyz/.local/bin 755 xyz wheel //home/xyz/.local/bin/alacritty 755 xyz wheel //home/xyz/.local/bin/alarm -755 xyz wheel //home/xyz/.local/bin/backlight 755 xyz wheel //home/xyz/.local/bin/bell -755 xyz wheel //home/xyz/.local/bin/beyondallreason 755 xyz wheel //home/xyz/.local/bin/ccgsl 755 xyz wheel //home/xyz/.local/bin/cfg 755 xyz wheel //home/xyz/.local/bin/chmodef @@ -135,7 +113,6 @@ 755 xyz wheel //home/xyz/.local/bin/px 755 xyz wheel //home/xyz/.local/bin/rate 755 xyz wheel //home/xyz/.local/bin/reco -755 xyz wheel //home/xyz/.local/bin/sbar 755 xyz wheel //home/xyz/.local/bin/ta 755 xyz wheel //home/xyz/.local/bin/time.uuid 755 xyz wheel //home/xyz/.local/bin/topa @@ -143,7 +120,6 @@ 755 xyz wheel //home/xyz/.local/bin/vinfo 755 xyz wheel //home/xyz/.local/bin/wh 755 xyz wheel //home/xyz/.local/bin/xmq -755 xyz wheel //home/xyz/.local/bin/xmr 777 xyz wheel //home/xyz/.local/bin/zoom 755 xyz wheel //home/xyz/.local/share 700 xyz wheel //home/xyz/.local/share/applications @@ -159,11 +135,8 @@ 700 xyz wheel //home/xyz/.mozilla 700 xyz wheel //home/xyz/.mozilla/firefox 755 xyz wheel //home/xyz/.mozilla/firefox/xxxxxxxx.fly -755 xyz wheel //home/xyz/.mozilla/firefox/xxxxxxxx.fly/chrome -644 xyz wheel //home/xyz/.mozilla/firefox/xxxxxxxx.fly/chrome/userChrome.css 644 xyz wheel //home/xyz/.mozilla/firefox/xxxxxxxx.fly/user-overrides.js 644 xyz wheel //home/xyz/.profile 700 xyz wheel //home/xyz/.ssh 644 xyz wheel //home/xyz/.ssh/config -644 xyz wheel //home/xyz/.xinitrc 644 xyz wheel //home/xyz/.Xresources diff --git a/etc/nftables.conf b/etc/nftables.conf index f1278a96..50b901ff 100644 --- a/etc/nftables.conf +++ b/etc/nftables.conf @@ -21,13 +21,13 @@ table inet my_table { ip protocol icmp accept meta l4proto ipv6-icmp accept - #tcp dport ssh accept + tcp dport ssh accept #tcp dport searx accept - tcp dport qrcp accept + #tcp dport qrcp accept udp dport mdns accept - tcp dport qbt-mullvad accept - udp dport qbt-mullvad accept - tcp dport monerod-mullvad accept + #tcp dport qbt-mullvad accept + #udp dport qbt-mullvad accept + #tcp dport monerod-mullvad accept pkttype host limit rate 5/second counter reject with icmpx type admin-prohibited counter comment "count any other traffic" diff --git a/etc/pacman.conf b/etc/pacman.conf index 9b8987e6..4de3388d 100644 --- a/etc/pacman.conf +++ b/etc/pacman.conf @@ -69,14 +69,19 @@ LocalFileSigLevel = Optional # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. -[fly] -Server = file:///home/xyz/programs/repos/fly/$arch +# DANCTNIX: Uncomment this if you want to be the first trying out new stuffs. +# They might break your device. +#[danctnix-testing] +#Server = https://p64.arikawa-hi.me/$repo/$arch/ -[fly-any] -Server = file:///home/xyz/programs/repos/fly/any +#[fly] +#Server = file:///home/xyz/programs/repos/fly/$arch -#[testing] -#Include = /etc/pacman.d/mirrorlist +#[fly-any] +#Server = file:///home/xyz/programs/repos/fly/any + +[danctnix] +Server = https://p64.arikawa-hi.me/$repo/$arch/ [core] Include = /etc/pacman.d/mirrorlist @@ -84,20 +89,14 @@ Include = /etc/pacman.d/mirrorlist [extra] Include = /etc/pacman.d/mirrorlist -#[community-testing] -#Include = /etc/pacman.d/mirrorlist - [community] Include = /etc/pacman.d/mirrorlist -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. - -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist +[alarm] +Include = /etc/pacman.d/mirrorlist -#[multilib] -#Include = /etc/pacman.d/mirrorlist +[aur] +Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. diff --git a/etc/ssh/sshd_config b/etc/ssh/sshd_config new file mode 100644 index 00000000..8c8d528e --- /dev/null +++ b/etc/ssh/sshd_config @@ -0,0 +1,116 @@ +# $OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/local/sbin:/usr/local/bin:/usr/bin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key +#HostKey /etc/ssh/ssh_host_ed25519_key + +# Ciphers and keying +#RekeyLimit default none + +# Logging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +PermitRootLogin no +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +#AuthorizedPrincipalsFile none + +#AuthorizedKeysCommand none +#AuthorizedKeysCommandUser nobody + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +PasswordAuthentication no +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +KbdInteractiveAuthentication no + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the KbdInteractiveAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via KbdInteractiveAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and KbdInteractiveAuthentication to 'no'. +UsePAM no + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PermitTTY yes +PrintMotd no +#PrintLastLog yes +#TCPKeepAlive yes +#PermitUserEnvironment no +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS no +#PidFile /run/sshd.pid +#MaxStartups 10:30:100 +#PermitTunnel no +#ChrootDirectory none +#VersionAddendum none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/ssh/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# PermitTTY no +# ForceCommand cvs server diff --git a/etc/udev/rules.d/90-backlight.rules b/etc/udev/rules.d/90-backlight.rules deleted file mode 100644 index bc2d268f..00000000 --- a/etc/udev/rules.d/90-backlight.rules +++ /dev/null @@ -1,6 +0,0 @@ -# https://github.com/haikarainen/light/blob/master/90-backlight.rules -# https://github.com/Hummer12007/brightnessctl/blob/master/90-brightnessctl.rules -# https://gitlab.com/wavexx/acpilight/-/blob/master/90-backlight.rules -ACTION=="add", SUBSYSTEM=="backlight", RUN+="/bin/chgrp video /sys/class/backlight/%k/brightness" -ACTION=="add", SUBSYSTEM=="backlight", RUN+="/bin/chmod g+w /sys/class/backlight/%k/brightness" -# vim: ft=udevrules diff --git a/etc/uwsgi/vassals/searxng.ini b/etc/uwsgi/vassals/searxng.ini deleted file mode 100644 index 403ffe16..00000000 --- a/etc/uwsgi/vassals/searxng.ini +++ /dev/null @@ -1,19 +0,0 @@ -[uwsgi]
-uid = searxng
-gid = searxng
-env = LANG=C.UTF-8
-env = LANGUAGE=C.UTF-8
-env = LC_ALL=C.UTF-8
-env = SEARX_SETTINGS_PATH=/etc/searxng/settings.yml
-logger = systemd
-disable-logging = true
-chmod-socket = 666
-single-interpreter = true
-master = true
-lazy-apps = true
-plugin = python
-enable-threads = true
-module = searx.webapp
-chmod-socket = 666
-http = :49152
-cache2 = name=searxngcache,items=2000,blocks=2000,blocksize=4096,bitmap=1
diff --git a/etc/wildmidi/wildmidi.cfg b/etc/wildmidi/wildmidi.cfg deleted file mode 100644 index d0ee73b6..00000000 --- a/etc/wildmidi/wildmidi.cfg +++ /dev/null @@ -1,142 +0,0 @@ -# https://github.com/Mindwerks/wildmidi/blob/master/cfg/wildmidi.cfg -# https://freepats.zenvoid.org/SoundSets/general-midi.html -#dir /usr/share/midi/freepats -dir ~/documents/codecs/freepats/ - -# Automatically generated on Sun Feb 19 19:22:39 EST 2006 -# by http://freepats.opensrc.org/mkcfg.sh.txt - -drumset 0 - - 25 Drum_000/025_Snare_Roll.pat - 26 Drum_000/026_Snap.pat - 27 Drum_000/027_High_Q.pat - 31 Drum_000/031_Sticks.pat - 32 Drum_000/032_Square_Click.pat - 33 Drum_000/033_Metronome_Click.pat - 34 Drum_000/034_Metronome_Bell.pat - 35 Drum_000/035_Kick_1.pat amp=100 - 36 Drum_000/036_Kick_2.pat amp=100 - 37 Drum_000/037_Stick_Rim.pat - 38 Drum_000/038_Snare_1.pat - 39 Drum_000/039_Clap_Hand.pat amp=100 - 40 Drum_000/040_Snare_2.pat - 41 Drum_000/041_Tom_Low_2.pat amp=100 - 42 Drum_000/042_Hi-Hat_Closed.pat - 43 Drum_000/043_Tom_Low_1.pat amp=100 - 44 Drum_000/044_Hi-Hat_Pedal.pat - 45 Drum_000/045_Tom_Mid_2.pat amp=100 - 46 Drum_000/046_Hi-Hat_Open.pat - 47 Drum_000/047_Tom_Mid_1.pat amp=100 - 48 Drum_000/048_Tom_High_2.pat amp=100 - 49 Drum_000/049_Cymbal_Crash_1.pat - 50 Drum_000/050_Tom_High_1.pat amp=100 - 51 Drum_000/051_Cymbal_Ride_1.pat - 52 Drum_000/052_Cymbal_Chinese.pat - 53 Drum_000/053_Cymbal_Ride_Bell.pat amp=100 - 54 Drum_000/054_Tombourine.pat - 55 Drum_000/055_Cymbal_Splash.pat - 56 Drum_000/056_Cow_Bell.pat - 57 Drum_000/057_Cymbal_Crash_2.pat - 58 Drum_000/058_Vibra-Slap.pat - 59 Drum_000/059_Cymbal_Ride_2.pat - 60 Drum_000/060_Bongo_High.pat - 61 Drum_000/061_Bongo_Low.pat - 62 Drum_000/062_Conga_High_1_Mute.pat - 63 Drum_000/063_Conga_High_2_Open.pat - 64 Drum_000/064_Conga_Low.pat - 65 Drum_000/065_Timbale_High.pat - 66 Drum_000/066_Timbale_Low.pat - 67 Drum_000/067_Agogo_High.pat - 68 Drum_000/068_Agogo_Low.pat - 69 Drum_000/069_Cabasa.pat amp=100 - 70 Drum_000/070_Maracas.pat - 71 Drum_000/071_Whistle_1_High_Short.pat - 72 Drum_000/072_Whistle_2_Low_Long.pat - 73 Drum_000/073_Guiro_1_Short.pat - 74 Drum_000/074_Guiro_2_Long.pat - 75 Drum_000/075_Claves.pat amp=100 - 76 Drum_000/076_Wood_Block_1_High.pat - 77 Drum_000/077_Wood_Block_2_Low.pat - 78 Drum_000/078_Cuica_1_Mute.pat amp=100 - 79 Drum_000/079_Cuica_2_Open.pat amp=100 - 80 Drum_000/080_Triangle_1_Mute.pat - 81 Drum_000/081_Triangle_2_Open.pat - 82 Drum_000/082_Shaker.pat - 84 Drum_000/084_Belltree.pat - -bank 0 - - 0 Tone_000/000_Acoustic_Grand_Piano.pat amp=120 pan=center - 1 Tone_000/001_Acoustic_Brite_Piano.pat - 2 Tone_000/002_Electric_Grand_Piano.pat - 4 Tone_000/004_Electric_Piano_1_Rhodes.pat - 5 Tone_000/005_Electric_Piano_2_Chorused_Yamaha_DX.pat - 6 Tone_000/006_Harpsichord.pat - 7 Tone_000/007_Clavinet.pat - 8 Tone_000/008_Celesta.pat - 9 Tone_000/009_Glockenspiel.pat - 13 Tone_000/013_Xylophone.pat - 14 Tone_000/014_Tubular_Bells.pat - 15 Tone_000/015_Dulcimer.pat - 16 Tone_000/016_Hammond_Organ.pat - 19 Tone_000/019_Church_Organ.pat - 21 Tone_000/021_Accordion.pat - 23 Tone_000/023_Tango_Accordion.pat - 24 Tone_000/024_Nylon_Guitar.pat - 25 Tone_000/025_Steel_Guitar.pat - 26 Tone_000/026_Jazz_Guitar.pat - 27 Tone_000/027_Clean_Electric_Guitar.pat - 28 Tone_000/028_Muted_Electric_Guitar.pat - 29 Tone_000/029_Overdriven_Guitar.pat - 30 Tone_000/030_Distortion_Guitar.pat - 32 Tone_000/032_Acoustic_Bass.pat - 33 Tone_000/033_Finger_Bass.pat - 34 Tone_000/034_Pick_Bass.pat - 35 Tone_000/035_Fretless_Bass.pat - 36 Tone_000/036_Slap_Bass_1.pat - 37 Tone_000/037_Slap_Bass_2.pat - 38 Tone_000/038_Synth_Bass_1.pat - 40 Tone_000/040_Violin.pat - 42 Tone_000/042_Cello.pat - 44 Tone_000/044_Tremolo_Strings.pat - 45 Tone_000/045_Pizzicato_Strings.pat - 46 Tone_000/046_Harp.pat - 47 Tone_000/047_Timpani.pat - 48 Tone_000/048_String_Ensemble_1_Marcato.pat - 53 Tone_000/053_Voice_Oohs.pat - 56 Tone_000/056_Trumpet.pat - 57 Tone_000/057_Trombone.pat - 58 Tone_000/058_Tuba.pat - 59 Tone_000/059_Muted_Trumpet.pat - 60 Tone_000/060_French_Horn.pat - 61 Tone_000/061_Brass_Section.pat - 64 Tone_000/064_Soprano_Sax.pat - 65 Tone_000/065_Alto_Sax.pat - 66 Tone_000/066_Tenor_Sax.pat - 67 Tone_000/067_Baritone_Sax.pat - 68 Tone_000/068_Oboe.pat - 69 Tone_000/069_English_Horn.pat - 70 Tone_000/070_Bassoon.pat - 71 Tone_000/071_Clarinet.pat - 72 Tone_000/072_Piccolo.pat - 73 Tone_000/073_Flute.pat - 74 Tone_000/074_Recorder.pat - 75 Tone_000/075_Pan_Flute.pat - 76 Tone_000/076_Bottle_Blow.pat - 79 Tone_000/079_Ocarina.pat - 80 Tone_000/080_Square_Wave.pat - 84 Tone_000/084_Charang.pat - 88 Tone_000/088_New_Age.pat - 94 Tone_000/094_Halo_Pad.pat - 95 Tone_000/095_Sweep_Pad.pat - 98 Tone_000/098_Crystal.pat - 101 Tone_000/101_Goblins--Unicorn.pat - 102 Tone_000/102_Echo_Voice.pat - 104 Tone_000/104_Sitar.pat - 114 Tone_000/114_Steel_Drums.pat - 115 Tone_000/115_Wood_Block.pat - 120 Tone_000/120_Guitar_Fret_Noise.pat - 122 Tone_000/122_Seashore.pat - 125 Tone_000/125_Helicopter.pat - diff --git a/home/xyz/.bitmonero/monero-wallet-cli.conf b/home/xyz/.bitmonero/monero-wallet-cli.conf deleted file mode 100644 index e04f6a3d..00000000 --- a/home/xyz/.bitmonero/monero-wallet-cli.conf +++ /dev/null @@ -1,2 +0,0 @@ -wallet-file=/home/xyz/.bitmonero/wallets/transfer_only_wallet -log-file=/home/xyz/.bitmonero/monero-wallet-cli.log diff --git a/home/xyz/.config/dunst/dunstrc b/home/xyz/.config/dunst/dunstrc deleted file mode 100644 index 7d0fea5a..00000000 --- a/home/xyz/.config/dunst/dunstrc +++ /dev/null @@ -1,432 +0,0 @@ -# See dunst(5) for all configuration options - -[global] - ### Display ### - - # Which monitor should the notifications be displayed on. - monitor = 0 - - # Display notification on focused monitor. Possible modes are: - # mouse: follow mouse pointer - # keyboard: follow window with keyboard focus - # none: don't follow anything - # - # "keyboard" needs a window manager that exports the - # _NET_ACTIVE_WINDOW property. - # This should be the case for almost all modern window managers. - # - # If this option is set to mouse or keyboard, the monitor option - # will be ignored. - follow = mouse - - ### Geometry ### - - # dynamic width from 0 to 300 - # width = (0, 300) - # constant width of 300 - width = (0,300) - - # The maximum height of a single notification, excluding the frame. - height = 300 - - # Position the notification in the top right corner - origin = top-right - - # Offset from the origin - offset = 0x21 - - # Scale factor. It is auto-detected if value is 0. - scale = 0 - - # Maximum number of notification (0 means no limit) - notification_limit = 5 - - ### Progress bar ### - - # Turn on the progess bar. It appears when a progress hint is passed with - # for example dunstify -h int:value:12 - progress_bar = true - - # Set the progress bar height. This includes the frame, so make sure - # it's at least twice as big as the frame width. - progress_bar_height = 10 - - # Set the frame width of the progress bar - progress_bar_frame_width = 1 - - # Set the minimum width for the progress bar - progress_bar_min_width = 150 - - # Set the maximum width for the progress bar - progress_bar_max_width = 300 - - - # Show how many messages are currently hidden (because of - # notification_limit). - indicate_hidden = yes - - # The transparency of the window. Range: [0; 100]. - # This option will only work if a compositing window manager is - # present (e.g. xcompmgr, compiz, etc.). (X11 only) - transparency = 0 - - # Draw a line of "separator_height" pixel height between two - # notifications. - # Set to 0 to disable. - separator_height = 1 - - # Padding between text and separator. - padding = 8 - - # Horizontal padding. - horizontal_padding = 8 - - # Padding between text and icon. - text_icon_padding = 0 - - # Defines width in pixels of frame around the notification window. - # Set to 0 to disable. - frame_width = 1 - - # Defines color of the frame around the notification window. - frame_color = "#c5c8c6" - - # Define a color for the separator. - # possible values are: - # * auto: dunst tries to find a color fitting to the background; - # * foreground: use the same color as the foreground; - # * frame: use the same color as the frame; - # * anything else will be interpreted as a X color. - separator_color = frame - - # Sort messages by urgency. - sort = yes - - # Don't remove messages, if the user is idle (no mouse or keyboard input) - # for longer than idle_threshold seconds. - # Set to 0 to disable. - # A client can set the 'transient' hint to bypass this. See the rules - # section for how to disable this if necessary - idle_threshold = 120 - - ### Text ### - - font = Monospace 10 - - # The spacing between lines. If the height is smaller than the - # font height, it will get raised to the font height. - line_height = 0 - - # Possible values are: - # full: Allow a small subset of html markup in notifications: - # <b>bold</b> - # <i>italic</i> - # <s>strikethrough</s> - # <u>underline</u> - # - # For a complete reference see - # <https://developer.gnome.org/pango/stable/pango-Markup.html>. - # - # strip: This setting is provided for compatibility with some broken - # clients that send markup even though it's not enabled on the - # server. Dunst will try to strip the markup but the parsing is - # simplistic so using this option outside of matching rules for - # specific applications *IS GREATLY DISCOURAGED*. - # - # no: Disable markup parsing, incoming notifications will be treated as - # plain text. Dunst will not advertise that it has the body-markup - # capability if this is set as a global setting. - # - # It's important to note that markup inside the format option will be parsed - # regardless of what this is set to. - markup = full - - # The format of the message. Possible variables are: - # %a appname - # %s summary - # %b body - # %i iconname (including its path) - # %I iconname (without its path) - # %p progress value if set ([ 0%] to [100%]) or nothing - # %n progress value if set without any extra characters - # %% Literal % - # Markup is allowed - format = "<b>%s</b>\n%b" - - # Alignment of message text. - # Possible values are "left", "center" and "right". - alignment = left - - # Vertical alignment of message text and icon. - # Possible values are "top", "center" and "bottom". - vertical_alignment = center - - # Show age of message if message is older than show_age_threshold - # seconds. - # Set to -1 to disable. - show_age_threshold = 60 - - # Specify where to make an ellipsis in long lines. - # Possible values are "start", "middle" and "end". - ellipsize = middle - - # Ignore newlines '\n' in notifications. - ignore_newline = no - - # Stack together notifications with the same content - stack_duplicates = true - - # Hide the count of stacked notifications with the same content - hide_duplicate_count = false - - # Display indicators for URLs (U) and actions (A). - show_indicators = yes - - ### Icons ### - - # Align icons left/right/off - icon_position = left - - # Scale small icons up to this size, set to 0 to disable. Helpful - # for e.g. small files or high-dpi screens. In case of conflict, - # max_icon_size takes precedence over this. - min_icon_size = 0 - - # Scale larger icons down to this size, set to 0 to disable - max_icon_size = 32 - - # Paths to default icons. - icon_path = /usr/share/icons/Papirus-Dark/16x16/actions:/usr/share/icons/Papirus-Dark/16x16/categories:/usr/share/icons/Papirus-Dark/16x16/emblems:/usr/share/icons/Papirus-Dark/16x16/mimetypes:/usr/share/icons/Papirus-Dark/16x16/places:/usr/share/icons/Papirus-Dark/16x16/apps:/usr/share/icons/Papirus-Dark/16x16/devices:/usr/share/icons/Papirus-Dark/16x16/emotes:/usr/share/icons/Papirus-Dark/16x16/panel:/usr/share/icons/Papirus-Dark/16x16/status - - ### History ### - - # Should a notification popped up from history be sticky or timeout - # as if it would normally do. - sticky_history = yes - - # Maximum amount of notifications kept in history - history_length = 20 - - ### Misc/Advanced ### - - # dmenu path. - dmenu = /usr/bin/dmenu -p dunst: - - # Browser for opening urls in context menu. - browser = /usr/bin/xdg-open - - # Always run rule-defined scripts, even if the notification is suppressed - always_run_script = true - - # Define the title of the windows spawned by dunst - title = Dunst - - # Define the class of the windows spawned by dunst - class = Dunst - - # Define the corner radius of the notification window - # in pixel size. If the radius is 0, you have no rounded - # corners. - # The radius will be automatically lowered if it exceeds half of the - # notification height to avoid clipping text and/or icons. - corner_radius = 0 - - # Ignore the dbus closeNotification message. - # Useful to enforce the timeout set by dunst configuration. Without this - # parameter, an application may close the notification sent before the - # user defined timeout. - ignore_dbusclose = false - - ### Wayland ### - # These settings are Wayland-specific. They have no effect when using X11 - - # Uncomment this if you want to let notications appear under fullscreen - # applications (default: overlay) - # layer = top - - # Set this to true to use X11 output on Wayland. - force_xwayland = false - - ### Legacy - - # Use the Xinerama extension instead of RandR for multi-monitor support. - # This setting is provided for compatibility with older nVidia drivers that - # do not support RandR and using it on systems that support RandR is highly - # discouraged. - # - # By enabling this setting dunst will not be able to detect when a monitor - # is connected or disconnected which might break follow mode if the screen - # layout changes. - force_xinerama = false - - ### mouse - - # Defines list of actions for each mouse event - # Possible values are: - # * none: Don't do anything. - # * do_action: Invoke the action determined by the action_name rule. If there is no - # such action, open the context menu. - # * open_url: If the notification has exactly one url, open it. If there are multiple - # ones, open the context menu. - # * close_current: Close current notification. - # * close_all: Close all notifications. - # * context: Open context menu for the notification. - # * context_all: Open context menu for all notifications. - # These values can be strung together for each mouse event, and - # will be executed in sequence. - mouse_left_click = close_current - mouse_middle_click = do_action, close_current - mouse_right_click = close_all - -# Experimental features that may or may not work correctly. Do not expect them -# to have a consistent behaviour across releases. -[experimental] - # Calculate the dpi to use on a per-monitor basis. - # If this setting is enabled the Xft.dpi value will be ignored and instead - # dunst will attempt to calculate an appropriate dpi value for each monitor - # using the resolution and physical size. This might be useful in setups - # where there are multiple screens with very different dpi values. - per_monitor_dpi = false - - -[urgency_low] - # IMPORTANT: colors have to be defined in quotation marks. - # Otherwise the "#" and following would be interpreted as a comment. - background = "#1d1f21" - foreground = "#81a2be" - frame_color = "#81a2be" - timeout = 10 - # Icon for notifications with low urgency, uncomment to enable - #icon = /path/to/icon - -[urgency_normal] - background = "#1d1f21" - foreground = "#b5bd68" - frame_color = "#b5bd68" - timeout = 10 - # Icon for notifications with normal urgency, uncomment to enable - #icon = /path/to/icon - -[urgency_critical] - background = "#1d1f21" - foreground = "#cc6666" - frame_color = "#cc6666" - timeout = 0 - # Icon for notifications with critical urgency, uncomment to enable - #icon = /path/to/icon - -# Every section that isn't one of the above is interpreted as a rules to -# override settings for certain messages. -# -# Messages can be matched by -# appname (discouraged, see desktop_entry) -# body -# category -# desktop_entry -# icon -# match_transient -# msg_urgency -# stack_tag -# summary -# -# and you can override the -# background -# foreground -# format -# frame_color -# fullscreen -# new_icon -# set_stack_tag -# set_transient -# timeout -# urgency -# action_name -# -# Shell-like globbing will get expanded. -# -# Instead of the appname filter, it's recommended to use the desktop_entry filter. -# GLib based applications export their desktop-entry name. In comparison to the appname, -# the desktop-entry won't get localized. -# -# SCRIPTING -# You can specify a script that gets run when the rule matches by -# setting the "script" option. -# The script will be called as follows: -# script appname summary body icon urgency -# where urgency can be "LOW", "NORMAL" or "CRITICAL". -# -# NOTE: It might be helpful to run dunst -print in a terminal in order -# to find fitting options for rules. - -# Disable the transient hint so that idle_threshold cannot be bypassed from the -# client -#[transient_disable] -# match_transient = yes -# set_transient = no -# -# Make the handling of transient notifications more strict by making them not -# be placed in history. -#[transient_history_ignore] -# match_transient = yes -# history_ignore = yes - -# fullscreen values -# show: show the notifications, regardless if there is a fullscreen window opened -# delay: displays the new notification, if there is no fullscreen window active -# If the notification is already drawn, it won't get undrawn. -# pushback: same as delay, but when switching into fullscreen, the notification will get -# withdrawn from screen again and will get delayed like a new notification -#[fullscreen_delay_everything] -# fullscreen = delay -#[fullscreen_show_critical] -# msg_urgency = critical -# fullscreen = show - -#[espeak] -# summary = "*" -# script = dunst_espeak.sh - -#[script-test] -# summary = "*script*" -# script = dunst_test.sh - -#[ignore] -# # This notification will not be displayed -# summary = "foobar" -# skip_display = true - -#[history-ignore] -# # This notification will not be saved in history -# summary = "foobar" -# history_ignore = yes - -#[skip-display] -# # This notification will not be displayed, but will be included in the history -# summary = "foobar" -# skip_display = yes - -#[signed_on] -# appname = Pidgin -# summary = "*signed on*" -# urgency = low -# -#[signed_off] -# appname = Pidgin -# summary = *signed off* -# urgency = low -# -#[says] -# appname = Pidgin -# summary = *says* -# urgency = critical -# -#[twitter] -# appname = Pidgin -# summary = *twitter.com* -# urgency = normal -# -#[stack-volumes] -# appname = "some_volume_notifiers" -# set_stack_tag = "volume" -# -# vim: ft=cfg diff --git a/home/xyz/.config/myconf/surfingkeys_config.js b/home/xyz/.config/myconf/surfingkeys_config.js deleted file mode 100644 index 8ab842c3..00000000 --- a/home/xyz/.config/myconf/surfingkeys_config.js +++ /dev/null @@ -1,121 +0,0 @@ -// https://github.com/brookhong/Surfingkeys/wiki/Migrate-your-settings-from-0.9.74-to-1.0 -const { - aceVimMap, - mapkey, - imap, - imapkey, - getClickableElements, - vmapkey, - map, - unmap, - vunmap, - cmap, - addSearchAlias, - removeSearchAlias, - tabOpenLink, - readText, - Clipboard, - Front, - Hints, - Visual, - RUNTIME, - - iunmap, -} = api; - -// old example config, may not work. also, I change ctrl-y to Ctrl-y -// an example to create a new mapping `ctrl-y` -//mapkey('<Ctrl-y>', 'Show me the money', function() { -// Front.showPopup('a well-known phrase uttered by characters in the 1996 film Jerry Maguire (Escape to close).'); -//}); -// an example to replace `T` with `gt`, click `Default mappings` to see how `T` works. -//map('gt', 'T'); - -// I choose to use <Alt-i>, <Alt-s>, or <p> instead. I prefer <p> -//settings.blacklistPattern = /.*youtube\.com.*|.*mail\.google\.com.*/i; - -//unmap('<Ctrl-j>'); -map(';h','<Ctrl-h>'); -unmap('<Ctrl-h>'); -// alt-s not working, seems because arkenfox user.js enabled resist finger printing -// remap alt-s also not working, see issue in github -map(';s','<Alt-s>'); -unmap('<Alt-s>'); - -// on firefox, firenvim default Ctrl-e will be overwirted by github issue hotkey, see: -// https://github.com/glacambre/firenvim/issues/1046 -// https://bugzilla.mozilla.org/show_bug.cgi?id=1713794 -// currently seems no good solution but to use another hotkey, I choose Ctrl+, -// current surfingkeys version 0.9.74 is outdated and doesn't contain firenvim integration, wait for author to update -// I tried to run the source code as temp extension in about:debugging or with web-ext cli tool but no luck -// update: surfingkeys 1.0 is out, but it integrate neovim in another way, and firefox is not supported? -// https://github.com/brookhong/Surfingkeys/issues/1542#:~:text=side%20is%20not-,necessary,-now%2C%20please%20help -// some more links: -// https://github.com/brookhong/Surfingkeys/tree/master/src/nvim/server -settings.useNeovim = true; - -// disable all insert mode hotkeys except Ctrl-i for future neovim integration -//iunmap('<Ctrl-i>'); -iunmap('<Alt-b>'); -iunmap('<Alt-d>'); -iunmap('<Alt-f>'); -iunmap('<Alt-w>'); -iunmap("<Ctrl-'>"); -iunmap('<Ctrl-e>'); -iunmap('<Ctrl-f>'); -iunmap('<Ctrl-u>'); - -// following code of map n to nzz not working in 1.0 -// I guess it may because Visual.next and Visual.feedkeys is not supported in new api, see below source code permalink -// https://github.com/brookhong/Surfingkeys/blob/3d1de8cab8584209cc6fec3ed7025e8ebab476d8/src/content_scripts/common/api.js#L774-L776 -//mapkey('n','Find next then center cursor', function(){ -// Visual.next(false); -// Visual.feedkeys('zz'); -//}); -//mapkey('N','Find previous then center cursor', function(){ -// Visual.next(true); -// Visual.feedkeys('zz'); -//}); - -// with firefox RFP enabled in user.js, smooth scroll and gg/G do not work, firefox RFP's feature -settings.smoothScroll = false; - -// set theme -settings.theme = ` -.sk_theme { - font-family: Input Sans Condensed, Charcoal, sans-serif; - font-size: 10pt; - background: #24272e; - color: #abb2bf; -} -.sk_theme tbody { - color: #fff; -} -.sk_theme input { - color: #d0d0d0; -} -.sk_theme .url { - color: #61afef; -} -.sk_theme .annotation { - color: #56b6c2; -} -.sk_theme .omnibar_highlight { - color: #528bff; -} -.sk_theme .omnibar_timestamp { - color: #e5c07b; -} -.sk_theme .omnibar_visitcount { - color: #98c379; -} -.sk_theme #sk_omnibarSearchResult ul li:nth-child(odd) { - background: #303030; -} -.sk_theme #sk_omnibarSearchResult ul li.focused { - background: #3e4452; -} -#sk_status, #sk_find { - font-size: 16pt; -}`; -// click `Save` button to make above settings to take effect.</ctrl-i></ctrl-y> diff --git a/home/xyz/.config/myconf/upd_rsync_files b/home/xyz/.config/myconf/upd_rsync_files index f7e62551..f9dcdb36 100644 --- a/home/xyz/.config/myconf/upd_rsync_files +++ b/home/xyz/.config/myconf/upd_rsync_files @@ -1,7 +1,5 @@ -home/xyz/.bitmonero/wallets home/xyz/.cache/nsxiv home/xyz/.config/qBittorrent -home/xyz/.config/qmmp/qmmp.conf home/xyz/.local/share/qBittorrent home/xyz/.local/share/sdcv_history home/xyz/.password-store diff --git a/home/xyz/.local/bin/backlight b/home/xyz/.local/bin/backlight deleted file mode 100755 index 3de87f56..00000000 --- a/home/xyz/.local/bin/backlight +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -brightness=$(cat /sys/class/backlight/intel_backlight/brightness) -max_brightness=$(cat /sys/class/backlight/intel_backlight/max_brightness) -step=$((max_brightness/20)) - -case "$1" in - '-u') - case "$brightness" in - 0) echo 1;; - 1) echo "$step";; - *) echo "$((brightness+step))";; - esac - ;; - '-d') - case "$brightness" in - 1) echo 0;; - "$step") echo 1;; - *) echo "$((brightness-step))";; - esac - ;; - *) exit 1;; -esac > /sys/class/backlight/intel_backlight/brightness diff --git a/home/xyz/.local/bin/beyondallreason b/home/xyz/.local/bin/beyondallreason deleted file mode 100755 index 780cbc24..00000000 --- a/home/xyz/.local/bin/beyondallreason +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/bin/beyondallreason -w "$XDG_DATA_HOME/beyond_all_reason" "$@" diff --git a/home/xyz/.local/bin/sbar b/home/xyz/.local/bin/sbar deleted file mode 100755 index 461d83ac..00000000 --- a/home/xyz/.local/bin/sbar +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# modified from pystardust, GPLv3 license: https://github.com/pystardust/sbar - -# INIT -sec=0 - -# MODULES -update_time () { - time="$(date '+%a %m/%d %H:%M') $(TZ=Asia/Shanghai date '+/%d %H:') $(date -u '+/%d %H:')" -} - -#update_cap () { -# cap="$(if xset q | grep -q "Caps Lock: *on"; then echo A; else echo a; fi)" -#} - -update_net () { - net="$(if nmcli -t --fields type,state device | grep -q '\(ethernet\|wifi\):connected'; then echo 1; else echo 0; fi)" - vpn="$(if nmcli -t --fields type,state device | grep -q '\(tun\|wireguard\):connected'; then echo 1; else echo 0; fi)" -} - -update_vol () { - # $(NF-1) for both alsa and pulseaudio - vol="$(amixer get Master | awk -F'[][]' 'END{printf("%d %s",($(NF-1)=="on")?1:0,$2)}')" -} - -update_mic () { - # $(NF-1) for both alsa and pulseaudio - mic="$(amixer get Capture | awk -F '[][]' 'END{print ($(NF-1)=="on")?1:0}')" -} - -update_bat () { - bat="$(cat /sys/class/power_supply/BAT0/capacity)%" -} - -update_gpu () { - gpu="$(envycontrol -q | awk 'END{print toupper(substr($NF,0,1))}')" -} - -display () { - xsetroot -name "$time | N $net V $vpn | M $vol C $mic | $gpu | $bat" -} - -# modules that don't update on their own need to be run at the start for getting their initial value -update_net -update_vol -update_mic -update_gpu - -# SIGNALLING -# trap "<function>;display" "RTMIN+n" -trap "update_mic;display" "RTMIN" -trap "update_vol;display" "RTMIN+1" -# xev can't read my toggle internet keyboard key, don't know what key to use in sxhkd to send signal -trap "update_net;display" "RTMIN+2" -# to update it from external commands -## kill -m $(pidof -x sbar) -# where m = 34 + n - -while :; do - sleep 1 & - wait - [ $((sec % 5 )) -eq 0 ] && update_time # update time every 5 seconds - [ $((sec % 60)) -eq 0 ] && update_net - [ $((sec % 60)) -eq 0 ] && update_bat - # how often the display updates ( 5 seconds ) - [ $((sec % 5 )) -eq 0 ] && display - sec=$((sec + 1)) -done diff --git a/home/xyz/.local/bin/upd b/home/xyz/.local/bin/upd index b668e0f9..8d832113 100755 --- a/home/xyz/.local/bin/upd +++ b/home/xyz/.local/bin/upd @@ -7,7 +7,7 @@ all () { qb refl usb - xmr + #xmr } clean () { @@ -50,7 +50,7 @@ userjs () { } misc () { - "$EDITOR" +PlugUpgrade +PlugClean! +PlugUpdate +qa + "$EDITOR" +PlugClean! +PlugUpdate +qa tldr --update sudo hardcode-fixer sudo units_cur @@ -101,24 +101,24 @@ usb () { #rsync -navPR --delete ~/archive ~/documents ~/downloads ~/music ~/pictures ~/programs ~/test ~/videos ~/.local/share/stardict/dic ~/.local/share/qBittorrent ~/.local/share/sdcv_history ~/.cache/nsxiv ~/.config/qBittorrent ~/.bitmonero/wallets ~/.password-store /run/media/xyz/bd0 # --files-from make -a not imply -r, so need to specify explicitly - rsync -avPRr --delete --files-from="$XDG_CONFIG_HOME/myconf/upd_rsync_files" / /run/media/xyz/bd0 + rsync -avPRr --delete --files-from="$XDG_CONFIG_HOME/myconf/upd_rsync_files" / /run/media/xyz/bd0/pp # not sure if useful or not sync } -xmr () { - # use cd to workaround monero-blockchain-export.log log file save in current dir? issue, haven't tested - cd "$HOME/.bitmonero" || exit - monero-blockchain-export --output-file /run/media/xyz/bd0/archive/monero/blockchain.raw - # not sure if useful or not - sync -} +#xmr () { +# # use cd to workaround monero-blockchain-export.log log file save in current dir? issue, haven't tested +# cd "$HOME/.bitmonero" || exit +# monero-blockchain-export --output-file /run/media/xyz/bd0/archive/monero/blockchain.raw +# # not sure if useful or not +# sync +#} if [ $# -eq 0 ]; then fast else - while getopts acfjmpqrux opt; do + while getopts acfjmpqru opt; do case $opt in a)all;; c)clean;; @@ -129,7 +129,7 @@ else q)qb;; r)refl;; u)usb;; - x)xmr;; + #x)xmr;; \?)exit 1;; esac done diff --git a/home/xyz/.local/bin/xmr b/home/xyz/.local/bin/xmr deleted file mode 100755 index e0516b9a..00000000 --- a/home/xyz/.local/bin/xmr +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -pidof -q monerod || alacritty -e monerod -monero-wallet-cli --config-file="$HOME/.bitmonero/monero-wallet-cli.conf" diff --git a/home/xyz/.mozilla/firefox/xxxxxxxx.fly/chrome/userChrome.css b/home/xyz/.mozilla/firefox/xxxxxxxx.fly/chrome/userChrome.css deleted file mode 100644 index 526f3078..00000000 --- a/home/xyz/.mozilla/firefox/xxxxxxxx.fly/chrome/userChrome.css +++ /dev/null @@ -1,13 +0,0 @@ -@import url(firefox-csshacks/chrome/navbar_tabs_oneliner.css); -@import url(firefox-csshacks/chrome/urlbar_popup_full_width.css); - -/* On my laptop with linux, if only has more tool >> button and application menu hambugger button, need at least 733px for search bookmarks urls and title shown in one line, or 39vw when full screen on my xyzinsp laptop. Not sure why % is not working. -I choose to use vw because after resize to a smaller window, the navigation bar will be too big if use px. -I choose a lower vw to give more room to tabs. */ -#navigator-toolbox { --uc-navigationbar-width: 30vw !important; } - -/* hide history back, forward-button, and ^ alltabs-button */ -#back-button, #forward-button, #alltabs-button { display: none !important; } - -/* hide minimize, restore, and close button when in full screen mode */ -#minimize-button, #restore-button, #close-button { display: none !important; } diff --git a/home/xyz/.profile b/home/xyz/.profile index f6dd5e8c..7cb95096 100644 --- a/home/xyz/.profile +++ b/home/xyz/.profile @@ -89,9 +89,3 @@ playerctld daemon # https://github.com/koalaman/shellcheck/wiki/SC3046 #[[ -f ~/.bashrc ]] && . ~/.bashrc [ -f "$HOME/.bashrc" ] && . "$HOME/.bashrc" - -# startx when login, should be put after environmental variables for .xinitrc to use -# use `[ "$XDG_VTNR" ]` to avoid "-bash: [: : integer expression expected" warning/error message, when `sudo su - xyz` or ssh into a remote server, not sure if best practice or not -if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ]; then - exec startx -fi diff --git a/home/xyz/.xinitrc b/home/xyz/.xinitrc deleted file mode 100644 index 2fb8a47b..00000000 --- a/home/xyz/.xinitrc +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh - -userresources="$HOME/.Xresources" -usermodmap="$HOME/.Xmodmap" -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f "$userresources" ]; then - xrdb -merge "$userresources" -fi - -if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" -fi - -# start some nice programs - -if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x "$f" ] && . "$f" - done - unset f -fi - -#clipmenud & -fcitx5 -d -redshift & -# udiskie recommanded to auto start here in .xinitrc, see: -# https://github.com/coldfix/udiskie/issues/93 -# https://github.com/coldfix/udiskie/issues/226 -udiskie & -# default fastest windows 10 keyboard repeat delay and rate -# without editing registry, using filter key, or other third party program -# see http://stereopsis.com/keyrepeat/ -xset r rate 250 30 -# https://dianne.skoll.ca/wiki/Remind_FAQ#How_can_I_generate_popup_windows_to_warn_me_of_timed_reminders.3F -rem -z -k'notify-send -u critical "reminder" %s &' & -if [ "$(envycontrol -q)" = 'Current graphics mode is: nvidia' ]; then - # my testing shows this seems no need? - xrandr --setprovideroutputsource modesetting NVIDIA-0 - xrandr --auto - # xorg-server 21.1.1-2 set correct dpi for my computer, but I choose to take the blue pill - # Attention, don't use & at the end otherwise dwm status bar won't have proper dpi. - # xorg-server 21.1.1-3 "fixed" it, so no need now - # but nvidia driver need it now - xrandr --dpi 96 -fi -sbar & -exec dwm |