From e192e86738d5ca32e954e7d52aff847561cecb93 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Thu, 7 Sep 2023 18:52:18 -0400 Subject: [PATCH] 867-5309 --- :w | 47 ------------------------ home-config/sway/config | 2 +- home-config/sway/config.d/theme | 10 +++-- modules/home-packages/firmware.scm | 26 ------------- modules/home-packages/virtualization.scm | 41 --------------------- 5 files changed, 7 insertions(+), 119 deletions(-) delete mode 100644 :w delete mode 100644 modules/home-packages/firmware.scm diff --git a/:w b/:w deleted file mode 100644 index 13448f3..0000000 --- a/:w +++ /dev/null @@ -1,47 +0,0 @@ -(define-module (home-packages virtualization) - #:use-module (guix packages) - #:use-module (guix utils) - #:use-module (gnu packages) - #:use-module (gnu packages package-management) - #:use-module (gnu packages build-tools) - #:use-module (gnu packages virtualization) - #:use-module (gnu packages firmware) - #: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))) - (arguments - (substitute-keyword-arguments (package-arguments libvirt) - ((#:phases phases) - #~(modify-phases #$phases - (add-after 'install 'ovmf - (lambda _ - (let ((fmw (string-append #$output "/usr/share/OVMF"))) - (mkdir-p fmw) - (copy-recursively #$(file-append ovmf-new "/share/firmware") fmw)) - (let ((fmw (string-append #$output "/share/qemu"))) - (mkdir-p fmw) - (copy-recursively #$(file-append qemu "/share/qemu") fmw)) - )) - )))))) - -(define-public virt-manager-new - (package - (inherit virt-manager) - (name "virt-manager-new") - (arguments - (substitute-keyword-arguments (package-arguments virt-manager) - ((#:phases phases) - #~(modify-phases #$phases - (add-after 'install 'ovmf - (lambda _ - (let ((fmw (string-append #$output "/usr/share/OVMF"))) - (mkdir-p fmw) - (copy-recursively #$(file-append ovmf-new "/share/firmware") fmw) - ))) - )))))) diff --git a/home-config/sway/config b/home-config/sway/config index 1ef472f..e5613cb 100755 --- a/home-config/sway/config +++ b/home-config/sway/config @@ -17,7 +17,7 @@ set $scale 1.5 set $bg ~/.config/sway/nya0.png # Set Efects -set $radius 0 +set $radius 5 set $shadows on set $shadow_blur 50 set $blur enable diff --git a/home-config/sway/config.d/theme b/home-config/sway/config.d/theme index 4fb10b7..43ebb81 100644 --- a/home-config/sway/config.d/theme +++ b/home-config/sway/config.d/theme @@ -1,16 +1,18 @@ ### Set borders gaps inner 10 for_window [class="^.*"] border pixel 2 +default_border pixel 2 +default_floating_border pixel 2 ### Colors # class border backgr. text indicator child_border client.background #14171d -client.focused #4d4754 #14171d #ffffff #ada0a8 #4d4754 -client.focused_inactive #4d4754 #14171d #ffffff #4d4754 #14171d +client.focused #4d4754 #14171d #ffffff #4d4754 #4d4754 +client.focused_inactive #4d4754 #14171d #ffffff #14171d #14171d client.focused_tab_title #4d4754 #14171d #ffffff -client.unfocused #14171d #14171d #ffffff #4d4754 #14171d -client.urgent #cc5c5c #a63a3a #ffffff #cc5c5c #a63a3a +client.unfocused #14171d #14171d #ffffff #14171d #14171d +client.urgent #cc5c5c #a63a3a #ffffff #a63a3a #a63a3a ### SwayFX diff --git a/modules/home-packages/firmware.scm b/modules/home-packages/firmware.scm deleted file mode 100644 index 37ae276..0000000 --- a/modules/home-packages/firmware.scm +++ /dev/null @@ -1,26 +0,0 @@ -(define-module (home-packages firmware) - #:use-module (guix packages) - #:use-module (guix utils) - #:use-module (gnu packages) - #:use-module (gnu packages package-management) - #:use-module (gnu packages build-tools) - #:use-module (gnu packages virtualization) - #:use-module (gnu packages firmware) - #:use-module (guix gexp)) - -(define-public ovmf-new - (package - (inherit ovmf) - (name "ovmf-new") - (arguments - (substitute-keyword-arguments (package-arguments ovmf) - ((#:phases phases) - #~(modify-phases #$phases - (replace 'install - (lambda _ - (let ((fmw (string-append #$output "/share/firmware"))) - (mkdir-p fmw) - (copy-recursively "Build/OvmfX64/RELEASE_GCC49/FV" fmw) - (copy-file "Build/OvmfX64/RELEASE_GCC49/FV/OVMF.fd" (string-append fmw "/OVMF_CODE.fd")) - ))) - )))))) diff --git a/modules/home-packages/virtualization.scm b/modules/home-packages/virtualization.scm index 64d882d..e87b0e0 100644 --- a/modules/home-packages/virtualization.scm +++ b/modules/home-packages/virtualization.scm @@ -6,7 +6,6 @@ #:use-module (gnu packages build-tools) #:use-module (gnu packages virtualization) #:use-module (gnu packages firmware) - #:use-module (home-packages firmware) #:use-module (guix gexp)) (define-public libvirt-new @@ -25,9 +24,6 @@ (let ((fmw (string-append #$output "/share/qemu"))) (mkdir-p fmw) (copy-recursively #$(file-append qemu "/share/qemu") fmw)) - (let ((fmw (string-append #$output "/usr/share/OVMF"))) - (mkdir-p fmw) - (copy-recursively #$(file-append ovmf-new "/share/firmware") fmw)) )) )))))) @@ -47,42 +43,5 @@ (let ((fmw (string-append #$output "/share/qemu"))) (mkdir-p fmw) (copy-recursively #$(file-append qemu "/share/firmware") fmw)) - (let ((fmw (string-append #$output "/usr/share/OVMF"))) - (mkdir-p fmw) - (copy-recursively #$(file-append ovmf-new "/share/firmware") fmw)) )) )))))) - -;; (define-public libvirt-new -;; (package -;; (inherit libvirt) -;; (inputs -;; (modify-inputs (package-inputs libvirt) -;; (append ovmf-new))) -;; (arguments -;; (substitute-keyword-arguments (package-arguments libvirt) -;; ((#:phases phases) -;; #~(modify-phases #$phases -;; (add-after 'install 'ovmf -;; (lambda _ -;; (let ((fmw (string-append #$output "/usr/share/OVMF"))) -;; (mkdir-p fmw) -;; (copy-recursively #$(file-append ovmf-new "/share/firmware") fmw)) -;; )) -;; )))))) - -;; (define-public virt-manager-new -;; (package -;; (inherit virt-manager) -;; (name "virt-manager-new") -;; (arguments -;; (substitute-keyword-arguments (package-arguments virt-manager) -;; ((#:phases phases) -;; #~(modify-phases #$phases -;; (add-after 'install 'ovmf -;; (lambda _ -;; (let ((fmw (string-append #$output "/usr/share/OVMF"))) -;; (mkdir-p fmw) -;; (copy-recursively #$(file-append ovmf-new "/share/firmware") fmw) -;; ))) -;; ))))))