Epic big new X200T runs guix

Signed-off-by: Skylar "The Cobra" Widulski <cobra@vern.cc>
This commit is contained in:
Skylar "The Cobra" Widulski 2023-07-18 03:52:10 -04:00
parent f631cff3ce
commit 71624857ad
Signed by: cobra
GPG Key ID: 4FD8F812083FF6F9
11 changed files with 72 additions and 9 deletions

View File

@ -16,8 +16,7 @@ if [[ $HOSTNAME == pp ]]; then
PASTE_COMMAND=\"wl-paste\" PASTE_COMMAND=\"wl-paste\"
WIFI=wlan0 WIFI=wlan0
WM=\"bash\" WM=\"bash\"
elif [[ $HOSTNAME == Oganesson ]]; then : elif [[ $HOSTNAME == Oganesson || $HOSTNAME == Radon ]]; then :
#export WLR_DRM_DEVICES=/dev/dri/card1:/dev/dri/card0
elif [[ $HOSTNAME == Neon ]]; then elif [[ $HOSTNAME == Neon ]]; then
export WLR_NO_HARDWARE_CURSORS=1 export WLR_NO_HARDWARE_CURSORS=1
else else

View File

@ -6,6 +6,7 @@
%bin:suspend %bin:suspend
%bin:start-pipewire %bin:start-pipewire
%bin:screenshot %bin:screenshot
%bin:rotate
%bin:logout-wofi %bin:logout-wofi
%bin:lock %bin:lock
%bin:fss %bin:fss
@ -114,6 +115,19 @@ case $1 in
esac" "\nEOF")) esac" "\nEOF"))
(chmod #$output #o755)))) (chmod #$output #o755))))
(define %bin:rotate
(computed-file "bin-rotate"
#~(begin
(system (string-append #$coreutils "/bin/cat << \"EOF\" >" #$output "\n" "\
if [ ! -e $XDG_RUNTIME_DIR/rotate.lock ]; then
swaymsg output LVDS-1 transform 90 clockwise
touch $XDG_RUNTIME_DIR/rotate.lock
else
swaymsg output LVDS-1 transform 90 anticlockwise
rm $XDG_RUNTIME_DIR/rotate.lock
fi"))
(chmod #$output #o755))))
(define %bin:logout-wofi (define %bin:logout-wofi
(computed-file "bin-logout-wofi" (computed-file "bin-logout-wofi"
#~(begin #~(begin

View File

@ -601,6 +601,7 @@ exec ~/.local/bin/make-combined
bindsym $mod+r exec ~/.local/bin/wf-shadow -r LVDS-1 bindsym $mod+r exec ~/.local/bin/wf-shadow -r LVDS-1
bindsym $mod+g exec ~/.local/bin/wf-shadow -r DP-1 bindsym $mod+g exec ~/.local/bin/wf-shadow -r DP-1
bindsym XF86RotateWindows exec ~/.local/bin/rotate
bindsym XF86ScreenSaver exec ~/.local/bin/lock bindsym XF86ScreenSaver exec ~/.local/bin/lock
bindsym Print exec ~/.local/bin/screenshot -w bindsym Print exec ~/.local/bin/screenshot -w
bindsym Pause exec ~/.local/bin/logout-wofi bindsym Pause exec ~/.local/bin/logout-wofi

View File

@ -176,6 +176,7 @@
`(".local/bin/fss" ,%bin:fss) `(".local/bin/fss" ,%bin:fss)
`(".local/bin/lock" ,%bin:lock) `(".local/bin/lock" ,%bin:lock)
`(".local/bin/logout-wofi" ,%bin:logout-wofi) `(".local/bin/logout-wofi" ,%bin:logout-wofi)
`(".local/bin/rotate" ,%bin:rotate)
`(".local/bin/screenshot" ,%bin:screenshot) `(".local/bin/screenshot" ,%bin:screenshot)
`(".local/bin/start-pipewire" ,%bin:start-pipewire) `(".local/bin/start-pipewire" ,%bin:start-pipewire)
`(".local/bin/__suspend" ,%bin:suspend) `(".local/bin/__suspend" ,%bin:suspend)

View File

@ -175,6 +175,7 @@ exec ~/.local/bin/make-combined
bindsym $mod+r exec ~/.local/bin/wf-shadow -r LVDS-1 bindsym $mod+r exec ~/.local/bin/wf-shadow -r LVDS-1
bindsym $mod+g exec ~/.local/bin/wf-shadow -r DP-1 bindsym $mod+g exec ~/.local/bin/wf-shadow -r DP-1
bindsym XF86RotateWindows exec ~/.local/bin/rotate
bindsym XF86ScreenSaver exec ~/.local/bin/lock bindsym XF86ScreenSaver exec ~/.local/bin/lock
bindsym Print exec ~/.local/bin/screenshot -w bindsym Print exec ~/.local/bin/screenshot -w
bindsym Pause exec ~/.local/bin/logout-wofi bindsym Pause exec ~/.local/bin/logout-wofi

View File

@ -7,8 +7,7 @@ if [[ $HOSTNAME == pp ]]; then
PASTE_COMMAND="wl-paste" PASTE_COMMAND="wl-paste"
WIFI=wlan0 WIFI=wlan0
WM="bash" WM="bash"
elif [[ $HOSTNAME == Oganesson ]]; then : elif [[ $HOSTNAME == Oganesson || $HOSTNAME == Radon ]]; then :
#export WLR_DRM_DEVICES=/dev/dri/card1:/dev/dri/card0
elif [[ $HOSTNAME == Neon ]]; then elif [[ $HOSTNAME == Neon ]]; then
export WLR_NO_HARDWARE_CURSORS=1 export WLR_NO_HARDWARE_CURSORS=1
else else

View File

@ -1,4 +1,4 @@
(add-to-load-path "/etc/guix-config") (add-to-load-path (canonicalize-path ".."))
(define-module (cobra lists) (define-module (cobra lists)
#:use-module (guix gexp) #:use-module (guix gexp)
@ -112,7 +112,23 @@
(libvirt-configuration (libvirt-configuration
(unix-sock-group "libvirt"))) (unix-sock-group "libvirt")))
(service virtlog-service-type) (service virtlog-service-type)
%base-services)) (modify-services
%base-services
(udev-service-type config => (udev-configuration
(inherit config)
(rules
(append (udev-configuration-rules config)
(list
(udev-rule "10-wacom.rules"
(string-append "ACTION!+\"add|change\", "
"GOTO=\"wacom_end\"\n"
"ATTRS{id}==\"WACf*\" ENV{NAME}=\"Serial Wacom Tablet\", "
"ENV{ID_INPUT}=\"1\", "
"ENV{ID_INPUT_TABLET}=\"1\"\n"
"ATTRS{id}==\"FUJ*\" ENV{NAME}=\"Serial Wacom Tablet\", "
"ENV{ID_INPUT}=\"1\", "
"ENV{ID_INPUT_TABLET}=\"1\"\n"
"LABEL=\"wacom_end\"\n"))))))))))
(define package-list (define package-list
(append (append
@ -157,9 +173,12 @@
"curl" "curl"
"dconf" "dconf"
"gnunet" "gnunet"
"libinput"
"libwacom"
"lvm2" "lvm2"
"openssh" "openssh"
"openssl" "openssl"
"xf86-input-wacom"
;; Utilities ;; Utilities
"vim" "vim"

View File

@ -1,4 +1,4 @@
(add-to-load-path "/etc/guix-config") (add-to-load-path (canonicalize-path ".."))
(define-module (cobra os) (define-module (cobra os)
#:use-module (gnu) #:use-module (gnu)

View File

@ -1,4 +1,4 @@
(add-to-load-path "/etc/guix-config") (add-to-load-path (dirname (current-filename)))
(use-modules (gnu) (cobra os)) (use-modules (gnu) (cobra os))
(operating-system (operating-system

View File

@ -1,4 +1,4 @@
(add-to-load-path "/etc/guix-config") (add-to-load-path (dirname (current-filename)))
(use-modules (gnu) (cobra os)) (use-modules (gnu) (cobra os))
(operating-system (operating-system

29
etc/guix-config/radon.scm Normal file
View File

@ -0,0 +1,29 @@
(add-to-load-path (dirname (current-filename)))
(use-modules (gnu)
(gnu services base)
(gnu services shepherd)
(gnu packages linux)
(cobra os) (cobra lists))
(operating-system
(inherit %base-guix-system)
(host-name "Radon")
(mapped-devices (list
(mapped-device
(source (uuid "974eb14d-93e7-4e23-b530-6dc538ea3e86"))
(target "fde")
(type luks-device-mapping))
(mapped-device
(source "matrix")
(targets (list "matrix-rootvol"))
(type lvm-device-mapping))))
(file-systems (append (list
(file-system
(type "btrfs")
(mount-point "/")
(device (file-system-label "root"))
(flags '(no-atime))
(options "space_cache=v2")
(needed-for-boot? #t)
(dependencies mapped-devices)))
%base-file-systems)))