diff --git a/applications/gitconfig b/applications/gitconfig index 30e13c0..25f0bc6 100644 --- a/applications/gitconfig +++ b/applications/gitconfig @@ -5,3 +5,5 @@ editor = vi [gui] spellingdictionary = none +[pull] + ff = only diff --git a/applications/pulseaudio b/applications/pulseaudio index 630bd4c..70b9abc 100644 --- a/applications/pulseaudio +++ b/applications/pulseaudio @@ -1,4 +1 @@ .include /etc/pulse/default.pa - -#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'" -#load-module module-rtp-send source=rtp.monitor destination_ip=224.0.0.56 port=4777 loop=1 diff --git a/emacs/init.el b/emacs/init.el index f5e56d8..9d99aae 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -51,11 +51,6 @@ (agw-set-key "b d" #'kill-this-buffer) (agw-set-key "b e" #'ibuffer) -(agw-set-key "h" #'windmove-left) -(agw-set-key "j" #'windmove-down) -(agw-set-key "k" #'windmove-up) -(agw-set-key "l" #'windmove-right) - (agw-set-key "m j" #'agw-create-back-link) (agw-set-key "m k" #'agw-create-memb-link) (agw-set-key "m l" #'agw-create-mthd-link) @@ -63,6 +58,8 @@ (agw-set-key "a" #'org-archive-to-archive-sibling) (agw-set-key "A" #'org-force-cycle-archived) +(agw-set-key "k" #'deadgrep) + (agw-key-map-mode) (global-set-key (kbd "C-x C-") #'agw-key-map-mode) @@ -104,6 +101,15 @@ :init (defvaralias 'js-indent-level 'tab-width)) +(use-package css-mode + :init + (defvaralias 'css-indent-offset 'tab-width)) + +(use-package lua-mode + :ensure t + :init + (setq lua-indent-nested-block-content-align nil)) + (use-package json-mode :ensure t :after js @@ -111,24 +117,17 @@ (defvaralias 'json-reformat:indent-width 'tab-width)) (use-package mmm-mode - :ensure t + :ensure t) + +(use-package mmm-auto :init (setq mmm-submode-decoration-level 0) :config - (require 'mmm-auto) - (mmm-add-group 'rust-doc - '((rust-doc-line - :submode markdown-mode - :face mmm-comment-submode-face - :front "///\s+" - :back "\n") - (rust-doc-block - :submode markdown-mode - :face mmm-comment-submode-face - :front "/\\*\\*" - :back "\\*\\*/"))) - (mmm-add-mode-ext-class 'ruby-mode nil 'here-doc) - (mmm-add-mode-ext-class 'rust-mode nil 'rust-doc)) + (mmm-add-mode-ext-class 'ruby-mode nil 'here-doc)) + +(use-package python + :init + (defvaralias 'python-indent-offset 'tab-width)) (use-package cc-mode :mode (("\\.zsc\\'" . c-mode) @@ -167,7 +166,6 @@ (use-package rust-mode :ensure t - :hook ((rust-mode . mmm-mode)) :init (defvaralias 'rust-indent-offset 'tab-width)) @@ -231,7 +229,7 @@ ;; adjustments (use-package smart-tabs-mode :ensure t - :after (fish-mode glsl-mode rust-mode) + :after (fish-mode glsl-mode rust-mode lua-mode) :config (smart-tabs-add-language-support powershell powershell-mode-hook ((powershell-indent-line . powershell-indent))) @@ -242,12 +240,15 @@ (smart-tabs-add-language-support glsl glsl-mode-hook ((c-indent-line . c-basic-offset) (c-indent-region . c-basic-offset))) + (smart-tabs-add-language-support lua lua-mode-hook + ((lua-indent-line . lua-indent-level))) (smart-tabs-insinuate 'c 'fish + 'glsl 'javascript - 'rust - 'glsl)) + 'lua + 'rust)) (use-package ialign :ensure t @@ -365,8 +366,6 @@ :config (evil-mode t) - (evil-global-set-key 'normal (kbd "K w") #'deadgrep) - (evil-global-set-key 'visual (kbd "g s") #'sort-lines) (evil-global-set-key 'visual (kbd "g a") #'ialign)) diff --git a/fish/llvmenv b/fish/llvmenv new file mode 100644 index 0000000..b94105a --- /dev/null +++ b/fish/llvmenv @@ -0,0 +1,7 @@ +#!/usr/bin/env fish + +if type -q llvmenv + set -gxa PATH (llvmenv prefix)/bin +end + +## EOF diff --git a/games/lutris/lutris.conf b/games/lutris/lutris.conf index e5ec5f8..c3ad6d2 100644 --- a/games/lutris/lutris.conf +++ b/games/lutris/lutris.conf @@ -15,6 +15,7 @@ left_side_panel_visible = False right_side_panel_visible = False hide-wine-non-esync-version-warning = True hide-wine-systemwide-install-warning = True +show_hidden_games = false [list view] name_column_width = 200 diff --git a/network/nginx.conf b/network/nginx.conf index c5b49b7..774152c 100644 --- a/network/nginx.conf +++ b/network/nginx.conf @@ -5,6 +5,8 @@ events { } http { + disable_symlinks off; + include mime.types; default_type application/octet-stream; sendfile on; @@ -12,53 +14,38 @@ http { gzip on; charset utf-8; - server { - listen 80; - server_name heavenisin.space; - - include common.conf; - - location /gopher/ { - root /srv; - index index.html index.htm; - autoindex on; - } - - location / { - root /srv/http/pub; - index index.html index.htm; - } - } - - server { - listen 80; - server_name mu.heavenisin.space; - - include common.conf; - - location / { - proxy_pass http://127.0.0.1:8000/; - } - } - upstream php-handler { - server unix:/run/php-fpm/php-fpm.sock; + server unix:/run/php-fpm.sock; + } + + server { + listen 80; + server_name heavenisin.space; + index index.html index.htm; + + include common.conf; + root /var/www/pub_http/; + + location /temp { + alias /tmp/hosting/; + } } server { listen 81; listen [::]:81; - server_name rain; - root /usr/share/webapps/nextcloud/; + root /media/store/nextcloud/; client_max_body_size 512M; - fastcgi_buffers 64 4K; + fastcgi_buffers 64 8K; + fastcgi_read_timeout 5m; add_header X-Content-Type-Options nosniff; add_header X-XSS-Protection "1; mode=block"; add_header X-Robots-Tag none; add_header X-Download-Options noopen; add_header X-Permitted-Cross-Domain-Policies none; + add_header X-Frame-Options sameorigin; location = /robots.txt { allow all; diff --git a/sshot/sharenix b/sshot/sharenix index 9fac2e1..ad371a3 100755 --- a/sshot/sharenix +++ b/sshot/sharenix @@ -5,18 +5,18 @@ function notify end function run_spectacle - set f "$HOME/Pictures/"(date "+%y%m%d-%H%M%S")".png" + set f "/tmp/"(date "+%y%m%d-%H%M%S")".png" - spectacle -b $argv -n -o "$f" + spectacle -b $argv -n - if test -f "$f" + if test -f "/tmp/temp.png" + mv "/tmp/temp.png" "$f" notify -u low -c transfer "Uploading..." if sharenix -s Greyserv "$f" notify -u low -c transfer.complete "Upload completed" else notify -u normal -c transfer.error "Upload failed" end + rm "$f" end - - rm "$f" end diff --git a/system/autostart/20-ibus.sh b/system/autostart/20-ibus.sh index 8c61879..9fdf2f4 100755 --- a/system/autostart/20-ibus.sh +++ b/system/autostart/20-ibus.sh @@ -1,2 +1,2 @@ #!/bin/sh -exec ibus-daemon +exec ibus-daemon --replace --xim --daemonize diff --git a/system/env/00-vars.sh b/system/env/00-vars.sh index c9ebb45..c44f41a 100644 --- a/system/env/00-vars.sh +++ b/system/env/00-vars.sh @@ -12,7 +12,7 @@ export KRITA_NO_STYLE_OVERRIDE=1 # misc export PATH=$HOME/.local/bin:$HOME/.gem/ruby/2.6.0/bin:$HOME/.cabal/bin:$PATH export DOOMWADDIR=/media/store/games/doom/iwads -export EDITOR=vim +export EDITOR=vi export WINEPREFIX=$HOME/progs/winepfx ## EOF diff --git a/system/fonts/67-defaults.conf b/system/fonts/67-defaults.conf index bb4838e..1de1a0a 100644 --- a/system/fonts/67-defaults.conf +++ b/system/fonts/67-defaults.conf @@ -44,7 +44,7 @@ monospace - Go Mono + Courier Prime Code @@ -69,7 +69,8 @@ monospace - Go Mono + Courier Prime Code + Iosevka Noto Sans Mono diff --git a/system/xorg/00-keyboard.conf b/system/xorg/00-keyboard.conf index c2d09c5..e1fcb08 100644 --- a/system/xorg/00-keyboard.conf +++ b/system/xorg/00-keyboard.conf @@ -1,4 +1,4 @@ Section "InputClass" Identifier "Keyboard0" - Option "XkbOptions" "caps:ctrl_modifier,compose:ralt" + Option "XkbOptions" "compose:ralt" EndSection diff --git a/system/xorg/10-monitor.conf b/system/xorg/10-monitor.conf index 123f2b8..48fa5c4 100644 --- a/system/xorg/10-monitor.conf +++ b/system/xorg/10-monitor.conf @@ -8,11 +8,17 @@ Section "Monitor" Option "Primary" "true" EndSection +Section "Monitor" + Identifier "HDMI0" + Option "Above" "DisplayPort0" +EndSection + Section "Device" Identifier "Device0" Driver "amdgpu" Option "Monitor-DisplayPort-1" "DisplayPort0" Option "Monitor-DVI-D-0" "DVI0" + Option "Monitor-HDMI-A-1" "HDMI0" Option "TearFree" "true" EndSection