diff options
| -rw-r--r-- | aisaka.org | 16 | ||||
| -rw-r--r-- | data/emacs-config | 4 | ||||
| -rw-r--r-- | home-configuration.scm | 2 | ||||
| -rw-r--r-- | system-configuration.scm | 2 |
4 files changed, 24 insertions, 0 deletions
@@ -33,6 +33,7 @@ https://guix.gnu.org/en/manual/en/html_node/System-Configuration.html #:use-module (gnu services configuration) #:use-module (gnu services desktop) #:use-module (gnu services networking) + #:use-module (gnu services nix) #:use-module (gnu services ssh) #:use-module (gnu services version-control) #:use-module (gnu services xorg)) @@ -90,6 +91,7 @@ https://guix.gnu.org/en/manual/en/html_node/Services.html (list <<ssh-system-service>> <<system-base-services>> + <<system-miscellaneous-services>> <<trezor-system-packages>> (service cups-service-type @@ -131,6 +133,14 @@ https://guix.gnu.org/en/manual/en/html_node/Base-Services.html <<guix-options>>)))) #+end_src +**** TODO Miscellaneous Services + +https://guix.gnu.org/en/manual/en/html_node/Miscellaneous-Services.html + +#+begin_src scheme :noweb-ref system-miscellaneous-services + (service nix-service-type) +#+end_src + ** TODO Home configuration https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html @@ -224,6 +234,7 @@ https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html "emacs-eldoc" "emacs-geiser" "emacs-geiser-guile" + "emacs-nix-mode" "emacs-nov-el" "emacs-org-contacts" "emacs-org-contrib" @@ -272,6 +283,7 @@ https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html (aliases `(("grep" . "grep --color=auto ") ("ll" . "ls -l ") ("ls" . "ls -p --color=auto ") + ("nix" . "nix --extra-experimental-features flakes --extra-experimental-features nix-command") ("pull-guix" . ,pull-guix) ("pull-guix-" . ,pull-guix-) ("reconfigure-home" . ,reconfigure-home) @@ -371,6 +383,10 @@ https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html (setq-default org-fc-algorithm 'tn org-fc-directories '("~/Dokumenty/fiszki")) + + ;; Nix Mode + (require 'nix-mode) + (add-to-list 'auto-mode-alist '("\\.nix\\'" . nix-mode)) #+end_src *** TODO git-config diff --git a/data/emacs-config b/data/emacs-config index 147b0c6..272c20b 100644 --- a/data/emacs-config +++ b/data/emacs-config @@ -72,3 +72,7 @@ (setq-default org-fc-algorithm 'tn org-fc-directories '("~/Dokumenty/fiszki")) + +;; Nix Mode +(require 'nix-mode) +(add-to-list 'auto-mode-alist '("\\.nix\\'" . nix-mode)) diff --git a/home-configuration.scm b/home-configuration.scm index 37f4b6b..251466f 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -87,6 +87,7 @@ "emacs-eldoc" "emacs-geiser" "emacs-geiser-guile" + "emacs-nix-mode" "emacs-nov-el" "emacs-org-contacts" "emacs-org-contrib" @@ -163,6 +164,7 @@ (aliases `(("grep" . "grep --color=auto ") ("ll" . "ls -l ") ("ls" . "ls -p --color=auto ") + ("nix" . "nix --extra-experimental-features flakes --extra-experimental-features nix-command") ("pull-guix" . ,pull-guix) ("pull-guix-" . ,pull-guix-) ("reconfigure-home" . ,reconfigure-home) diff --git a/system-configuration.scm b/system-configuration.scm index 054dd25..525267c 100644 --- a/system-configuration.scm +++ b/system-configuration.scm @@ -6,6 +6,7 @@ #:use-module (gnu services configuration) #:use-module (gnu services desktop) #:use-module (gnu services networking) + #:use-module (gnu services nix) #:use-module (gnu services ssh) #:use-module (gnu services version-control) #:use-module (gnu services xorg)) @@ -49,6 +50,7 @@ (list "--gc-keep-derivations=yes" "--gc-keep-outputs=yes")))) + (service nix-service-type) (service (service-type (name 'trezor-system-packages) |