From a1c11271805eb225a7a53cf5ed51e4fb5f41df7a Mon Sep 17 00:00:00 2001 From: Rutherther Date: Thu, 15 Aug 2024 17:10:33 +0200 Subject: [PATCH] many changes --- config.scm | 15 ++++- home/{ => dotfiles}/.bash_profile | 0 home/{ => dotfiles}/.bashrc | 0 home/dotfiles/foot.ini | 1 + home/dotfiles/mako | 20 +++++++ .../waybar/config.jsonc} | 0 .../waybar/style.css} | 0 home/home-configuration.scm | 36 +++++++----- home/{ => modules/ruther/home}/dwl/config.h | 0 .../ruther/home}/dwl/dwl-ipc-waybar.patch | 0 home/{ => modules/ruther/home}/dwl/wm.scm | 58 +++++++++++++++++-- home/modules/ruther/home/editors.scm | 3 + home/{ => modules/ruther/home}/fonts.scm | 2 +- keys/nonguix-signing-key.pub | 6 ++ 14 files changed, 117 insertions(+), 24 deletions(-) rename home/{ => dotfiles}/.bash_profile (100%) rename home/{ => dotfiles}/.bashrc (100%) create mode 100644 home/dotfiles/foot.ini create mode 100644 home/dotfiles/mako rename home/{waybar-config.jsonc => dotfiles/waybar/config.jsonc} (100%) rename home/{waybar-style.css => dotfiles/waybar/style.css} (100%) rename home/{ => modules/ruther/home}/dwl/config.h (100%) rename home/{ => modules/ruther/home}/dwl/dwl-ipc-waybar.patch (100%) rename home/{ => modules/ruther/home}/dwl/wm.scm (51%) create mode 100644 home/modules/ruther/home/editors.scm rename home/{ => modules/ruther/home}/fonts.scm (95%) create mode 100644 keys/nonguix-signing-key.pub diff --git a/config.scm b/config.scm index 3a4ac19..68c020f 100644 --- a/config.scm +++ b/config.scm @@ -15,7 +15,7 @@ (gnu packages curl) (gnu packages bash) (gnu packages compression)) -(use-service-modules desktop sddm xorg base nix) +(use-service-modules desktop sddm xorg base nix pm) (use-package-modules gnome package-management) (operating-system @@ -95,7 +95,8 @@ (xorg-configuration (keyboard-layout keyboard-layout))) (service bluetooth-service-type) - (service nix-service-type)) + (service nix-service-type) + (service power-profiles-daemon-service-type)) (modify-services %desktop-services (pulseaudio-service-type config => (pulseaudio-configuration @@ -103,7 +104,15 @@ (client-conf (append (pulseaudio-configuration-client-conf config) - '((autospawn . no))))))))) ;; todo remove gdm + '((autospawn . no)))))) + (guix-service-type config => (guix-configuration + (inherit config) + (substitute-urls + (append (list "https://substitutes.nonguix.org") + %default-substitute-urls)) + (authorized-keys + (append (list (local-file "keys/nonguix-signing-key.pub")) + %default-authorized-guix-keys))))))) ;; todo remove gdm ;; Allow resolution of '.local' host names with mDNS. diff --git a/home/.bash_profile b/home/dotfiles/.bash_profile similarity index 100% rename from home/.bash_profile rename to home/dotfiles/.bash_profile diff --git a/home/.bashrc b/home/dotfiles/.bashrc similarity index 100% rename from home/.bashrc rename to home/dotfiles/.bashrc diff --git a/home/dotfiles/foot.ini b/home/dotfiles/foot.ini new file mode 100644 index 0000000..f98d325 --- /dev/null +++ b/home/dotfiles/foot.ini @@ -0,0 +1 @@ +font=Hack:size=12 \ No newline at end of file diff --git a/home/dotfiles/mako b/home/dotfiles/mako new file mode 100644 index 0000000..6514802 --- /dev/null +++ b/home/dotfiles/mako @@ -0,0 +1,20 @@ +background-color=#222223CC +border-color=#8babf0FF +border-size=2 +default-timeout=5000 +font=Ubuntu Mono 10 +height=250 +ignore-timeout=1 +layer=overlay +margin=5 +max-icon-size=16 +padding=24 +text-color=#ccccccFF + +[mode=idle] +border-color=#444444FF +default-timeout=0 +ignore-timeout=1 + +[urgency=critical] +border-color=#c45500FF diff --git a/home/waybar-config.jsonc b/home/dotfiles/waybar/config.jsonc similarity index 100% rename from home/waybar-config.jsonc rename to home/dotfiles/waybar/config.jsonc diff --git a/home/waybar-style.css b/home/dotfiles/waybar/style.css similarity index 100% rename from home/waybar-style.css rename to home/dotfiles/waybar/style.css diff --git a/home/home-configuration.scm b/home/home-configuration.scm index c62f887..ddf74ab 100644 --- a/home/home-configuration.scm +++ b/home/home-configuration.scm @@ -15,7 +15,7 @@ (gnu home services gnupg) (gnu home services sound) (gnu home services) - (home fonts)) + (ruther home dwl wm)) (home-environment ;; Below is the list of packages that will show up in your @@ -23,7 +23,7 @@ (packages (append (list - font-ubuntu) + dwl-mine) (specifications->packages (list ;; HW interactions @@ -52,16 +52,15 @@ ;; Passwords "gnupg" "password-store" "pass-otp" - ;; For window manager - "dwl-mine" "waybar-mine" - "rofi-wayland" - "brillo" - "wlr-randr" ;;"dwlmsg" - ;;"wlopm" - "grim" "slurp" + ;; DBus services + "mako" + + ;; My favorite wm + ;; "dwl-mine" - ;; Notebook + ;; Notebook stuff "acpi" "xbacklight" + "brillo" ;; Editing "emacs" "emacs-vterm" @@ -77,15 +76,20 @@ ("ip" . "ip -color=auto") ("ll" . "ls -l") ("ls" . "ls -p --color=auto"))) - (bashrc (list (local-file ".bashrc" "bashrc"))) - (bash-profile (list (local-file ".bash_profile" + (bashrc (list (local-file "dotfiles/.bashrc" "bashrc"))) + (bash-profile (list (local-file "dotfiles/.bash_profile" "bash_profile"))))) (service home-files-service-type - `((".config/foot/foot.ini" ,(local-file "./foot.ini")) - (".config/waybar/config.jsonc" ,(local-file "waybar-config.jsonc")) - (".config/waybar/style.css" ,(local-file "waybar-style.css")) - (".librewolf/native-messaging-hosts/com.github.browserpass.native.json" ,(file-append (specification->package "browserpass-native") "/lib/browserpass/hosts/firefox/com.github.browserpass.native.json")))) + `((".config/foot/foot.ini" ,(local-file "dotfiles/foot.ini")) + (".config/waybar/config.jsonc" ,(local-file "dotfiles/waybar/config.jsonc")) + (".config/waybar/style.css" ,(local-file "dotfiles/waybar/style.css")) + (".config/mako/config" ,(local-file "dotfiles/mako")) + + (".librewolf/native-messaging-hosts/com.github.browserpass.native.json" + ,(file-append + (specification->package "browserpass-native") + "/lib/browserpass/hosts/firefox/com.github.browserpass.native.json")))) (simple-service 'default-fonts home-fontconfig-service-type diff --git a/home/dwl/config.h b/home/modules/ruther/home/dwl/config.h similarity index 100% rename from home/dwl/config.h rename to home/modules/ruther/home/dwl/config.h diff --git a/home/dwl/dwl-ipc-waybar.patch b/home/modules/ruther/home/dwl/dwl-ipc-waybar.patch similarity index 100% rename from home/dwl/dwl-ipc-waybar.patch rename to home/modules/ruther/home/dwl/dwl-ipc-waybar.patch diff --git a/home/dwl/wm.scm b/home/modules/ruther/home/dwl/wm.scm similarity index 51% rename from home/dwl/wm.scm rename to home/modules/ruther/home/dwl/wm.scm index 8783101..6ff098f 100644 --- a/home/dwl/wm.scm +++ b/home/modules/ruther/home/dwl/wm.scm @@ -1,10 +1,16 @@ -(define-module (home dwl wm) +(define-module (ruther home dwl wm) + #:use-module (gnu packages) #:use-module (gnu packages wm) #:use-module (gnu packages xorg) + #:use-module (gnu packages bash) #:use-module (ruther packages wayland) + #:use-module (guix build-system trivial) + #:use-module (guix packages) + #:use-module (guix profiles) + #:use-module (guix build union) #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix download) @@ -33,11 +39,11 @@ "XLIBS = xcb xcb-icccm") #$original-flags)))))) -(define-public dwl-mine +(define-public dwl-mine-unwrapped (let ((base (make-dwl-xwayland dwl-0.7))) (package (inherit base) - (name "dwl-mine") + (name "dwl-mine-unwrapped") (source (origin (method git-fetch) @@ -53,4 +59,48 @@ (lambda _ (copy-file #$(local-file "config.h") "config.h")))))))))) -;; TODO wrapping with needed deps +;; Packages I use when in the WM, it's dependent on those. +(define wm-packages + (specifications->manifest + '("waybar-mine" + "rofi-wayland" + "brillo" + "wlr-randr" + ;; "dwlmsg" + ;; "wlopm" + "grim" + "slurp" + + "emacs-pgtk"))) + +(define dwl-mine-gexp + (with-imported-modules '((guix build utils) + (guix build union)) + #~(begin + (use-modules (guix build utils) + (guix build union)) + + (union-build #$output (list #$dwl-mine-unwrapped) + #:create-all-directories? #t) + + (let ((target-file (string-append #$output "/bin/dwl")) + (wrapped-file (string-append #$output "/bin/.dwl-real")) + (wm-profile #$(profile (content wm-packages)))) + (rename-file target-file wrapped-file) + (call-with-output-file target-file + (lambda (port) + (format port + "#!~a~%~a~%exec -a \"$0\" \"~a\" \"$@\"~%" + (string-append #$bash "/bin/bash") + (string-append "source " wm-profile "/etc/profile") + (canonicalize-path wrapped-file)))) + (chmod target-file #o755))))) + +(define-public dwl-mine + (package/inherit dwl-mine-unwrapped + (name "dwl-mine") + (source #f) + (build-system trivial-build-system) + (arguments + (list + #:builder dwl-mine-gexp)))) diff --git a/home/modules/ruther/home/editors.scm b/home/modules/ruther/home/editors.scm new file mode 100644 index 0000000..1208e7d --- /dev/null +++ b/home/modules/ruther/home/editors.scm @@ -0,0 +1,3 @@ +(define-module (ruther home editors) + ;; #:use-module () + ) diff --git a/home/fonts.scm b/home/modules/ruther/home/fonts.scm similarity index 95% rename from home/fonts.scm rename to home/modules/ruther/home/fonts.scm index 0808177..5c04f0d 100644 --- a/home/fonts.scm +++ b/home/modules/ruther/home/fonts.scm @@ -1,4 +1,4 @@ -(define-module (home fonts) +(define-module (ruther home fonts) #:use-module (gnu packages compression) #:use-module (guix packages) #:use-module (guix build-system copy) diff --git a/keys/nonguix-signing-key.pub b/keys/nonguix-signing-key.pub new file mode 100644 index 0000000..32ddac6 --- /dev/null +++ b/keys/nonguix-signing-key.pub @@ -0,0 +1,6 @@ +(public-key + (ecc + (curve Ed25519) + (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#) + ) + ) -- 2.48.1