added channel, initial switch to hyprland

This commit is contained in:
Ryan 2023-06-09 22:19:29 -04:00
parent 355949af3c
commit 2b846e701c
Signed by: ryan77627
GPG key ID: 81B0E222A3E2308E
5 changed files with 29 additions and 9 deletions

View file

@ -20,4 +20,13 @@
"897c1a470da759236cc11798f4e0a5f7d4d59fbc" "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
(openpgp-fingerprint (openpgp-fingerprint
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
(channel
(name 'rosenthal)
(url "https://github.com/rakino/rosenthal")
(branch "trunk")
(introduction
(make-channel-introduction
"7677db76330121a901604dfbad19077893865f35"
(openpgp-fingerprint
"13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7"))))
) )

View file

@ -3,17 +3,17 @@
"position": "top", "position": "top",
"height": 30, "height": 30,
"modules-left": ["sway/workspaces", "sway/mode"], "modules-left": ["wlr/workspaces", "hyprland/submap"],
"modules-center": ["sway/window"], "modules-center": ["hyprland/window"],
"modules-right": ["tray", "custom/spotify", "custom/weather", "custom/mail", "custom/storage", "backlight", "pulseaudio", "network", "idle_inhibitor", "battery", "clock"], "modules-right": ["tray", "custom/spotify", "custom/weather", "custom/mail", "custom/storage", "backlight", "pulseaudio", "network", "idle_inhibitor", "battery", "clock"],
"sway/mode": { "hyprland/submap": {
"format": " {}" "format": " {}"
}, },
"sway/workspaces": { "wlr/workspaces": {
"format": "{name}", "format": "{name}",
"disable-scroll": true "disable-scroll": true
}, },
"sway/window": { "hyprland/window": {
"max-length": 80, "max-length": 80,
"tooltip": false "tooltip": false
}, },
@ -43,7 +43,7 @@
"ethernet": [""], "ethernet": [""],
"disconnected": ["睊"] "disconnected": ["睊"]
}, },
"on-click": "alacritty -e iwctl", "on-click": "alacritty -e doas nmtui",
"tooltip": false "tooltip": false
}, },
"pulseaudio": { "pulseaudio": {

View file

@ -37,7 +37,7 @@ window#waybar.solo {
color: rgba(217, 216, 216, 1); color: rgba(217, 216, 216, 1);
} }
#workspaces button.focused { #workspaces button.active {
border-top: 3px solid rgba(217, 216, 216, 1); border-top: 3px solid rgba(217, 216, 216, 1);
border-bottom: 3px solid rgba(217, 216, 216, 0); border-bottom: 3px solid rgba(217, 216, 216, 0);
} }

View file

@ -11,6 +11,7 @@
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (ryan-packages freedesktop) #:use-module (ryan-packages freedesktop)
#:use-module (ryan-packages wm) #:use-module (ryan-packages wm)
#:use-module (rosenthal packages wm)
#:use-module (gnu packages security-token) #:use-module (gnu packages security-token)
#:use-module (gnu services security-token) #:use-module (gnu services security-token)
#:use-module (gnu services cups) #:use-module (gnu services cups)
@ -104,6 +105,7 @@
;; under their own account: use 'guix search KEYWORD' to search ;; under their own account: use 'guix search KEYWORD' to search
;; for packages and 'guix install PACKAGE' to install a package. ;; for packages and 'guix install PACKAGE' to install a package.
(packages (append (map specification->package (list "sway" (packages (append (map specification->package (list "sway"
"hyprland"
"swaybg" "swaybg"
"swayidle" "swayidle"
;"swaylock-effects" ;"swaylock-effects"
@ -114,11 +116,12 @@
"hicolor-icon-theme" "hicolor-icon-theme"
"git" "git"
"nss-certs" "nss-certs"
"waybar" ;"waybar"
"gnupg" "gnupg"
"light" "light"
"mako" "mako"
"grim" "grim"
"grimblast"
"slurp" "slurp"
"wl-clipboard" "wl-clipboard"
"bluez" "bluez"
@ -138,7 +141,7 @@
"wireplumber" "wireplumber"
"wireshark" "wireshark"
"zsh")) "zsh"))
(list my-ca-certs xdg-desktop-portal-wlr-new swaylock-effects-new) (list my-ca-certs xdg-desktop-portal-wlr-new swaylock-effects-new waybar-new)
%my-base-packages )) %my-base-packages ))
;; Below is the list of system services. To search for available ;; Below is the list of system services. To search for available

View file

@ -1,6 +1,7 @@
(define-module (ryan-packages wm) (define-module (ryan-packages wm)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix utils) #:use-module (guix utils)
@ -19,3 +20,10 @@
(base32 (base32
"0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h")))) "0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h"))))
(inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam"))))) (inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam")))))
(define-public waybar-new
(package
(inherit waybar)
(arguments (list #:configure-flags #~(list "-Dexperimental=true")))))
waybar-new