From bc591dcedf45b80f70661f33c42c68dbd581e901 Mon Sep 17 00:00:00 2001 From: jdlugosz963 Date: Mon, 11 Aug 2025 17:36:57 +0200 Subject: Migrate to RDE --- guix/jd/desktops/base.scm | 249 ----------------------------------------- guix/jd/desktops/berserker.scm | 17 --- guix/jd/desktops/mimir.scm | 14 --- 3 files changed, 280 deletions(-) delete mode 100644 guix/jd/desktops/base.scm delete mode 100755 guix/jd/desktops/berserker.scm delete mode 100644 guix/jd/desktops/mimir.scm (limited to 'guix/jd/desktops') diff --git a/guix/jd/desktops/base.scm b/guix/jd/desktops/base.scm deleted file mode 100644 index 748e11d..0000000 --- a/guix/jd/desktops/base.scm +++ /dev/null @@ -1,249 +0,0 @@ -(define-module (jd desktops base) - #:use-module (jd home services polkit) - #:use-module (jd home services desktop) - #:use-module (jd home services emacs) - #:use-module (jd services polkit) - - #:use-module (gnu) - #:use-module (gnu home) - #:use-module (gnu home services) - #:use-module (gnu home services desktop) - #:use-module (gnu home services gnupg) - #:use-module (gnu home services xdg) - #:use-module (gnu home services sound) - #:use-module (gnu home services ssh) - #:use-module (gnu services) - #:use-module (guix packages) - - #:use-module (nongnu packages linux) - #:use-module (nongnu system linux-initrd)) - -(use-package-modules wm gnome networking virtualization - lisp lisp-xyz cups fonts gnupg android) - -(use-service-modules cups desktop networking ssh xorg - docker virtualization pm sound dbus - nix sddm guix) - -(define-public %jd-base-home-services - (list - ;; (service home-redshift-service-type - ;; (home-redshift-configuration - ;; (location-provider 'manual) - ;; (latitude 51.919438) - ;; (longitude 19.145136))) - ;; Poland - - (service home-dbus-service-type) - (service home-emacs-service-type) - (service home-desktop-service-type) - - (service home-openssh-service-type - (home-openssh-configuration - (hosts - (list (openssh-host (name "gammu") - (host-name "172.16.1.102") - (user "serwis") - (host-key-algorithms '("+ssh-rsa"))) - (openssh-host (name "net47") - (host-name "net47.abaks.pl") - (user "serwis") - (port 22001)))))) - - ;; Dont know why, but when i put home-gpg-agent-service-type as an - ;; extension in home-desktop-service-type service it doesn't work. - (service home-gpg-agent-service-type - (home-gpg-agent-configuration - (pinentry-program - (file-append pinentry-gnome3 "/bin/pinentry-gnome3")) - (ssh-support? #t) - (default-cache-ttl 28800) - (max-cache-ttl 28800) - (default-cache-ttl-ssh 28800) - (max-cache-ttl-ssh 28800))) - ;; (service home-polkit-gnome-service-type) - )) - - -(define-public %jakub-user - (user-account - (name "jakub") - (comment "Jakub Dlugosz") - (group "users") - (home-directory "/home/jakub") - (supplementary-groups '("wheel" ;; sudo - "netdev" ;; network devices - "kvm" - "libvirt" - "tty" - "input" - "docker" - "audio" ;; control audio devices - "video" ;; access to webcam - "dialout" ;; access to /dev/ttyUSBX devices - "adbusers" - )))) - -(define-public %jd-base-user-accounts - (cons* - %jakub-user - %base-user-accounts)) - -(define-public %stumpwm-packages - (list sbcl - sbcl-dbus - stumpwm+slynk - - sbcl-stumpwm-screenshot - sbcl-stumpwm-pamixer - sbcl-stumpwm-pass - - sbcl-stumpwm-cpu - sbcl-stumpwm-mem - sbcl-stumpwm-net - sbcl-stumpwm-battery-portable - sbcl-stumpwm-stumptray - - sbcl-stumpwm-ttf-fonts - - sbcl-drakma - sbcl-yason - - (list stumpwm "lib"))) - -(define-public %root-packages - (specifications->packages '("emacs" - "emacs-exwm" - "stow" - "bluez" - "bluez-alsa" - "exfat-utils" - "git" - "xf86-input-libinput" - "intel-vaapi-driver" - "libva-utils" ;; vainfo - ;; "nss-certs" -- it is in %base-packages from fdfd7667c66cf9ce746330f39bcd366e124460e1 - "nix"))) - -(define-public %jd-base-packages - (append %root-packages - ;; %stumpwm-packages - %base-packages)) - -(define-public %jd-base-services - (cons* - (service guix-home-service-type - `(("jakub" ,(home-environment - (services %jd-base-home-services))))) - - (service openssh-service-type) - - (service console-font-service-type - (map (lambda (tty) - (cons tty (file-append - font-terminus - "/share/consolefonts/ter-122n.psf.gz"))) - '("tty1" "tty2" "tty3" "tty4" "tty5" "tty6"))) - - (service screen-locker-service-type - (screen-locker-configuration - (name "swaylock") - (program (file-append swaylock "/bin/swaylock")) - (using-pam? #t) - (using-setuid? #f))) - - (service network-manager-service-type - (network-manager-configuration - (vpn-plugins (list network-manager-openvpn)))) - - (simple-service 'dbus-packages dbus-root-service-type (list blueman - virt-manager)) - (service bluetooth-service-type - (bluetooth-configuration - (auto-enable? #t))) - - (service containerd-service-type) - (service docker-service-type) - (service libvirt-service-type - (libvirt-configuration - (unix-sock-group "libvirt"))) - (service virtlog-service-type) - - (service cups-service-type - (cups-configuration - (web-interface? #t) - (extensions - (list cups-filters)))) - - (service thermald-service-type) - (service tlp-service-type - (tlp-configuration - (cpu-boost-on-ac? #t) - (wifi-pwr-on-bat? #t))) - - (service nix-service-type) - - polkit-network-manager-service - - (udev-rules-service 'android android-udev-rules - #:groups '("adbusers")) - - (udev-rules-service 'microbit (udev-rule - "69-microbit.rules" - (string-append "ACTION!=\"add|change\", GOTO=\"microbit_rules_end\"" - "SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0d28\", ATTR{idProduct}==\"0204\", TAG+=\"uaccess\"" - "LABEL=\"microbit_rules_end\""))) - - ;; %desktop-services - (modify-services %desktop-services - (guix-service-type config => (guix-configuration - (inherit config) - (substitute-urls - (append (list "https://substitutes.nonguix.org") - %default-substitute-urls)) - (authorized-keys - (append (list (plain-file "non-guix.pub" - "(public-key (ecc (curve Ed25519) (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))")) - %default-authorized-guix-keys)))) - (delete network-manager-service-type) - ;; (delete mingetty-service-type) - (delete console-font-service-type) - - (delete pulseaudio-service-type) - (delete alsa-service-type) - (delete (if (string-prefix? "x86_64" - (or (%current-target-system) - (%current-system))) - gdm-service-type - sddm-service-type))))) - -;; Odin is a base for my operating systems -(define-public odin-free - (operating-system - (locale "en_US.utf8") - (timezone "Europe/Warsaw") - (keyboard-layout (keyboard-layout "pl")) - (host-name "odin") - - (users %jd-base-user-accounts) - (packages %jd-base-packages) - (services %jd-base-services) - - (bootloader (bootloader-configuration - (bootloader grub-bootloader) - (targets (list "/boot/efi")) - (keyboard-layout keyboard-layout))) - - (file-systems (cons* (file-system - (mount-point "/tmp") - (device "none") - (type "tmpfs") - (check? #f)) - %base-file-systems)))) - -(define-public odin-non-free - (operating-system - (inherit odin-free) - (kernel linux) - (initrd microcode-initrd) - (firmware (list linux-firmware)))) diff --git a/guix/jd/desktops/berserker.scm b/guix/jd/desktops/berserker.scm deleted file mode 100755 index 3d6b0df..0000000 --- a/guix/jd/desktops/berserker.scm +++ /dev/null @@ -1,17 +0,0 @@ -(define-module (jd desktops berserker) - #:use-module (jd desktops base) - #:use-module (jd packages linux) - #:use-module (jd utils) - #:use-module (gnu) - #:use-module (gnu home)) - -(define-public home - (home-environment - (services %jd-base-home-services))) - -(define-public system - (operating-system - (inherit odin-non-free) - (kernel-loadable-modules (list xmm7360-pci)) - (host-name "berserker"))) - diff --git a/guix/jd/desktops/mimir.scm b/guix/jd/desktops/mimir.scm deleted file mode 100644 index e5db0b7..0000000 --- a/guix/jd/desktops/mimir.scm +++ /dev/null @@ -1,14 +0,0 @@ -(define-module (jd desktops mimir) - #:use-module (jd desktops base) - #:use-module (gnu) - #:use-module (gnu home)) - -(define-public home - (home-environment - (services %jd-base-home-services))) - -(define-public system - (operating-system - (inherit odin-non-free) - (host-name "mimir"))) - -- cgit v1.2.3