summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryuzu-eva <stevenhu@web.de>2023-07-01 22:24:19 +0200
committeryuzu-eva <stevenhu@web.de>2023-07-01 22:24:19 +0200
commit1006987466e98b661a98164c1795ff5682d4260b (patch)
tree131e23460b806833676d1ffd8c9c51e9ad384bcf
parent23f3dcc4cc986507ba20a30d9312be9a3fc9d188 (diff)
update
-rwxr-xr-x.config/mpd/mpd.conf6
-rw-r--r--.config/nvim/lua/user/plugins/lspconfig.lua2
-rw-r--r--.config/nyxt/commands.lisp9
-rw-r--r--.config/nyxt/config.lisp65
-rw-r--r--.config/nyxt/keybinds.lisp18
-rwxr-xr-x.config/nyxt/scripts/weather3
-rw-r--r--.config/nyxt/search-engines.lisp45
-rw-r--r--.config/nyxt/status.lisp29
-rw-r--r--.config/nyxt/themes/cafebabe-dark.lisp37
-rw-r--r--.config/nyxt/url-redirects.lisp30
-rw-r--r--.config/shell/aliasrc1
-rw-r--r--.config/shell/profile2
-rw-r--r--.config/tmux/tmux.conf15
-rw-r--r--.ncmpcpp/config2
14 files changed, 14 insertions, 250 deletions
diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf
index 4bdd05b..0e7073d 100755
--- a/.config/mpd/mpd.conf
+++ b/.config/mpd/mpd.conf
@@ -2,7 +2,7 @@ bind_to_address "0.0.0.0"
#bind_to_address "/run/mpd/socket"
music_directory "/media/hdd/music"
-playlist_directory "~/.config/mpd/playlists"
+playlist_directory "~/.config/mpd/playlists"
db_file "~/.config/mpd/database"
log_file "~/.config/mpd/log"
pid_file "~/.config/mpd/pid"
@@ -17,8 +17,8 @@ audio_output {
# http streaming
audio_output {
type "httpd"
- name "My HTTP Stream"
- encoder "vorbis" # optional, vorbis or lame
+ name "HTTP Stream"
+ encoder "lame" # optional, vorbis or lame
port "8001"
quality "8.0" # do not define if bitrate is defined
# bitrate "256" # do not define if quality is defined
diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua
index 82b85b8..39f27c3 100644
--- a/.config/nvim/lua/user/plugins/lspconfig.lua
+++ b/.config/nvim/lua/user/plugins/lspconfig.lua
@@ -23,7 +23,7 @@ local on_attach = function(_, bufnr)
buf_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>')
buf_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>')
buf_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>')
- buf_keymap(bufnr, 'n', '<C-K>', '<cmd>lua vim.lsp.buf.signature_help()<CR>')
+ buf_keymap(bufnr, 'n', '<leader><C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>')
buf_keymap(bufnr, 'n', '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>')
buf_keymap(bufnr, 'n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>')
buf_keymap(bufnr, 'n', 'gr', ':Telescope lsp_references<CR>')
diff --git a/.config/nyxt/commands.lisp b/.config/nyxt/commands.lisp
deleted file mode 100644
index 159916f..0000000
--- a/.config/nyxt/commands.lisp
+++ /dev/null
@@ -1,9 +0,0 @@
-(in-package #:nyxt-user)
-
-(define-command-global show-weather ()
- (echo (uiop:run-program "~/.config/nyxt/scripts/weather" :output :string)))
-
-;;opens current url in different browser replace firefox with your browser/path
-(define-command-global open-external-browser ()
- "Open the current url in external browser"
- (uiop:run-program (list "firefox-bin" (render-url (url (current-buffer))))))
diff --git a/.config/nyxt/config.lisp b/.config/nyxt/config.lisp
deleted file mode 100644
index bfdb308..0000000
--- a/.config/nyxt/config.lisp
+++ /dev/null
@@ -1,65 +0,0 @@
-(in-package #:nyxt-user)
-
-(reset-asdf-registries)
-
-(defvar *web-buffer-modes*
- '(:emacs-mode
- :blocker-mode
- :force-https-mode
- :reduce-tracking-mode
- :user-script-mode
- :no-script-mode
- :no-webgl-mode))
-
-(define-nyxt-user-system-and-load nyxt-user/basic-config
- :components ("commands" "keybinds" "status" "url-redirects" "themes/cafebabe-dark.lisp"))
-
-;;; EXAMPLE
-;; (define-nyxt-user-system-and-load "nyxt-user/nx-fruit-proxy"
-;; :description "This proxy system saves us if nx-fruit fails to load.
-;; Otherwise it will break all the config loading."
-;; :depends-on ("nx-fruit"))
-
-(define-nyxt-user-system-and-load "nyxt-user/search-engines"
- :depends-on (:nx-search-engines) :components ("search-engines"))
-
-(define-configuration browser
- ((restore-session-on-startup-p nil)
- (remote-execution-p t)
- (external-editor-program
- (list "emacsclient" "-cn" "-a" "" "-F"))))
-
-(define-configuration nyxt/mode/user-script:user-script-mode
- ((nyxt/mode/user-script:user-scripts
- (list
- (make-instance 'nyxt/mode/user-script:user-script :base-path #p"~/.config/nyxt/scripts/4chan-x.user.js")
- (make-instance 'nyxt/mode/user-script:user-script :base-path #p"~/.config/nyxt/scripts/onee-chan.user.js")))))
-
-(define-configuration nyxt/mode/proxy:proxy-mode
- ((nyxt/mode/proxy:proxy (make-instance 'proxy
- :url (quri:uri "socks5://localhost:9050")
- :allowlist '("localhost" "localhost:8080")
- :proxied-downloads-p t))))
-
-(define-configuration (:modable-buffer :prompt-buffer :editor-buffer)
- ((default-modes `(:emacs-mode ,@%slot-value%))))
-
-(define-configuration :prompt-buffer
- ((dynamic-attribute-width-p t)))
-
-(define-configuration :web-buffer
- ((search-always-auto-complete-p nil)
- (global-history-p t)))
-
-(define-configuration :browser
- ((default-new-buffer-url (quri:uri "nyxt:nyxt/mode/repl:repl"))))
-
-(define-configuration :web-buffer
- ((default-modes `(,@*web-buffer-modes* ,@%slot-value%))))
-
-(define-configuration :reduce-tracking-mode
- ((query-tracking-parameters
- (append '("utm_source" "utm_medium" "utm_campaign" "utm_term" "utm_content")
- %slot-value%))
- (preferred-user-agent
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36")))
diff --git a/.config/nyxt/keybinds.lisp b/.config/nyxt/keybinds.lisp
deleted file mode 100644
index 52087d9..0000000
--- a/.config/nyxt/keybinds.lisp
+++ /dev/null
@@ -1,18 +0,0 @@
-(in-package #:nyxt-user)
-
-(define-configuration buffer
- ((override-map (let ((map (make-keymap "custom-map")))
- (define-key map
- "M-I" 'show-weather
- "C-2" 'open-external-browser
- "C-x C-b" 'switch-buffer
- "C-x b" 'list-buffers)
- map))))
-
-;;;; for some reason this does not work, even though it's from the manual
-;; (define-configuration base-mode
-;; ((keyscheme-map
-;; (define-keyscheme-map "my-base" (list :import %slot-value%)
-;; keyscheme:emacs
-;; (list
-;; "C-x C-b" NIL)))))
diff --git a/.config/nyxt/scripts/weather b/.config/nyxt/scripts/weather
deleted file mode 100755
index 0992d24..0000000
--- a/.config/nyxt/scripts/weather
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-curl wttr.in/Ludwigshafen?format=3
diff --git a/.config/nyxt/search-engines.lisp b/.config/nyxt/search-engines.lisp
deleted file mode 100644
index 4c7dec5..0000000
--- a/.config/nyxt/search-engines.lisp
+++ /dev/null
@@ -1,45 +0,0 @@
-(in-package #:nyxt-user)
-
-(defvar *duckduckgo-keywords*
- '(:theme :dark
- :help-improve-duckduckgo nil
- :homepage-privacy-tips nil
- :privacy-newsletter nil
- :newsletter-reminders nil
- :install-reminders nil
- :install-duckduckgo nil
- :units-of-measure :metric
- :keyboard-shortcuts t
- :advertisements nil
- :open-in-new-tab nil
- :infinite-scroll t
- :safe-search :off
- :font-size :medium
- :header-behavior :on-fixed
- :font :helvetica
- :background-color "000000")
- "My DDG settings, shared between the usual, image-search and other
-types of DuckDuckGo.")
-
-(define-configuration (buffer web-buffer)
- ((search-engines (list (engines:duckduckgo-html-only :shortcut "dho")
- (apply #'engines:duckduckgo
- :shortcut "d" *duckduckgo-keywords*)
- (apply #'engines:duckduckgo-images
- :shortcut "i" *duckduckgo-keywords*)
- (make-instance 'search-engine
- :shortcut "aw"
- :search-url "https://wiki.archlinux.org/index.php?search=~a&title=Special%3ASearch&fulltext=Search"
- :fallback-url "https://wiki.archlinux.org")
- (make-instance 'search-engine
- :shortcut "gen"
- :search-url "https://wiki.gentoo.org/index.php?title=Sepcial%3ASearch&search=~a&go=Go"
- :fallback-url "https://wiki.gentoo.org")
- (engines:invidious
- :shortcut "yt"
- :base-search-url "https://invidious.cafebabe.gay/search?q=~a"
- :fallback-url "https://invidious.cafebabe.gay")
- (make-instance 'search-engine
- :shortcut "lbx"
- :search-url "https://search.cafebabe.gay/search.php?q=~a"
- :fallback-url "https://search.cafebabe.gay")))))
diff --git a/.config/nyxt/status.lisp b/.config/nyxt/status.lisp
deleted file mode 100644
index 50d2090..0000000
--- a/.config/nyxt/status.lisp
+++ /dev/null
@@ -1,29 +0,0 @@
-(in-package #:nyxt-user)
-
-(define-configuration :status-buffer
- "Display modes as short glyphs."
- ((glyph-mode-presentation-p t)))
-
-(define-configuration :force-https-mode ((glyph "ϕ")))
-(define-configuration :reduce-tracking-mode ((glyph "τ")))
-(define-configuration :no-script-mode ((glyph "σ")))
-(define-configuration :no-webgl-mode ((glyph "ω")))
-(define-configuration :blocker-mode ((glyph "β")))
-
-(define-configuration status-buffer
- "Hide most of the status elements but URL and modes."
- ((style (str:concat
- %slot-value%
- (theme:themed-css (theme *browser*)
- `("#controls,#tabs"
- :display none !important))))))
-
-(defmethod format-status-load-status ((status status-buffer))
- "A fancier load status."
- (spinneret:with-html-string
- (:span (if (web-buffer-p (current-buffer))
- (case (slot-value (current-buffer) 'nyxt::status)
- (:unloaded "∅")
- (:loading "∞")
- (:finished ""))
- ""))))
diff --git a/.config/nyxt/themes/cafebabe-dark.lisp b/.config/nyxt/themes/cafebabe-dark.lisp
deleted file mode 100644
index 0ccffe1..0000000
--- a/.config/nyxt/themes/cafebabe-dark.lisp
+++ /dev/null
@@ -1,37 +0,0 @@
-(in-package #:nyxt-user)
-
-;; this automatically darkens Webkit-native interfaces and sends the
-;; "prefers-color-scheme: dark" to all the supporting websites.
-(setf (uiop:getenv "GTK_THEME") "Adwaita:dark")
-
-(define-configuration browser
- ((theme (make-instance
- 'theme:theme
- :background-color "#000000"
- :accent-color "#CD5C5C"
- :accent-alt-color "#6C2429"
- :warning-color "#CEFF00"
- :primary-color "rgb(170, 170, 170)"
- :secondary-color "rgb(100, 100, 100)"))))
-
-(define-configuration :dark-mode
- "Overriding the ugly gray-ish default colors"
- ((style
- (theme:themed-css (theme *browser*)
- `(*
- :background-color ,(if (theme:dark-p theme:theme)
- theme:background
- theme:on-background)
- "!important"
- :background-image none "!important"
- :color ,(if (theme:dark-p theme:theme)
- theme:on-background
- theme:background)
- "!important")
- `(a
- :background-color ,(if (theme:dark-p theme:theme)
- theme:background
- theme:on-background)
- "!important"
- :background-image none "!important"
- :color ,theme:primary "!important")))))
diff --git a/.config/nyxt/url-redirects.lisp b/.config/nyxt/url-redirects.lisp
deleted file mode 100644
index 5069c1c..0000000
--- a/.config/nyxt/url-redirects.lisp
+++ /dev/null
@@ -1,30 +0,0 @@
-(in-package #:nyxt-user)
-
-(defparameter old-reddit-handler
- (url-dispatching-handler
- 'old-reddit-dispatcher
- (match-regex "https?\:\/\/?.*?reddit\.com")
- (lambda (url)
- (quri:copy-uri url :host "old.reddit.com"))))
-
-(defparameter invidious-handler
- (url-dispatching-handler
- 'invidious-dispatcher
- (match-regex "https?\:\/\/?.*?(?:youtube\.com|youtu\.be|youtube-nocookie\.com).*")
- (lambda (url)
- (quri:copy-uri url :host "invidious.cafebabe.gay"))))
-
-(defparameter wikiless-handler
- (url-dispatching-handler
- 'wikiless-dispatcher
- (match-regex "https?\:\/\/?.*?wikipedia\.org.*")
- (lambda (url)
- (quri:copy-uri url :host "wikiless.org"))))
-
-(define-configuration buffer
- ((request-resource-hook
- (reduce #'hooks:add-hook
- (list old-reddit-handler
- invidious-handler
- wikiless-handler)
- :initial-value %slot-default%))))
diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index 396915d..20ed30a 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -16,6 +16,7 @@ alias nnn='nnn -Hde'
alias ea='vi ~/.config/shell/aliasrc'
alias ez='vi ~/.config/zsh/.zshrc'
alias eq='equery'
+alias sr='su - root'
alias cam='mpv --profile=low-latency --untimed /dev/video0'
# need to sign hid-nintendo.ko with every kernel update
diff --git a/.config/shell/profile b/.config/shell/profile
index b26003f..b181879 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -3,7 +3,7 @@ umask 0077
export _JAVA_AWT_WM_NONREPARENTING=1
export EDITOR="nvim"
export TERMINAL="st"
-export BROWSER="nyxt"
+export BROWSER="firefox-bin"
export XDG_CONFIG_HOME="$HOME/.config"
export XDG_DATA_HOME="$HOME/.local/share"
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 55f477c..dc495a9 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -40,10 +40,6 @@ bind C-w killp
bind C-q killw
bind C-p previous-window
bind C-n next-window
-# bind -n C-h select-pane -L
-# bind -n C-j select-pane -D
-# bind -n C-k select-pane -U
-# bind -n C-l select-pane -R
bind -n M-h resize-pane -L 5
bind -n M-j resize-pane -D 5
bind -n M-k resize-pane -U 5
@@ -63,12 +59,15 @@ if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
"bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'"
-bind-key -T copy-mode-vi 'C-h' select-pane -L
-bind-key -T copy-mode-vi 'C-j' select-pane -D
-bind-key -T copy-mode-vi 'C-k' select-pane -U
-bind-key -T copy-mode-vi 'C-l' select-pane -R
+bind-key -T copy-mode-vi 'C-H' select-pane -L
+bind-key -T copy-mode-vi 'C-J' select-pane -D
+bind-key -T copy-mode-vi 'C-K' select-pane -U
+bind-key -T copy-mode-vi 'C-L' select-pane -R
bind-key -T copy-mode-vi 'C-\' select-pane -l
+bind C-l send-keys 'C-l'
+bind C-k send-keys 'C-k'
+
# Turn the mouse off
set -g mouse off
diff --git a/.ncmpcpp/config b/.ncmpcpp/config
index 8d3f5dd..085037e 100644
--- a/.ncmpcpp/config
+++ b/.ncmpcpp/config
@@ -1,6 +1,6 @@
# Files
ncmpcpp_directory = ~/.ncmpcpp
-lyrics_directory = ~/.ncmpcpp/lyrics
+lyrics_directory = ~/.config/mpd/lyrics
mpd_host = localhost
mpd_port = 6600