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 --- guix/jd/home/services/desktop.scm | 198 ------------------------------ guix/jd/home/services/emacs.scm | 113 ----------------- guix/jd/home/services/polkit.scm | 31 ----- guix/jd/packages/emacs.scm | 57 --------- guix/jd/packages/fonts.scm | 25 ---- guix/jd/packages/linux.scm | 51 -------- guix/jd/services/polkit.scm | 21 ---- guix/jd/utils.scm | 75 ------------ 11 files changed, 851 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 delete mode 100644 guix/jd/home/services/desktop.scm delete mode 100644 guix/jd/home/services/emacs.scm delete mode 100644 guix/jd/home/services/polkit.scm delete mode 100644 guix/jd/packages/emacs.scm delete mode 100644 guix/jd/packages/fonts.scm delete mode 100644 guix/jd/packages/linux.scm delete mode 100644 guix/jd/services/polkit.scm delete mode 100644 guix/jd/utils.scm (limited to 'guix') 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"))) - diff --git a/guix/jd/home/services/desktop.scm b/guix/jd/home/services/desktop.scm deleted file mode 100644 index 393c2d0..0000000 --- a/guix/jd/home/services/desktop.scm +++ /dev/null @@ -1,198 +0,0 @@ -(define-module (jd home services desktop) - #:use-module (gnu packages) - #:use-module (gnu packages freedesktop) - #:use-module (gnu packages networking) - #:use-module (gnu packages syncthing) - #:use-module (gnu packages gnome) - #:use-module (gnu packages gnupg) - #:use-module (gnu services) - #:use-module (gnu services configuration) - #:use-module (gnu home services) - #:use-module (gnu home services shepherd) - #:use-module (gnu home services desktop) - #:use-module (gnu home services sound) - #:use-module (gnu home services xdg) - #:use-module (gnu home services gnupg) - #:use-module (gnu home services dotfiles) - #:use-module (guix gexp) - - #:use-module (jd packages fonts)) - -(define (desktop-profile-service config) - (append - (list font-terminus-ttf) - (specifications->packages '("sway" - ;; "swayfx" - "swaylock" - "swayidle" - "swaynotificationcenter" - "waybar" - "fuzzel" - "foot" - "mako" - "wl-clipboard" - "wlsunset" - "grimshot" - "swappy" - - "htop" - "distrobox" - - "udiskie" - ;; rest - "qutebrowser" - "ungoogled-chromium" - "firefox" - "tor-client" - "signal-desktop" - - "pulsemixer" - "pavucontrol" - "alsa-utils" - - "virt-manager" - - "flatpak" - "redshift" - "fontmanager" - - "polybar" - - "blueman" - - "nomacs" - - "xdg-utils" - "xdg-dbus-proxy" - "xdg-desktop-portal-gtk" - "xdg-desktop-portal-wlr" - "glib:bin" - "gtk+:bin" - "gnome-keyring" - "shared-mime-info" - "libnotify" - "dconf" - "hicolor-icon-theme" - - "dunst" - - ; "gimp" - ; "inkscape" - - "mpv" - "youtube-dl" - - "pamixer" - "playerctl" - "scrot" - "brightnessctl" - "upower" - "tlp" - "feh" - "alacritty" - - "curl" - "wget" - "zip" - "unzip" - "qrencode" - "trash-cli" - "pandoc" - "password-store" - "oath-toolkit" - ;; "pinentry" - - "syncthing" - "syncthing-gtk" - - "xmodmap" - "xrandr" - "arandr" - "xss-lock" - "libinput" - "xinput" - "xprop" - "rlwrap" - - "nheko" - "quassel" - "inkscape" - "gimp" - "libreoffice" - "steam")))) - -(define (desktop-environment-variables-service config) - `(("GTK_THEME" . "Adwaita:dark") - ("VISUAL" . "emacsclient") - ("EDITOR" . "emacsclient") - ("PATH" . "$HOME/.bin:$HOME/.local/bin:$HOME/.npm-global/bin:$PATH") - ("XDG_DATA_DIRS" . "$XDG_DATA_DIRS:$HOME/.local/share/flatpak/exports/share") - ("SBCL_HOME" . "/run/current-system/profile/lib/sbcl/") - - ;; Set Wayland-specific environment variables (taken from RDE) - ("XDG_CURRENT_DESKTOP" . "sway") - ("XDG_SESSION_TYPE" . "wayland") - ("RTC_USE_PIPEWIRE" . "true") - ("SDL_VIDEODRIVER" . "wayland") - ("MOZ_ENABLE_WAYLAND" . "1") - ("CLUTTER_BACKEND" . "wayland") - ("ELM_ENGINE" . "wayland_egl") - ("ECORE_EVAS_ENGINE" . "wayland-egl") - ("QT_QPA_PLATFORM" . "wayland-egl"))) ;; QT_QPA_PLATFORM=xcb - -(define (desktop-xdg-mime-applications-service config) - (home-xdg-mime-applications-configuration - (default '((inode/directory . emacsclient.desktop) - (application/pdf . emacsclient.desktop) - (x-scheme-handler/http= . firefox.desktop) - (x-scheme-handler/https= . firefox.desktop))) - ;; (desktop-entries - ;; (list (xdg-desktop-entry - ;; (file "emacs-desktop") - ;; (name "Emacs") - ;; (type 'application) - ;; (config - ;; '((exec . "emacsclient -a emacs %u")))))) - )) - -(define (desktop-gpg-agent-service config) - (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))) - -(define (desktop-gpg-agent-service config) - (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))) - -(define (desktop-dotfiles-service config) - (home-dotfiles-configuration - (directories '("./files")))) - -(define-public home-desktop-service-type - (service-type (name 'home-desktop) - (extensions (list (service-extension home-profile-service-type - desktop-profile-service) - (service-extension home-environment-variables-service-type - desktop-environment-variables-service) - (service-extension home-pipewire-service-type - (lambda (_) (home-pipewire-configuration))) - (service-extension home-xdg-mime-applications-service-type - desktop-xdg-mime-applications-service) - (service-extension home-gpg-agent-service-type - desktop-gpg-agent-service) - (service-extension home-dotfiles-service-type - desktop-dotfiles-service))) - (default-value #f) - (description "Runs desktop services."))) - diff --git a/guix/jd/home/services/emacs.scm b/guix/jd/home/services/emacs.scm deleted file mode 100644 index 15f0e68..0000000 --- a/guix/jd/home/services/emacs.scm +++ /dev/null @@ -1,113 +0,0 @@ -(define-module (jd home services emacs) - #:use-module (jd packages emacs) - - #:use-module (gnu packages) - #:use-module (gnu packages emacs) - - #:use-module (gnu services) - #:use-module (gnu services configuration) - #:use-module (gnu home services) - #:use-module (gnu home services shepherd) - #:use-module (gnu home services desktop) - - #:use-module (guix gexp) - #:use-module (guix packages) - #:use-module (guix profiles)) - -(define-configuration home-emacs-service-configuration - (emacs-package - (package emacs-next-pgtk) - "Emacs packages")) - -(define (emacs-profile-service config) - (append (list emacs-org-roam-ui - emacs-lsp-mode! - (home-emacs-service-configuration-emacs-package - config)) - (specifications->packages '("emacs-sway" - "emacs-shackle" - "emacs-ytdl" - "emacs-desktop-environment" - "emacs-exwm" - "emacs-perspective" - "emacs-mu4e-alert" - "mu" - "isync" - "emacs-htmlize" - "emacs-bluetooth" - "emacs-nov-el" - "emacs-password-store" - "emacs-mastodon" - "emacs-elfeed" - "emacs-pdf-tools" - "emacs-emms" - "emacs-all-the-icons-dired" - "emacs-vterm" - "emacs-restclient" - "emacs-magit" - "emacs-neotree" - "emacs-projectile" - "emacs-company-box" - "emacs-company" - "emacs-docker" - "emacs-yaml-mode" - "emacs-web-mode" - "emacs-flycheck" - "emacs-tide" - "emacs-cider" - "emacs-typescript-mode" - "emacs-pyvenv" - "emacs-geiser-guile" - "emacs-racket-mode" - "emacs-geiser-racket" - "emacs-geiser" - "emacs-sly" - "emacs-rainbow-delimiters" - "emacs-paredit" - ;; "emacs-lsp-ivy" - ;; "emacs-lsp-mode" - "emacs-org-caldav" - "emacs-org-pomodoro" - "emacs-org-roam" - "emacs-org-roam-bibtex" - "emacs-org-superstar" - "emacs-org" - "emacs-ox-pandoc" - "emacs-beacon" - "emacs-all-the-icons" - "emacs-which-key" - "emacs-counsel" - "emacs-ivy" - "emacs-hl-todo" - "emacs-diminish" - "emacs-solarized-theme" - "font-terminus" - "emacs-undo-tree" - "emacs-hydra" - "emacs-multiple-cursors" - "emacs-general" - "emacs-guix" - "emacs-doom-modeline" - "emacs-use-package")))) - -(define (emacs-shepherd-services config) - (list (shepherd-service - (documentation "Emacs daemon.") - (provision '(emacs)) - (start #~(make-forkexec-constructor - (list #$(file-append (home-emacs-service-configuration-emacs-package - config) - "/bin/emacs") - "--fg-daemon"))) - (stop #~(make-kill-destructor))))) - -(define-public home-emacs-service-type - (service-type (name 'home-emacs) - (extensions (list (service-extension home-profile-service-type - emacs-profile-service) - (service-extension home-shepherd-service-type - emacs-shepherd-services) - )) - (default-value (home-emacs-service-configuration)) - (description "Runs emacs daemon service."))) - diff --git a/guix/jd/home/services/polkit.scm b/guix/jd/home/services/polkit.scm deleted file mode 100644 index 327ee08..0000000 --- a/guix/jd/home/services/polkit.scm +++ /dev/null @@ -1,31 +0,0 @@ -(define-module (jd home services polkit) - #:use-module (gnu packages) - #:use-module (gnu packages polkit) - #:use-module (gnu services) - #:use-module (gnu services configuration) - #:use-module (gnu home services) - #:use-module (gnu home services shepherd) - #:use-module (guix gexp)) - - -(define (polkit-gnome-profile-service config) - (specifications->packages '("polkit-gnome"))) - -(define (polkit-gnome-shepherd-service config) - (list (shepherd-service - (documentation "Polkit gnome service.") - (provision '(polkit-gnome)) - (start #~(make-forkexec-constructor - (list #$(file-append polkit-gnome - "/libexec/polkit-gnome-authentication-agent-1")))) - (stop #~(make-kill-destructor))))) - -(define-public home-polkit-gnome-service-type - (service-type (name 'home-polkit-gnome) - (extensions (list (service-extension home-profile-service-type - polkit-gnome-profile-service) - (service-extension home-shepherd-service-type - polkit-gnome-shepherd-service))) - (default-value #f) - (description "Runs the PolicyKit-gnome service."))) - diff --git a/guix/jd/packages/emacs.scm b/guix/jd/packages/emacs.scm deleted file mode 100644 index 0b9b19d..0000000 --- a/guix/jd/packages/emacs.scm +++ /dev/null @@ -1,57 +0,0 @@ -(define-module (jd packages emacs) - #:use-module (gnu packages emacs-xyz) - #:use-module (gnu packages) - #:use-module (guix packages) - #:use-module (guix git-download) - #:use-module (guix build-system emacs) - #:use-module ((guix licenses) #:prefix license:) - #:export (emacs-org-roam-ui - emacs-lsp-mode!)) - - -(define emacs-org-roam-ui - (let ((commit "9474a254390b1e42488a1801fed5826b32a8030b") - (revision "0")) - (package - (name "emacs-org-roam-ui") - (version (git-version "0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/org-roam/org-roam-ui") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0v54vxh95izch74wz2dl2dkdqicbvshra55l6qvd4xl5qmfhpjdc")))) - (build-system emacs-build-system) - (arguments - `(#:include (cons "^out" %default-include))) - (propagated-inputs - (list emacs-org-roam emacs-websocket emacs-simple-httpd emacs-f)) - (home-page "https://github.com/org-roam/org-roam-ui") - (synopsis "A graphical frontend for your org-roam Zettelkasten") - (description " Org-Roam-UI is a frontend for exploring and interacting -with your @code{org-roam} notes. It is meant a successor of -@code{org-roam-server} that extends functionality of org-roam with a Web app -that runs side-by-side with Emacs.") - (license license:gpl3+)))) - - - -(define emacs-lsp-mode! - (let ((commit "808c4d0ab9f19bb92c56716cf59df89432b63f5d") - (revision "1")) - (package - (inherit emacs-lsp-mode) - (name "emacs-lsp-mode") - (version (git-version "8.0.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacs-lsp/lsp-mode") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0ridjhzndwjj8947vabq05njgnns74hi69x77axgcbv1c4nasz2y"))))))) diff --git a/guix/jd/packages/fonts.scm b/guix/jd/packages/fonts.scm deleted file mode 100644 index fa70722..0000000 --- a/guix/jd/packages/fonts.scm +++ /dev/null @@ -1,25 +0,0 @@ -(define-module (jd packages fonts) - #:use-module (gnu packages) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system font) - #:use-module ((guix licenses) #:prefix license:)) - -(define-public font-terminus-ttf - (package - (name "font-terminus-ttf") - (version "4.49.3") - (source (origin - (method url-fetch) - (uri (string-append "https://files.ax86.net/terminus-ttf/files/" - version "/terminus-ttf-" version ".zip")) - (sha256 - (base32 - "0xvm4mcf0gx7df35swqwxb7a5h3z0gf6dkg6zy84b6nrk0fr5b8f")))) - (build-system font-build-system) - (home-page "https://files.ax86.net/terminus-ttf/") - (synopsis "Terminus TTF Font") - (description - "Terminus TTF is a TrueType version of Terminus Font, a fixed-width bitmap font optimized for long work with computers.") - (license license:gpl2+))) - diff --git a/guix/jd/packages/linux.scm b/guix/jd/packages/linux.scm deleted file mode 100644 index 94549c3..0000000 --- a/guix/jd/packages/linux.scm +++ /dev/null @@ -1,51 +0,0 @@ -(define-module (jd packages linux) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system linux-module) - #:use-module (guix git-download) - #:use-module (guix gexp) - #:use-module (gnu packages linux) - #:use-module (gnu packages pciutils) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages autotools) - #:use-module ((guix licenses) #:prefix license:)) - -(define-public xmm7360-pci - (package - (name "xmm7360-pci") - (version "0.1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/xmm7360/xmm7360-pci.git") - (commit "a8ff2c6ceee84cbe74df8a78cfaa5a016d362ed4"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1aals95hk76rgd21rknqc9qfjva6g6gwicw6wz19m20bn08bs2f3")))) - (build-system linux-module-build-system) - (arguments - (list - #:tests? #f - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-makefile - (lambda _ - (substitute* (find-files - "." "^Makefile(\\.include)?$") - (("^ccflags-y := .*$") - "ccflags-y := -Wno-multichar -Wno-incompatible-pointer-types"))))))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake))) - (inputs - `(("kernel" ,linux-libre) - ("pciutils" ,pciutils))) - (synopsis "Kernel module for Intel XMM7360 LTE modem") - (description - "This package provides a kernel module for the Intel XMM7360 LTE modem, allowing it to function in Linux.") - (home-page "https://github.com/xmm7360/xmm7360-pci") - (license license:gpl3+))) - diff --git a/guix/jd/services/polkit.scm b/guix/jd/services/polkit.scm deleted file mode 100644 index 948500c..0000000 --- a/guix/jd/services/polkit.scm +++ /dev/null @@ -1,21 +0,0 @@ -(define-module (jd services polkit) - #:use-module (gnu services) - #:use-module (gnu services dbus) - #:use-module (gnu home services) - #:use-module (guix gexp)) - -(define polkit-network-manager - (file-union - "polkit-wheel" - `(("share/polkit-1/rules.d/50-org.freedesktop.NetworkManager.rules" - ,(plain-file - "50-org.freedesktop.NetworkManager.rules" - "polkit.addRule(function(action, subject) { - if (action.id.indexOf(\"org.freedesktop.NetworkManager.\") == 0 && - subject.isInGroup(\"netdev\")) { - return polkit.Result.YES; - } -});"))))) - -(define-public polkit-network-manager-service - (simple-service 'polkit-network-manager polkit-service-type (list polkit-network-manager))) diff --git a/guix/jd/utils.scm b/guix/jd/utils.scm deleted file mode 100644 index 72be6fc..0000000 --- a/guix/jd/utils.scm +++ /dev/null @@ -1,75 +0,0 @@ -(define-module (jd utils) - #:use-module (gnu system) - #:use-module (ice-9 match) - #:export (jd-search-patches - current-operating-system - current-home)) - -(define primitive-host-operating-system - "/etc/config.scm") - -(define-macro (define-combine-operating-systems name fields) - `(define (,name os-to-inherit-from os) - (operating-system - (inherit os-to-inherit-from) - ,@(map (lambda (field) - `(,field - (,(string->symbol - (string-append - "operating-system-" - (symbol->string field))) - os))) - fields)))) - -(define-combine-operating-systems combine-install-dest-informations - (bootloader mapped-devices file-systems)) - -(define (make-reconfigureable-os os) - (combine-install-dest-informations - os - (load primitive-host-operating-system))) - -(define (current-operating-system) - (make-reconfigureable-os - (module-ref - (resolve-module - `(jd desktops ,(string->symbol (gethostname)))) - 'system))) - -(define (current-home) - (module-ref - (resolve-module - `(jd desktops ,(string->symbol (gethostname)))) - 'home)) - -;; This code is copied and modified from (gnu packages) module. - -(define (make-custom-load-path dir-path) - (make-parameter - (map (lambda (directory) - (let ((custom-dir (string-append directory dir-path))) - (if (and (file-exists? custom-dir) - (file-is-directory? custom-dir)) - custom-dir - directory))) - %load-path))) - -(define (make-custom-searcher load-path) - (lambda (file-name) - (or (search-path (load-path) file-name) - (raise (string-append file-name - ": not found"))))) - -(define %jd-patch-path (make-custom-load-path "/jd/packages/patches")) -(define %jd-dot-files-path (make-custom-load-path "/jd/home/services/dotfiles")) - -(define (jd-search-patch file-name) - "Search the patch FILE-NAME. Raise an error if not found." - (or (search-path (%jd-patch-path) file-name) - (raise (string-append file-name - ": patch not found")))) - -(define-syntax-rule (jd-search-patches file-name ...) - "Return the list of absolute file names corresponding to each -FILE-NAME found in %JD-PATCH-PATH." - (list (jd-search-patch file-name) ...)) -- cgit v1.2.3