diff --git a/.doom.d/config.el b/.doom.d/config.el index 8f040e2..bf7ffa3 100644 --- a/.doom.d/config.el +++ b/.doom.d/config.el @@ -83,6 +83,3 @@ '("pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f" "pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f" "pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f")) - -(after! - (setq lsp-haskell-formatting-provider "brittany")) diff --git a/.doom.d/custom.el b/.doom.d/custom.el index 37d63cc..0d22ed7 100644 --- a/.doom.d/custom.el +++ b/.doom.d/custom.el @@ -6,7 +6,7 @@ '(ansi-color-names-vector ["#282828" "#fb4934" "#b8bb26" "#fabd2f" "#83a598" "#cc241d" "#8ec07c" "#ebdbb2"]) '(custom-safe-themes - '("246a9596178bb806c5f41e5b571546bb6e0f4bd41a9da0df5dfbca7ec6e2250c" "745d03d647c4b118f671c49214420639cb3af7152e81f132478ed1c649d4597d" "2035a16494e06636134de6d572ec47c30e26c3447eafeb6d3a9e8aee73732396" "8a379e7ac3a57e64de672dd744d4730b3bdb88ae328e8106f95cd81cbd44e0b6" "6c531d6c3dbc344045af7829a3a20a09929e6c41d7a7278963f7d3215139f6a7" default)) + '("2035a16494e06636134de6d572ec47c30e26c3447eafeb6d3a9e8aee73732396" "8a379e7ac3a57e64de672dd744d4730b3bdb88ae328e8106f95cd81cbd44e0b6" "6c531d6c3dbc344045af7829a3a20a09929e6c41d7a7278963f7d3215139f6a7" default)) '(exwm-floating-border-color "#504945") '(fci-rule-color "#7c6f64") '(highlight-tail-colors ((("#363627" "#363627") . 0) (("#323730" "#323730") . 20))) @@ -19,9 +19,6 @@ '(pdf-view-midnight-colors (cons "#ebdbb2" "#282828")) '(rustic-ansi-faces ["#282828" "#fb4934" "#b8bb26" "#fabd2f" "#83a598" "#cc241d" "#8ec07c" "#ebdbb2"]) - '(safe-local-variable-values - '((haskell-process-use-ghci . t) - (haskell-indent-spaces . 4))) '(vc-annotate-background "#282828") '(vc-annotate-color-map (list diff --git a/.doom.d/init.el b/.doom.d/init.el index 9c80d47..a2f0e96 100644 --- a/.doom.d/init.el +++ b/.doom.d/init.el @@ -148,7 +148,7 @@ ;;nim ; python + lisp at the speed of c ;;nix ; I hereby declare "nix geht mehr!" ;;ocaml ; an objective camel - (org +pretty) ; organize your plain life in plain text + org ; organize your plain life in plain text ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional diff --git a/.doom.d/packages.el b/.doom.d/packages.el index d31be27..d903532 100644 --- a/.doom.d/packages.el +++ b/.doom.d/packages.el @@ -51,5 +51,3 @@ (package! exec-path-from-shell) (package! ewal) (package! ewal-doom-themes) - -(package! crdt :pin "81b55a27") diff --git a/.scripts/backUpRunning.sh b/.scripts/backUpRunning.sh index 726357d..35dd999 100755 --- a/.scripts/backUpRunning.sh +++ b/.scripts/backUpRunning.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -if ps aux | egrep -q '[t]imeshift|[r]sync'; then +if ps aux | egrep '[r]sync'; then echo " " fi diff --git a/.scripts/changebg b/.scripts/changebg index d19bfc0..33ba214 100755 --- a/.scripts/changebg +++ b/.scripts/changebg @@ -26,12 +26,11 @@ args=("$@") PATH_TO_IMG="${args[0]}" if [[ -z "$PATH_TO_IMG" ]]; then - wpg -m + wpg -m . "${HOME}/.cache/wal/colors.sh" PATH_TO_IMG=$wallpaper else - additionalArgs=("${args[@]:1}") wpg -a $PATH_TO_IMG wpg -s "$(basename $PATH_TO_IMG)" fi @@ -61,8 +60,7 @@ zathura-pywal emacsclient -e "(load-theme 'ewal-doom-one)" ~/dev/linux/telegram-palette-gen/telegram-palette-gen --wal -colorblocks -betterlockscreen -u $PATH_TO_IMG 2>/dev/null & +betterlockscreen -u $PATH_TO_IMG & fish -c "source ~/.cache/wal/colors.fish"