diff options
| -rw-r--r-- | home-config/nix-home-manager/home.nix | 4 | ||||
| -rw-r--r-- | home-config/waybar/config | 3 | ||||
| -rwxr-xr-x | home-config/waybar/custom_cmus.lua | 2 | ||||
| -rw-r--r-- | modules/home-config/base-system.scm | 8 | ||||
| -rw-r--r-- | modules/home-packages/mozillia.scm | 6 | ||||
| -rw-r--r-- | modules/home-packages/virtualization.scm | 7 | ||||
| -rw-r--r-- | modules/home-services/virtualization.scm | 31 |
7 files changed, 20 insertions, 41 deletions
diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix index 3aff1c6..e35ce28 100644 --- a/home-config/nix-home-manager/home.nix +++ b/home-config/nix-home-manager/home.nix @@ -25,6 +25,10 @@ gcc jdk maven + + lua + lua52Packages.dkjson + lua52Packages.luaposix ]; # Let Home Manager install and manage itself. diff --git a/home-config/waybar/config b/home-config/waybar/config index 43bf6a4..d4b2c7a 100644 --- a/home-config/waybar/config +++ b/home-config/waybar/config @@ -39,7 +39,7 @@ "tooltip": false }, "temperature": { - "thermal-zone": 10, + "thermal-zone": 1, "critical-threshold": 80, "format": " {temperatureC}°" }, @@ -67,7 +67,6 @@ "ignored-sinks": ["Easy Effects Sink"] }, "network": { - "interface": "wlp0s20f3", "format": " disconnected", "format-wifi": " {essid}", "format-ethernet": "< {ipaddr}/{cidr}", diff --git a/home-config/waybar/custom_cmus.lua b/home-config/waybar/custom_cmus.lua index d03eb9c..e7ee033 100755 --- a/home-config/waybar/custom_cmus.lua +++ b/home-config/waybar/custom_cmus.lua @@ -1,4 +1,4 @@ -#!/usr/bin/lua +#!/usr/bin/env lua json = require("dkjson") posix = require("posix") diff --git a/modules/home-config/base-system.scm b/modules/home-config/base-system.scm index c96f3f8..e0975d2 100644 --- a/modules/home-config/base-system.scm +++ b/modules/home-config/base-system.scm @@ -24,8 +24,7 @@ #:use-module (gnu services authentication) #:use-module (gnu services virtualization) #:use-module (home-packages wm) - #:use-module (home-packages virtualization) - #:use-module (home-services virtualization)) + #:use-module (home-packages virtualization)) (define %my-base-packages (remove (lambda (package) @@ -123,7 +122,10 @@ (publish-workstation? #f))) ; do not advertise, I want this to be as silent as possible (service docker-service-type) (service nix-service-type) - (service libvirt-service-type-new) + (service libvirt-service-type + (libvirt-configuration + (libvirt libvirt-new) + (unix-sock-group "libvirt"))) (service virtlog-service-type) (service bluetooth-service-type) (service pam-limits-service-type) diff --git a/modules/home-packages/mozillia.scm b/modules/home-packages/mozillia.scm index 3e4363e..ced4b64 100644 --- a/modules/home-packages/mozillia.scm +++ b/modules/home-packages/mozillia.scm @@ -7,9 +7,7 @@ #:use-module (gnu packages linux) #:use-module (nonguix build-system binary) #:use-module (guix build-system trivial) - #:use-module (nongnu packages mozilla) - #:export (firefox-wayland-new - firefox*)) + #:use-module (nongnu packages mozilla)) (define firefox* (package/inherit @@ -20,7 +18,7 @@ (delete "pipewire") (append pipewire))))) -(define firefox-wayland-new +(define-public firefox-wayland-new (package (inherit firefox*) (name "firefox-wayland-new") diff --git a/modules/home-packages/virtualization.scm b/modules/home-packages/virtualization.scm index d048c0d..5a7dbe4 100644 --- a/modules/home-packages/virtualization.scm +++ b/modules/home-packages/virtualization.scm @@ -9,6 +9,13 @@ #:use-module (home-packages firmware) #:use-module (guix gexp)) +(define-public libvirt-new + (package + (inherit libvirt) + (inputs + (modify-inputs (package-inputs libvirt) + (append ovmf-new))))) + (define-public virt-manager-new (package (inherit virt-manager) diff --git a/modules/home-services/virtualization.scm b/modules/home-services/virtualization.scm deleted file mode 100644 index 0f3084a..0000000 --- a/modules/home-services/virtualization.scm +++ /dev/null @@ -1,31 +0,0 @@ -(define-module (home-services virtualization) - #:use-module (guix packages) - #:use-module (gnu packages) - #:use-module (gnu packages virtualization) - #:use-module (gnu services) - #:use-module (gnu services configuration) - #:use-module (gnu services virtualization) - #:use-module (gnu home services) - #:use-module (home-packages firmware) - #:use-module (guix gexp)) - -(define libvirt-new - (package - (inherit libvirt) - (inputs - (modify-inputs (package-inputs libvirt) - (append ovmf-new))))) - -(define-public libvirt-service-type-new - (service-type - (name 'libvirt-new) - (extensions - (list - (service-extension libvirt-service-type - (lambda (config) - (libvirt-configuration - (unix-sock-group "libvirt"))) - ) - (default-value #f) - (description "Libvirt with OVMF"))) - |