diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 94dbd23..11641d9 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -183,11 +183,7 @@ ;; EPUB reader (use-package nov :init - (setq auto-mode-alist - (map-merge 'list - '(("\\.epub\\'" . nov-mode)) - auto-mode-alist)) - ) + (add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode))) (use-package company :init (global-company-mode) @@ -247,21 +243,18 @@ (defun load-python-env () "Set up the Python IDE in the current project." (interactive) - (when (derived-mode-p 'python-mode) - (progn - (poetry-venv-workon) - (eglot-ensure)))) + (progn + (ignore-errors (poetry-venv-workon)) + (eglot-ensure))) (use-package python :bind (:map python-mode-map ("C-c C-p" . nil) ("C-c C-l" . nil) ("C-c t" . elpy-test)) - :hook (hack-local-variables . load-python-env) + :hook (python-mode . load-python-env) :config (load "python-tests.el") - :custom - (elpy-test-runner 'elpy-test-pytest-runner) ) ;; Jupyter notebook integration @@ -287,19 +280,6 @@ (rustic-lsp-client 'eglot) ) -(use-package go-config - :ensure nil - :hook - (go-ts-mode . eglot-ensure) - :init - (setq auto-mode-alist - (map-merge 'list - '(("\\.go\\'" . go-ts-mode) - ("/go\\.mod\\'" . go-mod-ts-mode) - ("/go\\.work\\'" . go-work-ts-mode)) - auto-mode-alist)) - ) - (use-package gptel :custom ; keep-sorted start diff --git a/.config/setup/01-install-packages.sh b/.config/setup/01-install-packages.sh index 029fd59..2c49b8f 100755 --- a/.config/setup/01-install-packages.sh +++ b/.config/setup/01-install-packages.sh @@ -27,7 +27,6 @@ DEB_PKGS=( fuzzel gdb gnumeric - gopls graphviz grim guile-3.0 @@ -87,14 +86,12 @@ DEB_PKGS=( xdg-desktop-portal-wlr xournalpp yt-dlp - awscli zip # keep-sorted end ) META_PKGS=( # keep-sorted start fonts-noto - golang podman-compose # keep-sorted end ) diff --git a/.config/systemd/user/get-nasa-apod.service b/.config/systemd/user/get-nasa-apod.service deleted file mode 100644 index 1da3c26..0000000 --- a/.config/systemd/user/get-nasa-apod.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Refresh the wallpaper using the NASA Astronomy Picture of the Day -Wants=get-nasa-apod.timer - -[Service] -WorkingDirectory=%h -ExecStart=%h/.local/bin/get-nasa-apod - -[Install] -WantedBy=default.target diff --git a/.config/systemd/user/get-nasa-apod.timer b/.config/systemd/user/get-nasa-apod.timer deleted file mode 100644 index 4cac963..0000000 --- a/.config/systemd/user/get-nasa-apod.timer +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Daily NASA wallpaper fetch -Requires=get-nasa-apod.service - -[Timer] -Unit=nasa-apod.service -OnCalendar=daily - -[Install] -WantedBy=timers.target diff --git a/.gitconfig b/.gitconfig index e0d1e54..1aaaa5d 100644 --- a/.gitconfig +++ b/.gitconfig @@ -10,10 +10,6 @@ [remote] pushDefault = . [git-sync] - # keep-sorted start - syncEnabled = true - syncNewFiles = true syncSkipHooks = true - # keep-sorted end [include] path = .hostgitconfig diff --git a/.local/bin/get-nasa-apod b/.local/bin/get-nasa-apod deleted file mode 100755 index e6560b9..0000000 --- a/.local/bin/get-nasa-apod +++ /dev/null @@ -1,41 +0,0 @@ -#! /usr/bin/bash - -set -euo pipefail -IFS=$'\n\t' - -API_KEY="${NASA_API_KEY:-DEMO_KEY}" -if [ "${API_KEY}" = "DEMO_KEY" ]; then - echo "No API key set! using demo key." -fi - -WALLPAPERS="$(systemd-path user)"/Wallpapers - -mkdir --parents "${WALLPAPERS}" - -APOD_URL="https://api.nasa.gov/planetary/apod?api_key=${API_KEY}" -response="$(curl --silent "${APOD_URL}")" -picture_date="$(printf '%s' "${response}" | jq --raw-output .date)" -picture_url="$(printf '%s' "${response}" | jq --raw-output .hdurl)" - -extension="${picture_url##*.}" -filename="${picture_date}.${extension}" -outfile="${WALLPAPERS}/${filename}" - -if [ -f "${outfile}" ]; then - echo "Target file already exists" - exit 0 -fi - -tempfile="$(mktemp)" -curl \ - --location \ - --output "${tempfile}" \ - --silent \ - "${picture_url}" -mv "${tempfile}" "${outfile}" -ln \ - --force \ - --symbolic \ - "${outfile}" \ - "${WALLPAPERS}/today.${extension}" -swaymsg reload diff --git a/.local/bin/sync-git-repos b/.local/bin/sync-git-repos index d1fce9e..92d7258 100755 --- a/.local/bin/sync-git-repos +++ b/.local/bin/sync-git-repos @@ -12,7 +12,7 @@ sync_repo () { repo=$1 echo git-sync "${repo}" - ( cd "${repo}" && "$(systemd-path user-state-private)"/git-sync/git-sync sync ) + ( cd "${repo}" && "$(systemd-path user-state-private)"/git-sync/git-sync -n -s sync ) echo }