refactor
This commit is contained in:
opalvault
@@ -0,0 +1,91 @@
|
||||
(use-modules (gnu)
|
||||
(gnu packages wm)
|
||||
(gnu packages version-control)
|
||||
(gnu packages emacs)
|
||||
(gnu packages gnuzilla)
|
||||
(gnu packages vim)
|
||||
(gnu packages certs)
|
||||
(gnu packages pulseaudio)
|
||||
(gnu packages audio)
|
||||
(gnu packages linux)
|
||||
(gnu packages suckless)
|
||||
(gnu packages terminals)
|
||||
(gnu packages gnome)
|
||||
(gnu packages shells)
|
||||
(gnu packages emacs)
|
||||
(gnu system setuid)
|
||||
(nongnu packages linux))
|
||||
|
||||
(use-service-modules
|
||||
cups
|
||||
desktop
|
||||
networking
|
||||
ssh
|
||||
xorg)
|
||||
|
||||
(operating-system
|
||||
(kernel linux)
|
||||
(firmware (list linux-firmware sof-firmware))
|
||||
(locale "en_US.utf8")
|
||||
(timezone "America/Los_Angeles")
|
||||
(keyboard-layout (keyboard-layout "us"))
|
||||
(host-name "apollyon")
|
||||
(users (cons* (user-account
|
||||
(name "opal")
|
||||
(comment "opal")
|
||||
(group "users")
|
||||
(shell (file-append zsh "/bin/zsh"))
|
||||
(home-directory "/home/opal")
|
||||
(supplementary-groups
|
||||
'("wheel" "netdev" "audio" "video")))
|
||||
%base-user-accounts))
|
||||
(packages
|
||||
(append
|
||||
(list
|
||||
zsh
|
||||
emacs
|
||||
i3-wm
|
||||
i3status
|
||||
git
|
||||
network-manager
|
||||
icecat
|
||||
emacs
|
||||
bluez
|
||||
bluez-alsa
|
||||
pulseaudio
|
||||
dmenu
|
||||
alacritty
|
||||
nss-certs)
|
||||
%base-packages))
|
||||
(services
|
||||
(append
|
||||
(list (service gnome-desktop-service-type)
|
||||
(service openssh-service-type)
|
||||
(service tor-service-type)
|
||||
(service cups-service-type)
|
||||
(set-xorg-configuration
|
||||
(xorg-configuration
|
||||
(keyboard-layout keyboard-layout))))
|
||||
%desktop-services))
|
||||
(bootloader
|
||||
(bootloader-configuration
|
||||
(bootloader grub-efi-bootloader)
|
||||
(targets (list "/boot/efi"))
|
||||
(keyboard-layout keyboard-layout)))
|
||||
(mapped-devices
|
||||
(list (mapped-device
|
||||
(source
|
||||
(uuid "ceb0c15f-30b6-4d02-a7e9-96ddcd73c763"))
|
||||
(target "cryptroot")
|
||||
(type luks-device-mapping))))
|
||||
(file-systems
|
||||
(cons* (file-system
|
||||
(mount-point "/")
|
||||
(device "/dev/mapper/cryptroot")
|
||||
(type "btrfs")
|
||||
(dependencies mapped-devices))
|
||||
(file-system
|
||||
(mount-point "/boot/efi")
|
||||
(device (uuid "739C-796C" 'fat32))
|
||||
(type "vfat"))
|
||||
%base-file-systems)))
|
||||
@@ -0,0 +1,109 @@
|
||||
(use-modules (gnu)
|
||||
(gnu services desktop)
|
||||
(gnu packages wm)
|
||||
(gnu packages shells)
|
||||
(gnu packages version-control)
|
||||
(gnu packages emacs)
|
||||
(gnu packages gnuzilla)
|
||||
(gnu packages vim)
|
||||
(gnu packages certs)
|
||||
(gnu packages file-systems)
|
||||
(gnu packages suckless)
|
||||
(gnu packages admin)
|
||||
(gnu packages linux)
|
||||
(gnu packages audio)
|
||||
(gnu packages pulseaudio)
|
||||
(gnu packages gnome)
|
||||
(gnu system setuid)
|
||||
(nongnu packages linux))
|
||||
|
||||
(use-service-modules
|
||||
cups
|
||||
desktop
|
||||
networking
|
||||
ssh
|
||||
;; sddm
|
||||
xorg)
|
||||
|
||||
(operating-system
|
||||
(kernel linux)
|
||||
(firmware (list linux-firmware))
|
||||
(locale "en_US.utf8")
|
||||
(timezone "America/Los_Angeles")
|
||||
(keyboard-layout (keyboard-layout "us"))
|
||||
(host-name "borges")
|
||||
(setuid-programs
|
||||
(let ((from (lambda (package file)
|
||||
(setuid-program (program (file-append package file))))))
|
||||
(cons* (from light "/bin/light")
|
||||
(from network-manager "/bin/nmtui")
|
||||
(from sway "/bin/sway")
|
||||
(from swaylock "/bin/swaylock")
|
||||
%setuid-programs)))
|
||||
(users (cons* (user-account
|
||||
(name "opal")
|
||||
(comment "opal")
|
||||
(group "users")
|
||||
(home-directory "/home/opal")
|
||||
(shell (file-append zsh "/bin/zsh"))
|
||||
(supplementary-groups
|
||||
'("wheel"
|
||||
"netdev"
|
||||
"audio"
|
||||
"video")))
|
||||
%base-user-accounts))
|
||||
|
||||
(packages (append (list git
|
||||
gnome
|
||||
network-manager
|
||||
icecat
|
||||
vim
|
||||
nss-certs
|
||||
exfat-utils
|
||||
emacs
|
||||
sway
|
||||
swaybg
|
||||
swaylock
|
||||
swayidle
|
||||
dmenu
|
||||
bluez
|
||||
bluez-alsa
|
||||
pulseaudio)
|
||||
%base-packages))
|
||||
|
||||
|
||||
;; (services
|
||||
;; (append (modify-services %desktop-services
|
||||
;; (delete gdm-service-type))
|
||||
;; (list (service sddm-service-type
|
||||
;; (sddm-configuration
|
||||
;; (display-server "wayland"))))))
|
||||
(services
|
||||
(append (modify-services %desktop-services
|
||||
(gdm-service-type config
|
||||
=> (gdm-configuration
|
||||
(inherit config)
|
||||
(wayland? #t)
|
||||
(debug? #t))))))
|
||||
(bootloader
|
||||
(bootloader-configuration
|
||||
(bootloader grub-efi-bootloader)
|
||||
(targets (list "/boot/efi"))
|
||||
(keyboard-layout keyboard-layout)))
|
||||
(mapped-devices
|
||||
(list (mapped-device
|
||||
(source
|
||||
(uuid "0eb58e93-c463-4d40-a819-4c9d594ed230"))
|
||||
(target "cryptroot")
|
||||
(type luks-device-mapping))))
|
||||
(file-systems
|
||||
(cons* (file-system
|
||||
(mount-point "/")
|
||||
(device "/dev/mapper/cryptroot")
|
||||
(type "btrfs")
|
||||
(dependencies mapped-devices))
|
||||
(file-system
|
||||
(mount-point "/boot/efi")
|
||||
(device (uuid "2AFC-9172" 'fat32))
|
||||
(type "vfat"))
|
||||
%base-file-systems)))
|
||||
@@ -0,0 +1,103 @@
|
||||
(use-modules (gnu)
|
||||
(gnu packages wm)
|
||||
(gnu packages version-control)
|
||||
(gnu packages emacs)
|
||||
(gnu packages gnuzilla)
|
||||
(gnu packages vim)
|
||||
(gnu packages certs)
|
||||
(gnu packages pulseaudio)
|
||||
(gnu packages audio)
|
||||
(gnu packages linux)
|
||||
(gnu packages suckless)
|
||||
(gnu packages terminals)
|
||||
(gnu packages gnome)
|
||||
(gnu packages shells)
|
||||
(gnu packages emacs)
|
||||
(gnu packages kde-frameworks)
|
||||
(gnu system setuid)
|
||||
(nongnu packages linux))
|
||||
|
||||
(use-service-modules
|
||||
cups
|
||||
desktop
|
||||
networking
|
||||
ssh
|
||||
xorg)
|
||||
|
||||
(operating-system
|
||||
(kernel linux)
|
||||
(firmware (list linux-firmware sof-firmware))
|
||||
(locale "en_US.utf8")
|
||||
(timezone "America/Los_Angeles")
|
||||
(keyboard-layout (keyboard-layout "us"))
|
||||
(host-name "apollyon")
|
||||
(setuid-programs
|
||||
(let ((from (lambda (package file)
|
||||
(setuid-program (program (file-append package file))))))
|
||||
(cons* (from i3lock "/bin/i3lock")
|
||||
(from network-manager "/bin/nmtui")
|
||||
(from networkmanager-qt "/bin/nm-connection-editor")
|
||||
(from network-manager-applet "/bin/nm-applet")
|
||||
%setuid-programs)))
|
||||
(users (cons* (user-account
|
||||
(name "opal")
|
||||
(comment "opal")
|
||||
(group "users")
|
||||
(shell (file-append zsh "/bin/zsh"))
|
||||
(home-directory "/home/opal")
|
||||
(supplementary-groups
|
||||
'("wheel" "netdev" "audio" "video")))
|
||||
%base-user-accounts))
|
||||
(packages
|
||||
(append
|
||||
(list
|
||||
zsh
|
||||
emacs
|
||||
i3-gaps
|
||||
i3status
|
||||
git
|
||||
network-manager
|
||||
networkmanager-qt
|
||||
network-manager-applet
|
||||
icecat
|
||||
emacs
|
||||
bluez
|
||||
bluez-alsa
|
||||
pulseaudio
|
||||
dmenu
|
||||
alacritty
|
||||
nss-certs)
|
||||
%base-packages))
|
||||
(services
|
||||
(append
|
||||
(list (service gnome-desktop-service-type)
|
||||
(service gnome-keyring-service-type)
|
||||
(service openssh-service-type)
|
||||
(service tor-service-type)
|
||||
(service cups-service-type)
|
||||
(set-xorg-configuration
|
||||
(xorg-configuration
|
||||
(keyboard-layout keyboard-layout))))
|
||||
%desktop-services))
|
||||
(bootloader
|
||||
(bootloader-configuration
|
||||
(bootloader grub-efi-bootloader)
|
||||
(targets (list "/boot/efi"))
|
||||
(keyboard-layout keyboard-layout)))
|
||||
(mapped-devices
|
||||
(list (mapped-device
|
||||
(source
|
||||
(uuid "ceb0c15f-30b6-4d02-a7e9-96ddcd73c763"))
|
||||
(target "cryptroot")
|
||||
(type luks-device-mapping))))
|
||||
(file-systems
|
||||
(cons* (file-system
|
||||
(mount-point "/")
|
||||
(device "/dev/mapper/cryptroot")
|
||||
(type "btrfs")
|
||||
(dependencies mapped-devices))
|
||||
(file-system
|
||||
(mount-point "/boot/efi")
|
||||
(device (uuid "739C-796C" 'fat32))
|
||||
(type "vfat"))
|
||||
%base-file-systems)))
|
||||
@@ -0,0 +1,17 @@
|
||||
(list (channel
|
||||
(name 'guix)
|
||||
(url "https://git.savannah.gnu.org/git/guix.git")
|
||||
(introduction
|
||||
(make-channel-introduction
|
||||
"9edb3f66fd807b096b48283debdcddccfea34bad"
|
||||
(openpgp-fingerprint
|
||||
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
|
||||
|
||||
(channel
|
||||
(name 'nonguix)
|
||||
(url "https://gitlab.com/nonguix/nonguix")
|
||||
(introduction
|
||||
(make-channel-introduction
|
||||
"897c1a470da759236cc11798f4e0a5f7d4d59fbc"
|
||||
(openpgp-fingerprint
|
||||
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))))
|
||||
@@ -0,0 +1,96 @@
|
||||
(use-modules (gnu)
|
||||
(gnu services desktop)
|
||||
(gnu packages wm)
|
||||
(gnu packages shells)
|
||||
(gnu packages version-control)
|
||||
(gnu packages emacs)
|
||||
(gnu packages gnuzilla)
|
||||
(gnu packages vim)
|
||||
(gnu packages certs)
|
||||
(gnu packages file-systems)
|
||||
(gnu packages suckless)
|
||||
(gnu packages admin)
|
||||
(gnu packages linux)
|
||||
(gnu packages audio)
|
||||
(gnu packages pulseaudio)
|
||||
(gnu system setuid)
|
||||
(nongnu packages linux))
|
||||
|
||||
(use-service-modules
|
||||
cups
|
||||
desktop
|
||||
networking
|
||||
ssh
|
||||
sddm
|
||||
xorg)
|
||||
|
||||
(operating-system
|
||||
(kernel linux)
|
||||
(firmware (list linux-firmware))
|
||||
(locale "en_US.utf8")
|
||||
(timezone "America/Los_Angeles")
|
||||
(keyboard-layout (keyboard-layout "us"))
|
||||
(host-name "borges")
|
||||
(setuid-programs
|
||||
(cons (setuid-program
|
||||
(program (file-append swaylock "/bin/swaylock")))
|
||||
%setuid-programs))
|
||||
(users (cons* (user-account
|
||||
(name "opal")
|
||||
(comment "opal")
|
||||
(group "users")
|
||||
(home-directory "/home/opal")
|
||||
(shell (file-append zsh "/bin/zsh"))
|
||||
(supplementary-groups
|
||||
'("wheel"
|
||||
"netdev"
|
||||
"audio"
|
||||
"video")))
|
||||
%base-user-accounts))
|
||||
|
||||
(packages (append (list git
|
||||
icecat
|
||||
vim
|
||||
nss-certs
|
||||
exfat-utils
|
||||
emacs
|
||||
sway
|
||||
swaybg
|
||||
swaylock
|
||||
swayidle
|
||||
dmenu
|
||||
bluez
|
||||
bluez-alsa
|
||||
pulseaudio)
|
||||
%base-packages))
|
||||
|
||||
|
||||
;; (services (cons* ...
|
||||
;; (modify-services %desktop-services
|
||||
;; (gdm-service-type config
|
||||
;; =;;putabrackethere (gdm-configuration
|
||||
;; (inherit config)
|
||||
;; (wayland? #t)
|
||||
;; (debug? #t))))))
|
||||
(bootloader
|
||||
(bootloader-configuration
|
||||
(bootloader grub-efi-bootloader)
|
||||
(targets (list "/boot/efi"))
|
||||
(keyboard-layout keyboard-layout)))
|
||||
(mapped-devices
|
||||
(list (mapped-device
|
||||
(source
|
||||
(uuid "40aa6387-e935-4f70-8e7d-1975678a5a32"))
|
||||
(target "cryptroot")
|
||||
(type luks-device-mapping))))
|
||||
(file-systems
|
||||
(cons* (file-system
|
||||
(mount-point "/")
|
||||
(device "/dev/mapper/cryptroot")
|
||||
(type "btrfs")
|
||||
(dependencies mapped-devices))
|
||||
(file-system
|
||||
(mount-point "/boot/efi")
|
||||
(device (uuid "1C3B-10F5" 'fat32))
|
||||
(type "vfat"))
|
||||
%base-file-systems)))
|
||||
@@ -0,0 +1,107 @@
|
||||
(use-modules (gnu)
|
||||
(gnu services desktop)
|
||||
(gnu packages wm)
|
||||
(gnu system setuid)
|
||||
(gnu packages admin)
|
||||
(nongnu packages linux))
|
||||
|
||||
(use-service-modules
|
||||
cups
|
||||
desktop
|
||||
networking
|
||||
ssh
|
||||
sddm
|
||||
xorg)
|
||||
|
||||
(operating-system
|
||||
(kernel linux)
|
||||
(firmware (list linux-firmware))
|
||||
(locale "en_US.utf8")
|
||||
(timezone "America/Los_Angeles")
|
||||
(keyboard-layout (keyboard-layout "us"))
|
||||
(host-name "borges")
|
||||
(setuid-programs
|
||||
(cons (setuid-program
|
||||
(program (file-append swaylock "/bin/swaylock")))
|
||||
%setuid-programs))
|
||||
(users (cons* (user-account
|
||||
(name "opal")
|
||||
(comment "opal")
|
||||
(group "users")
|
||||
(home-directory "/home/opal")
|
||||
(supplementary-groups
|
||||
'("wheel"
|
||||
"netdev"
|
||||
"audio"
|
||||
"video")))
|
||||
%base-user-accounts))
|
||||
|
||||
(packages (append (list git
|
||||
wl-clipboard
|
||||
vim
|
||||
nss-certs
|
||||
stow
|
||||
exfat-utils
|
||||
emacs
|
||||
emacs-exwm
|
||||
sway
|
||||
swaybg
|
||||
swaylock
|
||||
swayidle
|
||||
polybar
|
||||
nyxt
|
||||
dmenu
|
||||
bluez
|
||||
bluez-alsa
|
||||
pulseaudio
|
||||
keepassxc
|
||||
font-fira-mono
|
||||
font-fira-sans
|
||||
font-fira-code
|
||||
gcc-toolchain))
|
||||
%base-packages)
|
||||
|
||||
(services
|
||||
(append (modify-services %desktop-services
|
||||
(gdm-service-type config
|
||||
= (gdm-configuration
|
||||
(inherit config)
|
||||
(wayland? #t)
|
||||
(debug? #t))))))
|
||||
;; (append (modify-services %desktop-services
|
||||
;; (delete gdm-service-type))
|
||||
;; (list (service sddm-service-type
|
||||
;; (sddm-configuration
|
||||
;; (display-server "wayland"))))))
|
||||
|
||||
(bootloader
|
||||
(bootloader-configuration
|
||||
(bootloader grub-efi-bootloader)
|
||||
(targets (list "/boot/efi"))
|
||||
(keyboard-layout keyboard-layout)))
|
||||
(mapped-devices
|
||||
(list (mapped-device
|
||||
(source
|
||||
(uuid "abe760e2-4ba5-4f43-81a2-1c3f16eb62a8"))
|
||||
(target "cryptroot")
|
||||
(type luks-device-mapping))))
|
||||
(file-systems
|
||||
(cons* (file-system
|
||||
(mount-point "/")
|
||||
(device "/dev/mapper/cryptroot")
|
||||
(type "btrfs")
|
||||
(dependencies mapped-devices))
|
||||
(file-system
|
||||
(mount-point "/boot/efi")
|
||||
(device (uuid "15B3-5DE5" 'fat32))
|
||||
(type "vfat"))
|
||||
%base-file-systems))
|
||||
|
||||
|
||||
;; (services (cons* ...
|
||||
;; (modify-services %desktop-services
|
||||
;; (gdm-service-type config
|
||||
;; =;;putabrackethere (gdm-configuration
|
||||
;; (inherit config)
|
||||
;; (wayland? #t)
|
||||
;; (debug? #t))))))
|
||||
Reference in New Issue
Block a user