From e800af660f44c4f2b29bd3c3c2fa85acce03f1db Mon Sep 17 00:00:00 2001 From: Jakub Dlugosz Date: Fri, 31 Oct 2025 13:27:43 +0100 Subject: Adjust some values in config --- src/jd/features/emacs-xyz.scm | 2 +- src/jd/host.scm | 7 ++- src/jd/user.scm | 127 ++++++++++++++++++++++++++---------------- 3 files changed, 84 insertions(+), 52 deletions(-) diff --git a/src/jd/features/emacs-xyz.scm b/src/jd/features/emacs-xyz.scm index d79b920..8b414ef 100644 --- a/src/jd/features/emacs-xyz.scm +++ b/src/jd/features/emacs-xyz.scm @@ -114,7 +114,7 @@ '(,capture-key "University task" entry (function org-uni-capture-task-function) - "* TODO %? :%(org-capture-get :uni-class-tag):\n:PROPERTIES:\n:CREATED: %U\n:END:\n")))) + "* TODO %? :%(org-capture-get :uni-class-tag):\n:PROPERTIES:\n:CREATED: %U\n:END:\n")))) #:summary "This Emacs Lisp script enhances =org-mode= with a feature for managing university tasks." #:commentary "This Emacs Lisp script enhances =org-mode= with a feature for managing university tasks." #:authors (list "Jakub Dlugosz ") diff --git a/src/jd/host.scm b/src/jd/host.scm index 1bd5c30..4e573e4 100644 --- a/src/jd/host.scm +++ b/src/jd/host.scm @@ -54,7 +54,8 @@ (list (feature-host-info #:host-name "berserker" - #:timezone "Europe/Warsaw") + #:timezone "Europe/Warsaw" + #:issue "Greetings, wandering soul, craving the tapping keystrokes?") (feature-file-systems #:mapped-devices mapped-devices #:file-systems file-systems) @@ -64,5 +65,7 @@ (profile docked ((output eDP-1 disable) (output DP-3 enable))) (profile docked ((output eDP-1 disable) - (output DP-4 enable))))) + (output DP-4 enable))) + (profile docked ((output eDP-1 disable) + (output DP-6 enable))))) (feature-hidpi))) diff --git a/src/jd/user.scm b/src/jd/user.scm index 7f3bdab..2224712 100644 --- a/src/jd/user.scm +++ b/src/jd/user.scm @@ -12,8 +12,8 @@ #:use-module (gnu services) #:use-module (gnu services base) #:use-module (gnu services cups) - #:use-module (gnu services nix) #:use-module (gnu services desktop) + #:use-module (gnu services nix) #:use-module (gnu system pam) #:use-module (guix channels) @@ -44,7 +44,7 @@ (use-modules (rde features module) ...)) (define-syntax-rule (use-rde-home-services-modules module ...) - (use-modules (rde features module) ...)) + (use-modules (rde home services module) ...)) (use-rde-features-modules android base bittorrent clojure containers @@ -55,8 +55,7 @@ shellutils sourcehut ssh system terminals tmux uml version-control video virtualization web-browsers wm xdg python) -(use-rde-home-services-modules - emacs shells video wm) +(use-rde-home-services-modules i2p) (define* (mail-acc id user #:optional (type 'migadu)) "Make a simple mail-account with gmail type by default." @@ -87,14 +86,15 @@ (feature-xdg #:xdg-user-directories-configuration (home-xdg-user-directories-configuration - (music "$HOME/music") - (videos "$HOME/videos") - (pictures "$HOME/pics") - (documents "$HOME/docs") + (desktop "$HOME") + (templates "$HOME") (download "$HOME/dl") (publicshare "$HOME/sync") - (desktop "$HOME") - (templates "$HOME"))) + (music "/data/jakub/music") + (videos "/data/jakub/videos") + (pictures "/data/jakub/pics") + (documents "/data/jakub/docs") + )) (feature-pipewire) (feature-shepherd))) @@ -226,7 +226,7 @@ lisp-interaction-mode-hook scheme-mode-hook clojure-mode-hook)) - (add-hook hook 'paredit-mode))) + (add-hook hook 'paredit-mode))) (with-eval-after-load 'rainbow-delimiters (dolist (hook '(emacs-lisp-mode-hook @@ -253,8 +253,11 @@ (global-page-break-lines-mode 1)) (with-eval-after-load 'gptel - (setq gptel-model 'gpt-4o - gptel-backend (gptel-make-gh-copilot "Copilot"))) + (setq gptel-model 'gpt-4o + gptel-backend (gptel-make-gh-copilot "Copilot"))) + + (with-eval-after-load 'geiser-mode + (setq geiser-mode-auto-p nil)) (with-eval-after-load 'simple (add-hook @@ -292,7 +295,8 @@ "emacs-nginx-mode" "emacs-yaml-mode" "emacs-org-present" - "emacs-org-pdftools")))) + "emacs-org-pdftools" + "emacs-org-pomodoro")))) (feature (name f-name) (values `((,f-name . #t))) @@ -301,34 +305,36 @@ (define-public %emacs-features (list (feature-emacs-modus-themes #:deuteranopia? #f) - (feature-emacs-citation #:global-bibliography (list "/home/jakub/docs/notes/references/master.bib")) + (feature-emacs-citation #:global-bibliography (list "/data/jakub/notes/references/master.bib")) (feature-emacs-completion #:mini-frame? #f ;; Dziwne kurwa bledy #:marginalia-align 'right) (feature-emacs-corfu #:corfu-doc-auto #f) (feature-emacs #:default-application-launcher? #t) - (feature-emacs-elfeed #:elfeed-org-files '("/home/jakub/docs/notes/rss.org")) + (feature-emacs-elfeed #:elfeed-org-files '("/data/jakub/notes/rss.org")) (feature-emacs-erc #:erc-log? #t #:erc-autojoin-channels-alist '((Libera.Chat "#rde") (Libera.Chat "#systemcrafters") (Libera.Chat "#lisp-pl") - (Libera.Chat "#hsp"))) + (Libera.Chat "#lispcafe") + (Libera.Chat "##metal") + (Libera.Chat "#hsp") + (Libera.Chat "#spritely") + (Libera.Chat "#guix"))) (feature-emacs-keycast #:turn-on? #f) - (feature-emacs-org-agenda #:org-agenda-files '("/home/jakub/docs/notes/personal.org" - "/home/jakub/docs/notes/s22425.org")) (feature-emacs-org-agenda #:org-agenda-files '("/data/jakub/notes/personal.org" "/data/jakub/notes/s32526.org")) (feature-emacs-org-uni) (feature-emacs-org-dailies #:encrypted? #t) - (feature-emacs-org #:org-directory "/home/jakub/docs/notes" + (feature-emacs-org #:org-directory "/data/jakub/notes" #:org-indent? #t) - (feature-emacs-org-roam #:org-roam-directory "/home/jakub/docs/notes/slip-box") + (feature-emacs-org-roam #:org-roam-directory "/data/jakub/notes/slip-box") (feature-emacs-spelling #:spelling-program (@ (gnu packages hunspell) hunspell) #:spelling-dictionaries (list (@ (gnu packages hunspell) hunspell-dict-en) (@ (gnu packages hunspell) hunspell-dict-pl)) #:ispell-standard-dictionary "pl_PL") (feature-emacs-dired #:extra-switches "-h") (feature-emacs-monocle #:olivetti-body-width 100) - (feature-emacs-denote #:denote-directory "/home/jakub/docs/notes") + (feature-emacs-denote #:denote-directory "/data/jakub/notes/denote") (feature-emacs-devdocs) (feature-emacs-appearance) (feature-emacs-dashboard) @@ -385,13 +391,13 @@ (port . 22) (compression . #t)))) (ssh-host - (host "amg.abaks.pl") + (host "git.jdlugosz.com") (options - '((user . "serwis") + '((user . "git") (port . 22) (compression . #t)))) (ssh-host - (host "wifi-dev.abaks.pl") + (host "*.abaks.pl") (options '((user . "serwis") (port . 22) @@ -423,6 +429,31 @@ home-environment-variables-service-type '(("XDG_DATA_DIRS" . "$XDG_DATA_DIRS:$HOME/.local/share/flatpak/exports/share"))) + (simple-service + 'i2pd-add-ilita-irc + home-i2pd-service-type + (home-i2pd-extension + (tunnels-conf + `((IRC-ILITA ((type . client) + (address . 127.0.0.1) + (port . 6669) + (destination . irc.ilita.i2p) + (destinationport . 6667) + (keys . ilita-keys.dat))) + (BETA-CRAFT ((type . client) + (address . 192.168.122.1) + (port . 25565) + (destination . jpkqfe5q5z74i4esbcqilwozv72gbrkm4bueibblm732egjlzy6a.b32.i2p ) + (destinationport . 25565) + (gzip . false) + (inbound.length . 1) + (outbound.length . 1) + (inbound.quantity . 3) + (outbound.quantity . 3) + (i2cp.leaseSetType . 3) + (i2cp.leaseSetEncType . 4) + (keys . betacraft.dat))))))) + (simple-service 'home-profile-extra-packages home-profile-service-type @@ -436,35 +467,32 @@ "figlet" "calibre" - "libnotify" + "libnotify" - "flatpak" + "flatpak" "wine64" - "alsa-utils" - "pavucontrol" - "imagemagick" - "obs" "obs-wlrobs" - "binutils" "make" "gdb" + "alsa-utils" + "pavucontrol" + "imagemagick" + "obs" "obs-wlrobs" + "binutils" "make" "gdb" - "hicolor-icon-theme" "adwaita-icon-theme" - "gnome-themes-extra" "papirus-icon-theme" - "arc-theme" + "hicolor-icon-theme" "adwaita-icon-theme" + "gnome-themes-extra" "papirus-icon-theme" + "arc-theme" - "xdg-desktop-portal-gnome" + "xdg-desktop-portal-gnome" - "fd" - "nautilus" - "qbittorrent" - "kdenlive" "gimp" - "blender" + "kdenlive" "gimp" + "freecad" - "ripgrep" "curl" + "ripgrep" "curl" - "texlive" "texlive-collection-basic" - "texlive-bin" "texlive-collection-latex" - "texlive-collection-fontsrecommended" - "texlive-collection-pictures" - "texlive-collection-latexextra" + "texlive" "texlive-collection-basic" + "texlive-bin" "texlive-collection-latex" + "texlive-collection-fontsrecommended" + "texlive-collection-pictures" + "texlive-collection-latexextra" "texlive-dvipng"))))))) @@ -531,8 +559,9 @@ (network "irc.libera.chat") (nick "jdlugosz963")))) (feature-sourcehut - #:user-name-fn (const "jdlugosz963")) + #:user-name-fn (const "jdlugosz")) (feature-keyboard #:keyboard-layout (keyboard-layout "pl")) (feature-ssh-extra-config) - (feature-additional-services)))) + (feature-additional-services) + ) -- cgit v1.2.3