summaryrefslogtreecommitdiff
path: root/systems
diff options
context:
space:
mode:
authorMarek Paśnikowski <marek@marekpasnikowski.pl>2025-06-17 09:17:22 +0200
committerMarek Paśnikowski <marek@marekpasnikowski.pl>2025-06-17 09:17:22 +0200
commit9717856c4fdd917b58f9e5f2be5094b6d38aa646 (patch)
treebeb17243f38b53020d1d1c251f67d2c38415bbde /systems
parent08ff3bc3215745859984aa2cb6a919ef67533099 (diff)
systems: eliminate dead code related to izumi
Diffstat (limited to 'systems')
-rw-r--r--systems/izumi/home-files/emacs-configuration.el111
-rw-r--r--systems/izumi/home-files/git-ignore.conf48
-rw-r--r--systems/izumi/home-files/gitconfig10
-rw-r--r--systems/izumi/home-files/gnus-configuration.el85
-rw-r--r--systems/izumi/izumi.scm551
-rw-r--r--systems/izumi/system-files/smtpd.conf24
-rw-r--r--systems/izumi/system-files/sudoers3
7 files changed, 0 insertions, 832 deletions
diff --git a/systems/izumi/home-files/emacs-configuration.el b/systems/izumi/home-files/emacs-configuration.el
deleted file mode 100644
index e4a1d70..0000000
--- a/systems/izumi/home-files/emacs-configuration.el
+++ /dev/null
@@ -1,111 +0,0 @@
-;; Disable Backup Files
-(setq make-backup-files nil)
-
-;;; https://github.com/fimblo/dot.emacs
-;;; Theme Activation
-(load-theme 'modus-vivendi)
-
-;;; Disable Org Indent Mode
-(add-hook 'org-mode-hook (lambda () (org-indent-mode -1)))
-
-;;; Enable ParEdit
-(add-hook 'prog-mode-hook 'enable-paredit-mode)
-
-;;; https://elpa.gnu.org/packages/aggressive-indent.html
-;;; Automatic Activation of Aggressive Indent
-;; (global-aggressive-indent-mode)
-
-;; Highlight the pair of delimiters under the cursor
-(setq-default show-paren-mode 1
- show-paren-delay 0)
-
-;;; https://guix.gnu.org/manual/en/html_node/The-Perfect-Setup.html
-;;; Copyright Information
-(setq-default user-full-name "Marek Paśnikowski"
- user-mail-address "marek@marekpasnikowski.pl")
-
-(setq-default epg-gpg-program "gpg2")
-
-;;;https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/master/gnus-guide-en.org#my-gnusel
-(setq-default send-mail-function 'smtpmail-send-it
- smtpmail-stream-type 'ssl
- smtpmail-smtp-server "marekpasnikowski.pl"
- smtpmail-smtp-service 465
- ;; smtpmail-local-domain "izumi.lan"
- smtpmail-debug-info t)
-
-(require 'smtpmail)
-
-;;; https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/master/gnus-guide-en.org#my-gnusel
-(add-hook 'message-mode-hook
- (lambda ()
- (flyspell-mode t)
- (local-set-key (kbd "TAB")
- 'bbdb-complete-name)))
-
-;;; Startup Screen Inhibition
-(setq-default inhibit-startup-screen t)
-
-;; Enable the column-100 line
-(setq-default display-fill-column-indicator-column 100
- fill-column 100
- org-startup-truncated nil)
-(set-face-attribute 'fill-column-indicator nil :foreground "green")
-(global-display-fill-column-indicator-mode)
-
-;;; Enable Org Modern Style
- ;(with-eval-after-load 'org (global-org-modern-mode))
-
-;; Prepare Literate Programming
-(setq-default
- org-startup-indented t
- org-confirm-babel-evaluate nil
- org-src-fontify-natively t
- org-src-tab-acts-natively t)
-(org-babel-do-load-languages 'org-babel-load-languages '((emacs-lisp . t)
- (scheme . t )
- (shell . t )))
-
-(add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode))
-
-;; Monospace Font in Ebook Reader
-(setq-default nov-variable-pitch nil)
-
-;; Disable Toolbar
-(tool-bar-mode -1)
-
-;; GNUS Configuration
-;; (setq-default gnus-auto-select-first nil
-;; gnus-select-method '(nnnil "")
-;; gnus-secondary-select-methods '((nnimap "outlook"
-;; (nnimap-address "outlook.office365.com")
-;; (nnimap-server-port 993)
-;; (nnimap-stream ssl)
-;; (nnimap-authinfo-file "~/.authinfo"))
-;; (nnimap "home"
-;; (nnimap-address "serwer1930490.home.pl")
-;; (nnimap-server-port 993)
-;; (nnimap-stream ssl)
-;; (nnimap-authinfo-file "~/.authinfo")))
-;; nnmail-split-method 'nnmail-split-fancy
-;; nnmail-split-fancy '(| "normal"))
-;; (add-hook 'gnus-group-mode-hook 'gnus-topic-mode)
-
-;; ORG-FC Configuration
-(require 'org-fc-hydra)
-(setq-default
- org-fc-algorithm 'tn
- org-fc-shuffle-positions t
- org-fc-directories '("~/Dokumenty/fiszki"))
-
-;; Nix Mode
-;; (require 'nix-mode)
-;; (add-to-list 'auto-mode-alist '("\\.nix\\'" . nix-mode))
-
-;; (setq tramp-remote-path
-;; (append tramp-remote-path
-;; '(tramp-own-remote-path
-;; "~/.guix-profile/bin"
-;; "~/.guix-profile/sbin"
-;; "/run/current-system/profile/bin"
-;; "/run/current-system/profile/sbin")))
diff --git a/systems/izumi/home-files/git-ignore.conf b/systems/izumi/home-files/git-ignore.conf
deleted file mode 100644
index 98e588f..0000000
--- a/systems/izumi/home-files/git-ignore.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- mode: gitignore; -*-
-*~
-\#*\#
-/.emacs.desktop
-/.emacs.desktop.lock
-*.elc
-auto-save-list
-tramp
-.\#*
-
-# Org-mode
-.org-id-locations
-*_archive
-
-# flymake-mode
-*_flymake.*
-
-# eshell files
-/eshell/history
-/eshell/lastdir
-
-# elpa packages
-/elpa/
-
-# reftex files
-*.rel
-
-# AUCTeX auto folder
-/auto/
-
-# cask packages
-.cask/
-dist/
-
-# Flycheck
-flycheck_*.el
-
-# server auth directory
-/server/
-
-# projectiles files
-.projectile
-
-# directory configuration
-.dir-locals.el
-
-# network security
-/network-security.data
diff --git a/systems/izumi/home-files/gitconfig b/systems/izumi/home-files/gitconfig
deleted file mode 100644
index 300f906..0000000
--- a/systems/izumi/home-files/gitconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-[commit]
- gpgsign = true
-
-[user]
- email = marek@marekpasnikowski.pl
- name = Marek Paśnikowski
- signingkey = 6D81B1207711899F
-
-[push]
- autoSetupRemote = true
diff --git a/systems/izumi/home-files/gnus-configuration.el b/systems/izumi/home-files/gnus-configuration.el
deleted file mode 100644
index 570b8fd..0000000
--- a/systems/izumi/home-files/gnus-configuration.el
+++ /dev/null
@@ -1,85 +0,0 @@
-;;; https://github.com/redguardtoo/mastering-emacs-in-one-year-guide/blob/master/gnus-guide-en.org#my-gnusel
-;; (require 'nnir)
-
-;; (setq-default gnus-select-method '(nntp "news.gwene.org"))
-
-(setq-default epa-file-cache-passphrase-for-symmetric-encryption t)
-
-(setq-default gnus-select-method
- '(nnimap "marekpasnikowski.pl"
- (nnimap-address "marekpasnikowski.pl")
- (nnimap-server-port 993)
- (nnimap-stream ssl)
- ;; (nnir-search-engine imap)
- (nnmail-expiry-wait 90)))
-
-(setq-default gnus-thread-sort-functions
- '(gnus-thread-sort-by-most-recent-date
- (not gnus-thread-sort-by-number)))
-
-(setq-default gnus-use-cache t)
-
-(defun my-gnus-group-list-subscribed-groups ()
- "List all subscribed groups with or without un-read messages"
- ()
- (interactive)
- (gnus-group-list-all-groups 5))
-
-(define-key gnus-group-mode-map
- (kbd "o") 'my-gnus-group-list-subscribed-groups)
-
-;; (add-to-list 'load-path "~/Dokumenty/bbdb")
-;; (require 'bbdb)
-;; (bbdb-initialize 'message 'gnus 'sendmail)
-;; (add-hook 'gnus-startup-hook 'bbdb-insinuate-gnus)
-;; (setq-default bbdb/mail-auto-create-p t
-;; bbdb/news-auto-create-p t)
-
-(setq-default gnus-read-active-file 'some)
-
-(eval-after-load 'mailcap
- '(progn (cond ((eq system-type 'darwin))
- ((eq system-type 'windows-nt))
- (t (mailcap-parse-mailcaps)))))
-
-(add-hook 'gnus-group-mode-hook
- 'gnus-topic-mode)
-
-(setq-default gnus-summary-thread-gathering-function
- 'gnus-gather-threads-by-subject)
-
-(setq-default gnus-thread-hide-subtree t)
-(setq-default gnus-thread-ignore-subject t)
-
-(setq-default gnus-use-correct-string-widths nil)
-
-
-(eval-after-load 'gnus-topic
- '(progn (setq-default gnus-message-archive-group
- '((format-time-string "sent.%Y")))
- (setq-default gnus-server-alist
- '(("archive"
- nnfolder
- "archive"
- (nnfolder-directory "~/Mail/archive")
- (nnfolder-active-file "~/Mail/archive/active")
- (nnfolder-get-new-mail nil)
- (nnfolder-inhibit-expiry t))))
- (setq-default gnus-topic-topology
- '(("Gnus" visible)
- (("marekpasnikowski.pl" visible nil nil))
- (("misc" visible))))
- (setq-default gnus-topic-alist
- '(("marekpasnikowski.pl"
- "nnimap+marekpasnikowski.pl:Inbox"
- "nnimap+marekpasnikowski.pl:Drafts"
- "nnimap+marekpasnikowski.pl:Sent"
- "nnimap+marekpasnikowski.pl:Archive"
- "nnimap+marekpasnikowski.pl:Junk"
- "nnimap+marekpasnikowski.pl:Trash")
- ("misc"
- "nnfolder+archive:sent.2024"
- "nndraft:drafts")
- ("Gnus")))
- (gnus-topic-set-parameters "marekpasnikowski.pl"
- '((display . 200)))))
diff --git a/systems/izumi/izumi.scm b/systems/izumi/izumi.scm
deleted file mode 100644
index 809ccdc..0000000
--- a/systems/izumi/izumi.scm
+++ /dev/null
@@ -1,551 +0,0 @@
-(define-module (systems izumi izumi)
- #:use-module (users id1000))
-
-(define radicale-keys "/secrets/radicale/keys")
-(define dovecot-keys "/secrets/dovecot")
-
-(define (nginx-accounts)
- (use-modules (gnu packages)
- (guix gexp))
- (list ((@ (gnu system accounts) user-group)
- (name "nginx")
- (system? #t))
- ((@ (gnu system accounts) user-account)
- (name "nginx")
- (group "nginx")
- (supplementary-groups '("git"))
- (system? #t)
- (comment "nginx server user")
- (home-directory "/var/empty")
- (shell (file-append (specification->package "shadow")
- "/sbin/nologin")))))
-
-(define (nginx-service-type*)
- (use-modules (gnu services)
- (gnu services web)
- (gnu system shadow))
- ((@ (gnu services) service-type)
- (inherit nginx-service-type)
- (extensions (map (lambda (extension)
- (if (eq? ((@ (gnu services) service-extension-target)
- extension)
- account-service-type)
- ((@ (gnu services) service-extension)
- account-service-type
- (const (nginx-accounts)))
- extension))
- ((@ (gnu services) service-type-extensions)
- nginx-service-type)))))
-
-(define nginx-service-type*
- (nginx-service-type*))
-
-;;;???????????????????????????????????????????????????????????????????
-
-(define (certbot)
- (use-modules (gnu services certbot))
- ((@ (gnu services) service)
- ((@ (gnu services) service-type)
- (inherit certbot-service-type)
- (extensions (map (lambda (extension)
- (if (eq? ((@ (gnu services) service-extension-target)
- extension)
- nginx-service-type)
- ((@ (gnu services) service-extension)
- nginx-service-type*
- (@@ (gnu services certbot)
- certbot-nginx-server-configurations))
- extension))
- ((@ (gnu services) service-type-extensions)
- certbot-service-type))))
- ((@ (gnu services certbot) certbot-configuration)
- (certificates
- (list
- ((@ (gnu services certbot) certificate-configuration)
- (deploy-hook
- (program-file
- "nginx-deploy-hook"
- ((@ (guix gexp) gexp)
- (let
- ((pid (call-with-input-file "/var/run/nginx/pid" read)))
- (kill pid SIGHUP)))))
- (domains
- (list
- "marekpasnikowski.pl"
- "git.marekpasnikowski.pl"
- "radicale.marekpasnikowski.pl")))))
- (email "marek@marekpasnikowski.pl")
- (webroot "/srv/www/marek/marekpasnikowski.pl"))))
-
-(define (cgit-izumi)
- (use-modules (gnu packages version-control)
- (gnu services cgit)
- (gnu services version-control))
- ((@ (gnu services) service)
- ((@ (gnu services) service-type)
- (inherit cgit-service-type)
- (extensions (map (lambda (extension)
- (if (eq? ((@ (gnu services) service-extension-target)
- extension)
- nginx-service-type)
- ((@ (gnu services) service-extension)
- nginx-service-type*
- cgit-configuration-nginx-config)
- extension))
- ((@ (gnu services) service-type-extensions)
- cgit-service-type))))
- ((@ (gnu services cgit) cgit-configuration)
- (nginx
- (list
- ((@ (gnu services web) nginx-server-configuration)
- (locations
- (list
- (git-http-nginx-location-configuration
- ((@ (gnu services version-control) git-http-configuration)
- (git-root "/var/lib/gitolite/repositories")
- (uri-path "/git")))
- ((@ (gnu services web) nginx-location-configuration)
- (body
- (list
- "fastcgi_param HTTP_HOST $server_name ;"
- "fastcgi_param PATH_INFO $uri ;"
- "fastcgi_param QUERY_STRING $args ;"
- "fastcgi_param SCRIPT_FILENAME $document_root/lib/cgit/cgit.cgi ;"
- "fastcgi_pass 127.0.0.1:9000 ;"))
- (uri "@cgit"))
- ((@ (gnu services web) nginx-location-configuration)
- (body (list "root /srv/www/marek/marekpasnikowski.pl/ ;"))
- (uri "/.well-known"))))
- (listen (list "192.168.10.2:443 ssl"))
- (root cgit)
- (server-name (list "git.marekpasnikowski.pl"))
- (ssl-certificate
- "/etc/letsencrypt/live/marekpasnikowski.pl/fullchain.pem")
- (ssl-certificate-key
- "/etc/letsencrypt/live/marekpasnikowski.pl/privkey.pem")
- (try-files (list "$uri" "@cgit")))))
- (repositories
- (list
- ((@ (gnu services cgit) repository-cgit-configuration)
- (hide? #t)
- (path "/srv/git/marek/packages"))))
- (repository-directory "/var/lib/gitolite/repositories"))))
-
-(define (desktop-services-izumi)
- (use-modules (gnu services base)
- (gnu services desktop)
- (gnu services xorg))
- ((@ (gnu services) modify-services)
- (@ (gnu services desktop) %desktop-services)
- (elogind-service-type
- configuration =>
- ((@ (gnu services desktop) elogind-configuration)
- (inherit configuration)
- (handle-lid-switch 'ignore)
- (handle-lid-switch-docked 'ignore)
- (handle-lid-switch-external-power 'ignore)))
- (gdm-service-type
- configuration =>
- ((@ (gnu services xorg) gdm-configuration)
- (inherit configuration)
- (auto-suspend? #f)
- (wayland? #t)))
- (guix-service-type
- configuration =>
- (let*
- ((non-guix.pub
- (string-append
- "( public-key ( ecc ( curve Ed25519 )"
- "( q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98# ) ) )"))
- (authorized-keys
- (append
- %default-authorized-guix-keys
- (list (plain-file "non-guix.pub" non-guix.pub))))
- (extra-options
- (list "--gc-keep-derivations=yes" "--gc-keep-outputs=yes"))
- (substitute-urls
- (append
- %default-substitute-urls
- (list "https://substitutes.nonguix.org"))))
- ((@ (gnu services base) guix-configuration)
- (inherit configuration)
- (authorized-keys authorized-keys)
- (extra-options extra-options)
- (substitute-urls substitute-urls))))))
-
-(define (etc-mailname)
- (simple-service 'etc-files
- etc-service-type
- (list `("mailname" ,(plain-file "mailname"
- "marekpasnikowski.pl\n")))))
-
-(define (fcgiwrap)
- ((@ (gnu services) service)
- fcgiwrap-service-type
- ((@ (gnu services web) fcgiwrap-configuration)
- (user "git")
- (group "git"))))
-
-(define (gitolite)
- ((@ (gnu services) service)
- gitolite-service-type
- ((@ (gnu services version-control) gitolite-configuration)
- (rc-file ((@ (gnu services version-control) gitolite-rc-file)
- (umask #o0027)))
- (admin-pubkey (plain-file "gitolite-admin.pub"
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK4THTYnHCc/ihCJNKJtGTNu1zCnLndbMHnxnrxzJk+N marek@izumi\n")))))
-
-(define (home-services)
- (use-modules (channels)
- (gnu home services)
- (gnu packages base)
- (gnu packages emacs-xyz)
- (gnu packages gawk)
- (guix build-system emacs)
- (guix git-download)
- ((guix licenses)
- #:prefix license:))
- ((@ (gnu services) service)
- (@ (gnu services guix) guix-home-service-type)
- `(("marek" ,((@ (gnu home) home-environment)
- (packages (map specification->package+output
- (list "dconf-editor"
- "emacs"
- "emacs-org-modern"
- "emacs-paredit"
- "font-google-noto"
- "font-google-noto-emoji"
- "font-google-noto-sans-cjk"
- "font-google-noto-serif-cjk"
- "git"
- "gnupg"
- "gnome-tweaks"
- "noweb"
- "pinentry"
- "pwgen"
- "unzip"
- "zip")))
- (services (append (list izumi-channels-service-type)
- (list
- (simple-service
- 'emacs-home-profile
- home-profile-service-type
- (append
- (list emacs-guix emacs-nix-mode)
- (list
- (let
- ((commit* "wip-algo-tn"))
- ((@ (guix packages) package)
- (name "emacs-org-fc")
- (version (git-version "0.1.2" "0" commit*))
- (source
- ((@ (guix packages) origin)
- (method git-fetch)
- (uri
- ((@ (guix git-download) git-reference)
- (url "https://git.marekpasnikowski.pl/org-fc.git")
- (commit commit*)))
- (file-name (git-file-name name version))
- (sha256 ((@ (guix packages) base32)
- '"1i8ii1garx2pdg08a12yzsd0fhwdzcpxp9m97zj8m5s275i8ccaj"))))
- (build-system emacs-build-system)
- (arguments
- (list
- #:include ((@ (guix gexp) gexp)
- (cons* "\\.awk$" "\\.org$" %default-include))
- #:exclude ((@ (guix gexp) gexp)
- (cons "^test/" %default-exclude))
- #:tests? #t
- #:test-command
- ((@ (guix gexp) gexp)
- (list
- "emacs"
- "--batch"
- "-L" "."
- "-L" "tests/"
- "-l" "tests/org-fc-filter-test.el"
- "-l" "tests/org-fc-indexer-test.el"
- "-l" "tests/org-fc-review-data-test.el"
- "-f" "ert-run-tests-batch-and-exit"))
- #:phases
- ((@ (guix gexp) gexp)
- (modify-phases
- %standard-phases
- (add-after
- 'unpack
- 'qualify-paths
- (lambda*
- (#:key inputs
- #:allow-other-keys)
- (substitute*
- "org-fc-awk.el"
- (("\"find ")
- (string-append
- "\""
- (search-input-file inputs "/bin/find")
- " "))
- (("\"gawk ")
- (string-append
- "\""
- (search-input-file inputs "/bin/gawk")
- " "))
- (("\"xargs ")
- (string-append
- "\""
- (search-input-file inputs "/bin/xargs")
- " ")))))))))
- (inputs (list findutils gawk))
- (propagated-inputs (list emacs-hydra))
- (home-page "https://www.leonrische.me/fc/index.html")
- (synopsis "Spaced repetition system for Emacs Org mode")
- (description
- (string-append
- "Org-fc is a spaced-repetition system for Emacs' Org mode.\n"
- "It allows you to mark headlines in a file as flashcards, turning pieces of\n"
- "knowledge you want to learn into a question-answer test. These cards are\n"
- "reviewed at regular interval. After each review, the next review interval is\n"
- "calculated based on how well you remembered the contents of the card.\n"))
- (license license:gpl3+))))))
- (simple-service 'home-files
- home-files-service-type
- (list (list ".config/emacs/init.el"
- ((@ (guix gexp) local-file)
- "home-files/emacs-configuration.el" ))
- (list ".gnus"
- ((@ (guix gexp) local-file)
- "home-files/gnus-configuration.el"))
- (list ".gitconfig"
- ((@ (guix gexp) local-file)
- "home-files/gitconfig"))
- (list ".config/git/ignore"
- ;; https://github.com/github/gitignore/blob/main/Global/Emacs.gitignore
- ((@ (guix gexp) local-file)
- "home-files/git-ignore.conf"))))
- (simple-service
- 'environment-variables
- home-environment-variables-service-type
- `(("EDITOR" . "emacsclient -nw"))))
- (list
- (let*
- ((and "&& ")
- (collect-garbage "sudo guix gc -d 7d ")
- (configuration-prefix
- "/home/marek/Publiczny/src/deployment/systems/izumi/")
- (pull-guix "guix pull ")
- (reconfigure-home
- (string-append
- "guix home delete-generations 7d ; "
- "guix home reconfigure "
- configuration-prefix
- "home-configuration.scm "))
- (reconfigure-system
- (string-append
- "sudo guix system delete-generations 7d ; "
- "sudo guix system reconfigure "
- configuration-prefix
- "izumi.scm "))
- (update-system
- (string-append
- pull-guix
- and
- reconfigure-system
- ;; and
- ;; reconfigure-home
- and
- collect-garbage)))
- (simple-service
- 'bash-extension
- (@ (gnu home services shells) home-bash-service-type)
- ((@ (gnu home services shells) home-bash-extension)
- (aliases
- `(("collect-garbage" . ,collect-garbage)
- ("edit" . "$EDITOR")
- ("pull-guix" . ,pull-guix)
- ("reconfigure-home" . ,reconfigure-home)
- ("reconfigure-system" . ,reconfigure-system)
- ("update-system" . ,update-system)))
- (bash-profile
- (list
- (mixed-text-file
- "newline-prompt"
- "PS1=${PS1%?}\n"
- "PS1=${PS1%?}\\n'$ '\n"
- "PS1=\"\\n$PS1\""))))))))))))))
-
-(define keyboard-layout-izumi
- ((@ (gnu system keyboard) keyboard-layout)
- "pl"))
-
-(define (mapped-devices-izumi)
- (use-modules (gnu system mapped-devices))
- (list ((@ (gnu system mapped-devices) mapped-device)
- (source "/dev/sda2")
- (target "izumi")
- (type luks-device-mapping))))
-
-(define mapped-devices-izumi
- (mapped-devices-izumi))
-
-(define (nginx-izumi)
- ((@ (gnu services) service)
- nginx-service-type*
- ((@ (gnu services web) nginx-configuration)
- (server-blocks
- (list
- ;; Top-Level
- ((@ (gnu services web) nginx-server-configuration)
- (locations
- (list
- ((@ (gnu services web) nginx-location-configuration)
- (uri "/.well-known" )
- (body
- (list "root /srv/www/marek/marekpasnikowski.pl ;")))))
- (listen (list "192.168.10.2:443 ssl"))
- (root "/srv/www/marek/marekpasnikowski.pl")
- (server-name ( list "marekpasnikowski.pl"))
- (ssl-certificate
- "/etc/letsencrypt/live/marekpasnikowski.pl/fullchain.pem")
- (ssl-certificate-key
- "/etc/letsencrypt/live/marekpasnikowski.pl/privkey.pem"))
- ;; Radicale
- ((@ (gnu services web) nginx-server-configuration)
- (locations
- (list
- ((@ (gnu services web) nginx-location-configuration)
- (body
- (list
- "proxy_pass http://localhost:5232/ ;"
- "proxy_set_header X-Script-Name \"\" ;"
- "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for ;"
- "proxy_set_header Host $http_host ;"
- "proxy_pass_header Authorization ;"))
- (uri "/"))
- ((@ (gnu services web) nginx-location-configuration)
- (body
- (list "root /srv/www/marek/marekpasnikowski.pl ;"))
- (uri "/.well-known"))))
- (listen (list "192.168.10.2:443 ssl"))
- (server-name (list "radicale.marekpasnikowski.pl"))))))))
-
-(define (openssh)
- (use-modules (gnu services ssh))
- ((@ (gnu services) service)
- openssh-service-type))
-
-(define (plasma-desktop)
- ((@ (gnu services) service)
- plasma-desktop-service-type))
-
-(define (radicale)
- (use-modules (gnu services mail))
- ((@ (gnu services) service)
- radicale-service-type
- ((@ (gnu services mail) radicale-configuration)
- (auth ((@ (gnu services mail) radicale-auth-configuration)
- (type 'htpasswd)
- (htpasswd-filename radicale-keys)
- (htpasswd-encryption 'plain)))
- (storage ((@ (gnu services mail) radicale-storage-configuration)
- (filesystem-folder "/data/radicale/collections"))))))
-
-(define swap-device-izumi-1-label
- ((@ (gnu system file-systems) file-system-label)
- "izumi-swap-f"))
-
-(define (syncthing)
- (use-modules (gnu services syncthing))
- ((@ (gnu services) service)
- syncthing-service-type
- ((@ (gnu services syncthing) syncthing-configuration)
- (user "marek"))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define (bootloader-izumi)
- (use-modules (gnu bootloader grub))
- ((@ (gnu bootloader) bootloader-configuration)
- (bootloader grub-efi-bootloader)
- (keyboard-layout keyboard-layout-izumi)
- (targets (list "/boot/efi"))))
-
-(define (file-systems-izumi)
- (use-modules (gnu system file-systems))
- (append %base-file-systems
- (list ((@ (gnu system file-systems) file-system)
- (device "/dev/sda1")
- (mount-point "/boot/efi")
- (type "vfat"))
- ((@ (gnu system file-systems) file-system)
- (dependencies mapped-devices-izumi)
- (device "/dev/mapper/izumi")
- (mount-point "/")
- (type "xfs")))))
-
-(define (groups-izumi)
- (use-modules (gnu system shadow))
- (append %base-groups
- (list
- ((@ (gnu system accounts) user-group)
- (name "vmail")
- (system? #t)))))
-
-(define host-name-izumi
- "izumi")
-
-(define services-izumi
- (append (desktop-services-izumi)
- (list dkim-service
- dovecot-service
- smtp-service
- (certbot)
- (cgit-izumi)
- (etc-mailname)
- (fcgiwrap)
- (gitolite)
- (home-services)
- (nginx-izumi)
- (openssh)
- (plasma-desktop)
- (radicale)
- (syncthing))))
-
-(define swap-device-izumi-1
- ((@ (gnu system file-systems) swap-space)
- (target swap-device-izumi-1-label)))
-
-(define (users-izumi)
- (use-modules (gnu system shadow)
- (users vmail))
- (append %base-user-accounts
- (list uid1000-account
- vmail-account)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define (operating-system-izumi)
- (use-modules (nongnu packages linux)
- (nongnu system linux-initrd)
- (suweren commons sudoers)
- (suweren system))
- ((@ (gnu system) operating-system)
- (bootloader (bootloader-izumi))
- (kernel linux)
- (keyboard-layout keyboard-layout-izumi)
- (initrd microcode-initrd)
- (firmware (list linux-firmware))
- (host-name host-name-izumi)
- (mapped-devices mapped-devices-izumi)
- (file-systems (file-systems-izumi))
- (swap-devices (list swap-device-izumi-1))
- (users (users-izumi))
- (groups (groups-izumi))
- (timezone "Europe/Warsaw")
- (locale polish-locale-string)
- (locale-definitions %suweren-locale-definitions)
- (services services-izumi)
- (sudoers-file %sudoers-specification*)))
-
-(define-public operating-system-izumi
- (operating-system-izumi))
-
-operating-system-izumi
diff --git a/systems/izumi/system-files/smtpd.conf b/systems/izumi/system-files/smtpd.conf
deleted file mode 100644
index 9fe7503..0000000
--- a/systems/izumi/system-files/smtpd.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# The prefix on GUIX is not the default one — it is /etc .
-table aliases file:/etc/aliases
-
-# The mail certificates are issued by Let‘s Encrypt and served by NGINX
-pki marekpasnikowski.pl cert "/etc/letsencrypt/live/marekpasnikowski.pl/fullchain.pem"
-pki marekpasnikowski.pl key "/etc/letsencrypt/live/marekpasnikowski.pl/privkey.pem"
-
-# Listen for local messages.
-listen on lo
-
-# Listen for messages from the internet.
-listen on enp1s0 tls port 25 pki "marekpasnikowski.pl"
-listen on enp1s0 smtps port 465 pki "marekpasnikowski.pl"
-
-# There is no filtering in the design, so the two actions are enough.
-action receive maildir alias <aliases>
-action send relay
-
-# Match incoming messages.
-match from local for local action receive
-match from any for domain "marekpasnikowski.pl" action receive
-
-# Match outgoing messages.
-match for any action send
diff --git a/systems/izumi/system-files/sudoers b/systems/izumi/system-files/sudoers
deleted file mode 100644
index 6af6e3b..0000000
--- a/systems/izumi/system-files/sudoers
+++ /dev/null
@@ -1,3 +0,0 @@
-root ALL=(ALL) ALL
-%wheel ALL=(ALL) ALL
-Defaults passwd_timeout=0