diff options
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/channels.scm | 26 | ||||
| -rw-r--r-- | guix/home.scm | 21 | ||||
| -rw-r--r-- | guix/system-create.scm | 27 | ||||
| -rw-r--r-- | guix/uranus.scm | 10 |
4 files changed, 38 insertions, 46 deletions
diff --git a/guix/channels.scm b/guix/channels.scm deleted file mode 100644 index f068a56..0000000 --- a/guix/channels.scm +++ /dev/null @@ -1,26 +0,0 @@ -(cons* (channel - (name 'nonguix) - (url "https://gitlab.com/nonguix/nonguix") - (introduction - (make-channel-introduction - "897c1a470da759236cc11798f4e0a5f7d4d59fbc" - (openpgp-fingerprint - "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) - (channel - (name 'rosenthal) - (url "https://codeberg.org/hako/rosenthal.git") - (branch "trunk") - (introduction - (make-channel-introduction - "7677db76330121a901604dfbad19077893865f35" - (openpgp-fingerprint - "13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7")))) - (channel - (name 'hecate) - (url "https://git.thanosapollo.org/hecate") - (introduction - (make-channel-introduction - "6d40e319e46eddc6a3e1a97b1dd1dafedb785889" - (openpgp-fingerprint - "62B7 58D0 F671 9938 BC09 CECA 339F 736C 3A72 0928")))) - %default-channels) diff --git a/guix/home.scm b/guix/home.scm index c3071b3..2a54561 100644 --- a/guix/home.scm +++ b/guix/home.scm @@ -11,6 +11,7 @@ #:use-module (gnu home services shells) #:use-module (gnu home services desktop) #:use-module (gnu home services gnupg) + #:use-module (gnu home services messaging) #:use-module (hecate packages emacs) #:use-module (hecate packages hunspell) #:export (home)) @@ -24,23 +25,21 @@ (define thanos/emacs-packages - '("emacs-pgtk" "emacs-nov-el" "emacs-pdf-tools" "emacs-emms" - "emacs-geiser" "emacs-geiser-guile" "emacs-jabber" "emacs-yeetube" - "emacs-debbugs" "emacs-eshell-git-prompt" "emacs-0x0" "emacs-org-roam" - "emacs-markdown-mode" "emacs-gnosis" "emacs-notmuch")) + '("emacs-next-pgtk" "emacs-nov-el" "emacs-pdf-tools" "emacs-emms" + "emacs-geiser" "emacs-geiser-guile" "emacs-notmuch" "emacs-password-store" + "emacs-debbugs" "emacs-0x0" "emacs-emojify")) (define thanos/python-packages '("python-next" "python-pip" "python-lsp-server" "python-numpy")) (home-environment (packages (specifications->packages - (append '("perl" "yt-dlp" "icecat" "gcc-toolchain" "wl-clipboard" "sqlite" - "hyfetch" "transmission" "isync" "mpv" "steam" "signal-desktop" - "git" "fuzzel" "wl-clipboard" "alacritty" "password-store" "curl" "dino" - "bind" "nmap" "hunspell" "wtype" "hunspell-dict-en-med" "hunspell-dict-el" - "mlocate" "rsync" "grimshot" "nyxt" "swayidle" "wl-clipboard" "htop" - "net-tools" "gnupg" "texlive" "texlive-collection-latexrecommended" - "notmuch" "hunspell-dict-en-us" "sbcl" "xkeyboard-config") + (append '("perl" "yt-dlp" "torbrowser" "icecat" "sbcl" "notmuch" "hunspell-dict-en" + "gcc-toolchain" "sqlite" "hyfetch" "transmission" "isync" "mpv" + "steam" "signal-desktop" "git" "fuzzel" "alacritty" "password-store" + "curl" "dino" "bind" "nmap" "hunspell" "wtype" "hunspell-dict-en-med" + "hunspell-dict-el" "mlocate" "rsync" "grimshot" "swayidle" "htop" + "net-tools" "gnupg" "texlive" "texlive-collection-latexrecommended") thanos/emacs-packages thanos/python-packages thanos/fonts-packages))) (services (list (service home-bash-service-type diff --git a/guix/system-create.scm b/guix/system-create.scm index 70f7570..dac64a0 100644 --- a/guix/system-create.scm +++ b/guix/system-create.scm @@ -26,7 +26,7 @@ '("sway" "swaylock" "swaylock-effects" "swaybg" "waybar" "gnupg" "pinentry" "font-jetbrains-mono" "docker" "docker-cli" "dbus" "xf86-input-libinput" - "xf86-video-fbdev")) + "xf86-video-fbdev" "tailscale-bin")) (define* (system-create #:key (system-packages thanos/system-packages) @@ -48,7 +48,7 @@ (initrd microcode-initrd) (firmware (list linux-firmware)) - ;; The list of user accounts ('root' is implicit). + (users (cons* (user-account (name "thanos") (comment "Thanos Apollo") @@ -57,13 +57,10 @@ (supplementary-groups '("wheel" "netdev" "audio" "video" "docker" "kvm"))) %base-user-accounts)) - ;; Packages installed system-wide. (packages (append (map specification->package system-packages) %base-packages)) - ;; Below is the list of system services. To search for available - ;; services, run 'guix system search KEYWORD' in a terminal. (services (append (list (service docker-service-type) @@ -79,8 +76,24 @@ (service tailscale-service-type) (service wpa-supplicant-service-type) ;; Needed by NetworkManager (service network-manager-service-type) + (service block-facebook-hosts-service-type) + (simple-service 'add-extra-hosts + hosts-service-type + (list (host "192.168.0.100" "zeus" + '()) + (host "192.168.0.101" "uranus" + '()))) + (service tailscale-service-type) - (service transmission-daemon-service-type) + (service transmission-daemon-service-type + (transmission-daemon-configuration + ;; Accept requests from this and other hosts on the + ;; local network + (rpc-whitelist-enabled? #t) + (rpc-whitelist '("::1" "127.0.0.1" "192.168.*")) + (rpc-username "z3us") + ;; hashed password + (rpc-password "{eab35f5df5b1e2691acf11f49be1b1dcffa55a59FyE5eNd8"))) ;; tty login (service elogind-service-type) @@ -149,7 +162,7 @@ (targets (list "/boot/efi")) (keyboard-layout keyboard-layout))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;; Filesystem (swap-devices (list (swap-space (target (uuid swap-uuid))))) diff --git a/guix/uranus.scm b/guix/uranus.scm index 2a02fd5..7cc4f99 100644 --- a/guix/uranus.scm +++ b/guix/uranus.scm @@ -5,7 +5,8 @@ #:use-module (gnu services dbus) #:use-module (gnu services docker) #:use-module (gnu services version-control) - #:use-module (gnu services cgit)) + #:use-module (gnu services cgit) + #:use-module (rosenthal services networking)) (use-service-modules cups desktop networking ssh docker xorg) @@ -28,6 +29,10 @@ (service openssh-service-type (openssh-configuration (permit-root-login 'prohibit-password))) + + (service tailscale-service-type) + + (service nginx-service-type (nginx-configuration (server-blocks @@ -43,9 +48,10 @@ (listen '("*:8001")) (ssl-certificate #f) (ssl-certificate-key #f)))))) + (service cgit-service-type (cgit-configuration - (root-desc "Freely you have received; freely give. | Mathew 10:8") + (root-desc "Δωρεὰν ἐλάβετε, δωρεὰν δότε. | Freely you have received; freely give. (Mathew 10:8)") (project-list '("dotfiles" "gnosis" "yeetube" "hecate" "pcmpl-emerge" "pcmpl-rc" "pcmpl-tailscale" "greek-polytonic.el")) |