summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--aisaka.org193
-rw-r--r--home-configuration.scm150
2 files changed, 164 insertions, 179 deletions
diff --git a/aisaka.org b/aisaka.org
index 4bb8ccf..1e7c52f 100644
--- a/aisaka.org
+++ b/aisaka.org
@@ -13,8 +13,7 @@ for everything else and swap. The main partition is encrypted.
Data encryption layer, password protected. The LUKS encryption type is
used.
-#+name: luks
-#+begin_src scheme
+#+begin_src scheme :noweb-ref luks
(mapped-device
(source (uuid "887ac37f-2919-41a0-a62a-e1ff5ea2d6cc"))
(target "aisaka-root")
@@ -31,8 +30,7 @@ filesystem.
The root filesystem is mounted on the encryption layer. Its type is
BTRFS.
-#+name: rootfs
-#+begin_src scheme
+#+begin_src scheme :noweb-ref rootfs
(file-system
(mount-point "/")
(device "/dev/mapper/aisaka-root")
@@ -44,8 +42,7 @@ BTRFS.
The boot partition is on EXT4 filesystem.
-#+name: bootfs
-#+begin_src scheme
+#+begin_src scheme :noweb-ref bootfs
(file-system
(mount-point "/boot")
(device (uuid "4f77b5fc-56ad-43ae-b6ec-e5adc8c48587"))
@@ -54,8 +51,7 @@ The boot partition is on EXT4 filesystem.
** TODO Swap Devices
-#+name: swap
-#+begin_src scheme
+#+begin_src scheme :noweb-ref swap
(swap-space (target (uuid "73bed3f9-be07-40ad-a228-577cd24f2e1d")))
#+end_src
@@ -69,8 +65,7 @@ a free Libreboot firmware installed. It is a good idea to keep it up to date.
Flashrom program is needed to write the computer firmware. The program needs
a relaxed kernel security feature.
-#+name: flashrom-tangle
-#+begin_src scheme :tangle services/flashrom.scm
+#+begin_src scheme :noweb-ref flashrom-tangle :tangle services/flashrom.scm
(define-module (flashrom)
#:use-module (gnu)
#:use-module (gnu home)
@@ -84,8 +79,7 @@ a relaxed kernel security feature.
This service installs flashrom.
-#+name: flashrom-package
-#+begin_src scheme
+#+begin_src scheme :noweb-ref flashrom-package
(define-public flashrom-package
(service
(service-type
@@ -103,8 +97,7 @@ This service installs flashrom.
** TODO Secure Shell
-#+name: ssh-server
-#+begin_src scheme :tangle services/ssh-server.scm
+#+begin_src scheme :noweb-ref ssh-server :tangle services/ssh-server.scm
(define-module (ssh-server)
#:use-module (gnu)
#:use-module (gnu home)
@@ -118,16 +111,14 @@ This service installs flashrom.
*** TODO SSH Installation
-#+name: ssh-service
-#+begin_src scheme
+#+begin_src scheme :noweb-ref ssh-service
(define-public ssh-service
(service openssh-service-type))
#+end_src
*** TODO SSH Configuration
-#+name: ssh-configuration
-#+begin_src scheme
+#+begin_src scheme :noweb-ref ssh-configuration
(define-public ssh-configuration
(simple-service 'ssh-configuration* home-files-service-type
`((".ssh/config" ,(local-file "../ssh.config")))))
@@ -141,8 +132,7 @@ Sway is the currently chosen operating environment.
The Sway Window Manager consists of Sway packages and relevant configurations.
-#+name: sway
-#+begin_src scheme :tangle services/sway.scm
+#+begin_src scheme :noweb-ref sway :tangle services/sway.scm
(add-to-load-path "./services")
(define-module (sway)
@@ -158,8 +148,7 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
*** TODO Sway Installation
-#+name: sway-packages
-#+begin_src scheme
+#+begin_src scheme :noweb-ref sway-packages
(define-public sway-packages
(service
(service-type
@@ -176,8 +165,7 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
*** TODO Sway configuration
-#+name: sway-configuration
-#+begin_src scheme
+#+begin_src scheme :noweb-ref sway-configuration
(define-public sway-configuration
(simple-service 'configuration-files home-files-service-type
`((".config/sway/config" ,(local-file "../sway.config"))
@@ -187,8 +175,7 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
* imported configuration dump
** TODO System configuration
-#+name: system-dump
-#+begin_src scheme :tangle system-configuration.scm
+#+begin_src scheme :noweb-ref system-dump :tangle system-configuration.scm
(add-to-load-path "./services")
(define-module (aisaka-system-configuration)
@@ -259,8 +246,7 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
** TODO Home configuration
-#+name: home-dump
-#+begin_src scheme :tangle home-configuration.scm
+#+begin_src scheme :noweb-ref home-dump :tangle home-configuration.scm
(add-to-load-path "./services")
(define-module (aisaka-home-configuration)
@@ -285,8 +271,8 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
(define pull-guix-
(string-append pull-guix
- allow-downgrades
- "--disable-authentication "))
+ allow-downgrades
+ "--disable-authentication "))
(define guix-home
"guix home reconfigure ")
@@ -296,12 +282,12 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
(define reconfigure-home
(string-append guix-home
- config-prefix
- home-configuration))
+ config-prefix
+ home-configuration))
(define reconfigure-home-
(string-append reconfigure-home
- allow-downgrades))
+ allow-downgrades))
(define guix-system
"sudo guix system reconfigure ")
@@ -311,97 +297,96 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
(define reconfigure-system
(string-append guix-system
- config-prefix
- system-configuration))
+ config-prefix
+ system-configuration))
(define reconfigure-system-
(string-append reconfigure-system
- allow-downgrades))
+ allow-downgrades))
(define and
"&& ")
(define system-update
(string-append pull-guix
- and
- reconfigure-system
- and
- reconfigure-home))
+ and
+ reconfigure-system
+ and
+ reconfigure-home))
(define system-update-
(string-append pull-guix-
- and
- reconfigure-system-
- and
- reconfigure-home-))
+ and
+ reconfigure-system-
+ and
+ reconfigure-home-))
(home-environment
(packages (map (compose list
- specification->package+output)
- '("adwaita-icon-theme"
- "alacritty"
- "clamav"
- "cpupower"
- "dconf-editor"
- "dmenu"
- "emacs"
- "emacs-aggressive-indent"
- "emacs-eldoc"
- "emacs-geiser"
- "emacs-geiser-guile"
- "emacs-nov-el"
- "emacs-org-auto-tangle"
- "emacs-org-contacts"
- "emacs-org-contrib"
- "font-google-noto"
- "git"
- "git-lfs"
- "gnome-tweaks"
- "gnupg"
- "guile"
- "guile-spec"
- "hicolor-icon-theme"
- "icecat"
- "jami"
- "libadwaita"
- "libreoffice"
- "nm-tray"
- "pwgen"
- "seahorse"
- "sicp"
- "strace"
- "trezor-agent"
- "unzip"
- "zip")))
+ specification->package+output)
+ '("adwaita-icon-theme"
+ "alacritty"
+ "clamav"
+ "cpupower"
+ "dconf-editor"
+ "dmenu"
+ "emacs"
+ "emacs-aggressive-indent"
+ "emacs-eldoc"
+ "emacs-geiser"
+ "emacs-geiser-guile"
+ "emacs-nov-el"
+ "emacs-org-auto-tangle"
+ "emacs-org-contacts"
+ "emacs-org-contrib"
+ "font-google-noto"
+ "git"
+ "git-lfs"
+ "gnome-tweaks"
+ "gnupg"
+ "guile"
+ "guile-spec"
+ "hicolor-icon-theme"
+ "icecat"
+ "jami"
+ "libadwaita"
+ "libreoffice"
+ "nm-tray"
+ "pwgen"
+ "seahorse"
+ "sicp"
+ "strace"
+ "trezor-agent"
+ "unzip"
+ "zip")))
(services
`(,flashrom-package
,ssh-configuration
,sway-configuration
,sway-packages
,(service home-bash-service-type
- (home-bash-configuration
- (environment-variables '(("EDITOR" . "emacs -nw")
- ("LIBGL_ALWAYS_SOFTWARE" . "1")
- ("NVM_DIR" . "$HOME/src/nvm")
- ("GUILE_AUTO_COMPILE" . "0")))
- (aliases `(("grep" . "grep --color=auto ")
- ("ll" . "ls -l ")
- ("ls" . "ls -p --color=auto ")
- ("pull-guix" . ,pull-guix)
- ("pull-guix-" . ,pull-guix-)
- ("reconfigure-home" . ,reconfigure-home)
- ("reconfigure-home-" . ,reconfigure-home-)
- ("reconfigure-system" . ,reconfigure-system)
- ("reconfigure-system-" . ,reconfigure-system-)
- ("system-update" . ,system-update)
- ("system-update-" . ,system-update-)))
- (bash-profile `(,(local-file "bash_profile")))
- (bashrc `(,(local-file "bashrc")))))
+ (home-bash-configuration
+ (environment-variables '(("EDITOR" . "emacs -nw")
+ ("LIBGL_ALWAYS_SOFTWARE" . "1")
+ ("NVM_DIR" . "$HOME/src/nvm")
+ ("GUILE_AUTO_COMPILE" . "0")))
+ (aliases `(("grep" . "grep --color=auto ")
+ ("ll" . "ls -l ")
+ ("ls" . "ls -p --color=auto ")
+ ("pull-guix" . ,pull-guix)
+ ("pull-guix-" . ,pull-guix-)
+ ("reconfigure-home" . ,reconfigure-home)
+ ("reconfigure-home-" . ,reconfigure-home-)
+ ("reconfigure-system" . ,reconfigure-system)
+ ("reconfigure-system-" . ,reconfigure-system-)
+ ("system-update" . ,system-update)
+ ("system-update-" . ,system-update-)))
+ (bash-profile `(,(local-file "bash_profile")))
+ (bashrc `(,(local-file "bashrc")))))
,(simple-service 'configuration-files
- home-files-service-type
- `((".config/git/config" ,(local-file "git.config"))
- (".config/guix/shell-authorized-directories"
- ,(local-file "guix-shell-authorized-directories"))
- (".emacs" ,(local-file "emacs.el")))))))
-
+ home-files-service-type
+ `((".config/git/config" ,(local-file "git.config"))
+ (".config/guix/shell-authorized-directories"
+ ,(local-file "guix-shell-authorized-directories"))
+ (".emacs" ,(local-file "emacs.el")))))))
#+end_src
diff --git a/home-configuration.scm b/home-configuration.scm
index 820404e..4c8752b 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -22,8 +22,8 @@
(define pull-guix-
(string-append pull-guix
- allow-downgrades
- "--disable-authentication "))
+ allow-downgrades
+ "--disable-authentication "))
(define guix-home
"guix home reconfigure ")
@@ -33,12 +33,12 @@
(define reconfigure-home
(string-append guix-home
- config-prefix
- home-configuration))
+ config-prefix
+ home-configuration))
(define reconfigure-home-
(string-append reconfigure-home
- allow-downgrades))
+ allow-downgrades))
(define guix-system
"sudo guix system reconfigure ")
@@ -48,95 +48,95 @@
(define reconfigure-system
(string-append guix-system
- config-prefix
- system-configuration))
+ config-prefix
+ system-configuration))
(define reconfigure-system-
(string-append reconfigure-system
- allow-downgrades))
+ allow-downgrades))
(define and
"&& ")
(define system-update
(string-append pull-guix
- and
- reconfigure-system
- and
- reconfigure-home))
+ and
+ reconfigure-system
+ and
+ reconfigure-home))
(define system-update-
(string-append pull-guix-
- and
- reconfigure-system-
- and
- reconfigure-home-))
+ and
+ reconfigure-system-
+ and
+ reconfigure-home-))
(home-environment
(packages (map (compose list
- specification->package+output)
- '("adwaita-icon-theme"
- "alacritty"
- "clamav"
- "cpupower"
- "dconf-editor"
- "dmenu"
- "emacs"
- "emacs-aggressive-indent"
- "emacs-eldoc"
- "emacs-geiser"
- "emacs-geiser-guile"
- "emacs-nov-el"
- "emacs-org-auto-tangle"
- "emacs-org-contacts"
- "emacs-org-contrib"
- "font-google-noto"
- "git"
- "git-lfs"
- "gnome-tweaks"
- "gnupg"
- "guile"
- "guile-spec"
- "hicolor-icon-theme"
- "icecat"
- "jami"
- "libadwaita"
- "libreoffice"
- "nm-tray"
- "pwgen"
- "seahorse"
- "sicp"
- "strace"
- "trezor-agent"
- "unzip"
- "zip")))
+ specification->package+output)
+ '("adwaita-icon-theme"
+ "alacritty"
+ "clamav"
+ "cpupower"
+ "dconf-editor"
+ "dmenu"
+ "emacs"
+ "emacs-aggressive-indent"
+ "emacs-eldoc"
+ "emacs-geiser"
+ "emacs-geiser-guile"
+ "emacs-nov-el"
+ "emacs-org-auto-tangle"
+ "emacs-org-contacts"
+ "emacs-org-contrib"
+ "font-google-noto"
+ "git"
+ "git-lfs"
+ "gnome-tweaks"
+ "gnupg"
+ "guile"
+ "guile-spec"
+ "hicolor-icon-theme"
+ "icecat"
+ "jami"
+ "libadwaita"
+ "libreoffice"
+ "nm-tray"
+ "pwgen"
+ "seahorse"
+ "sicp"
+ "strace"
+ "trezor-agent"
+ "unzip"
+ "zip")))
(services
`(,flashrom-package
,ssh-configuration
,sway-configuration
,sway-packages
,(service home-bash-service-type
- (home-bash-configuration
- (environment-variables '(("EDITOR" . "emacs -nw")
- ("LIBGL_ALWAYS_SOFTWARE" . "1")
- ("NVM_DIR" . "$HOME/src/nvm")
- ("GUILE_AUTO_COMPILE" . "0")))
- (aliases `(("grep" . "grep --color=auto ")
- ("ll" . "ls -l ")
- ("ls" . "ls -p --color=auto ")
- ("pull-guix" . ,pull-guix)
- ("pull-guix-" . ,pull-guix-)
- ("reconfigure-home" . ,reconfigure-home)
- ("reconfigure-home-" . ,reconfigure-home-)
- ("reconfigure-system" . ,reconfigure-system)
- ("reconfigure-system-" . ,reconfigure-system-)
- ("system-update" . ,system-update)
- ("system-update-" . ,system-update-)))
- (bash-profile `(,(local-file "bash_profile")))
- (bashrc `(,(local-file "bashrc")))))
+ (home-bash-configuration
+ (environment-variables '(("EDITOR" . "emacs -nw")
+ ("LIBGL_ALWAYS_SOFTWARE" . "1")
+ ("NVM_DIR" . "$HOME/src/nvm")
+ ("GUILE_AUTO_COMPILE" . "0")))
+ (aliases `(("grep" . "grep --color=auto ")
+ ("ll" . "ls -l ")
+ ("ls" . "ls -p --color=auto ")
+ ("pull-guix" . ,pull-guix)
+ ("pull-guix-" . ,pull-guix-)
+ ("reconfigure-home" . ,reconfigure-home)
+ ("reconfigure-home-" . ,reconfigure-home-)
+ ("reconfigure-system" . ,reconfigure-system)
+ ("reconfigure-system-" . ,reconfigure-system-)
+ ("system-update" . ,system-update)
+ ("system-update-" . ,system-update-)))
+ (bash-profile `(,(local-file "bash_profile")))
+ (bashrc `(,(local-file "bashrc")))))
,(simple-service 'configuration-files
- home-files-service-type
- `((".config/git/config" ,(local-file "git.config"))
- (".config/guix/shell-authorized-directories"
- ,(local-file "guix-shell-authorized-directories"))
- (".emacs" ,(local-file "emacs.el")))))))
+ home-files-service-type
+ `((".config/git/config" ,(local-file "git.config"))
+ (".config/guix/shell-authorized-directories"
+ ,(local-file "guix-shell-authorized-directories"))
+ (".emacs" ,(local-file "emacs.el")))))))