diff options
| author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-10-29 09:41:34 +0100 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-10-29 09:41:34 +0100 |
| commit | 0d37e58b1d0061831d7dbfcf12f3c7118b938fe8 (patch) | |
| tree | 41dfbd4b5fb156063a961274078a5510037103c1 /suweren | |
| parent | 6c46dcc7b514ab20d2edd04bfa860a8ba7f01808 (diff) | |
refactor(suweren): unify bash configuration with one from izumi system
Diffstat (limited to 'suweren')
| -rw-r--r-- | suweren/home.scm | 18 | ||||
| -rw-r--r-- | suweren/system.scm | 4 | ||||
| -rw-r--r-- | suweren/update.scm | 10 |
3 files changed, 25 insertions, 7 deletions
diff --git a/suweren/home.scm b/suweren/home.scm index e51579c..f7bee00 100644 --- a/suweren/home.scm +++ b/suweren/home.scm @@ -1,4 +1,7 @@ (define-module (suweren home) + #:use-module ((gnu home services shells) + #:prefix gnu:home:services:shells:) + ;; easyeffects #:use-module (gnu packages audio) @@ -40,6 +43,9 @@ ;; service ;; simple-service #:use-module (gnu services) + + #:use-module ((guix gexp) + #:prefix guix:gexp:) ;; suweren-home-fontconfig-service-type #:use-module (suweren home services fontutils) @@ -75,4 +81,14 @@ profile shepherd suweren-home-fontconfig-service-type - update-commands*))) + update-commands* + (simple-service + 'bash-extension + gnu:home:services:shells:home-bash-service-type + (gnu:home:services:shells:home-bash-extension + (bash-profile + (list + (guix:gexp:mixed-text-file "newline-prompt" + "PS1=${PS1%?}\n" + "PS1=${PS1%?}\\n'$ '\n" + "PS1=\"\\n$PS1\"")))))))) diff --git a/suweren/system.scm b/suweren/system.scm index 0bde7cb..39ec3d2 100644 --- a/suweren/system.scm +++ b/suweren/system.scm @@ -22,7 +22,8 @@ #:use-module (guix gexp) ; plain-file #:use-module (nongnu packages linux) #:use-module (suweren commons sudoers) ; %sudoers-specification* - ) + #:use-module ((suweren trezor) + #:prefix suweren-trezor:)) (define-public polish-locale-string "pl_PL.utf8") @@ -163,6 +164,7 @@ => (login configuration))))) (append %desktop-services* + suweren-trezor:trezor-bridge (list plasma-desktop profile sddm diff --git a/suweren/update.scm b/suweren/update.scm index 1381b2c..d6fa1ec 100644 --- a/suweren/update.scm +++ b/suweren/update.scm @@ -19,8 +19,8 @@ "sudo guix system delete-generations 7d") ;; string -(define guile-load-path - "GUILE_LOAD_PATH='$HOME/Szablony/distribution:$HOME/Szablony/deployment'") +(define guix-test-switches + "-L ~/Szablony/sovereign -L ~/Szablony/distribution -L ~/Szablony/deployment -v 3") ;; string (define pull-guix @@ -50,9 +50,9 @@ ;; string -> ;; string (define (test-update reconfigure-system*) - (string-append guile-load-path - " " - reconfigure-system*)) + (string-append reconfigure-system* + " " + guix-test-switches)) ;; string -> ;; string |