diff --git a/README.org b/README.org index 990ea4c..ce6a3f5 100644 --- a/README.org +++ b/README.org @@ -8,6 +8,7 @@ This repository contains all of my dotfiles to the many programs I like to use o * Guix I am in the process of moving all of my systems to Guix. I'll keep NixOS as a system for most servers probably but for desktop systems, I think I'll start using Guix since I enjoy lisps a lot. + * NixOS The flake points to the correct machine which starts in the system directory. Then it uses the appropriate modules that the machine needs. diff --git a/guix/base.scm b/guix/base.scm index 10736a5..eaab15a 100644 --- a/guix/base.scm +++ b/guix/base.scm @@ -20,7 +20,7 @@ #:use-module (rosenthal packages wm) #:use-module (nongnu packages linux) #:use-module (nongnu system linux-initrd) - #:export (base-system-packages base-operating-system)) + #:export (base-system-packages base-operating-system base-system-services)) (use-service-modules cups desktop networking ssh xorg avahi admin base nix dbus pm audio virtualization sysctl) diff --git a/guix/home.scm b/guix/home.scm index b433800..9a18a35 100644 --- a/guix/home.scm +++ b/guix/home.scm @@ -132,7 +132,7 @@ "nim" "kio-fuse" "sshfs" - "sshfs-fuse" + ;; "sshfs-fuse" "ifuse" "libimobiledevice" "kio-extras" @@ -309,6 +309,7 @@ "emacs-dired-sidebar" "emacs-dired-du" "emacs-ledger-mode" + "emacs-toml-mode" "emacs-rustic" "emacs-lua-mode" "emacs-fennel-mode" diff --git a/guix/pkgs/dolphin-xyz.scm b/guix/pkgs/dolphin-xyz.scm index 97e3ba0..be5e3cd 100644 --- a/guix/pkgs/dolphin-xyz.scm +++ b/guix/pkgs/dolphin-xyz.scm @@ -1,7 +1,7 @@ (define-module (pkgs dolphin-xyz) #:use-module (gnu packages) #:use-module (gnu packages qt) - #:use-module (gnu packages wayland) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-systemtools) diff --git a/guix/pkgs/emacs-xyz.scm b/guix/pkgs/emacs-xyz.scm index 37a8c7a..f8b3fe5 100644 --- a/guix/pkgs/emacs-xyz.scm +++ b/guix/pkgs/emacs-xyz.scm @@ -63,6 +63,12 @@ marked files in a dired buffer via rsync.")))) emacs-s)) (license license:gpl3+) (home-page "https://github.com/isamert/empv.el.git") - (synopsis "dired-rsync – asynchronous rsync from dired") - (description "\ -This package adds the command empv for playing mpv videos from emacs.")))) + (synopsis "A multimedia player/manager, YouTube interface") + (description "An Emacs media player, based on mpv. More precisely this package provides +somewhat comprehensive interface to mpv with bunch of convenient functionality +like an embedded radio manager, @code{YouTube} interface, local music/video +library manager etc. Lots of interactive functions are at your disposal. To +view the most essential ones, type `M-x describe-keymap empv-map`. It is +advised that you bind this keymap to a key for convenience. Additionally, empv +has versatile customization options. For an overview of all customization +options, do `M-x customize-group empv`.")))) diff --git a/guix/pkgs/eww.scm b/guix/pkgs/eww.scm new file mode 100644 index 0000000..b41a0a6 --- /dev/null +++ b/guix/pkgs/eww.scm @@ -0,0 +1,21 @@ +(define-module (pkgs eww)) + +(define-public eww + (package + (name "eww") + (version "0.0.1-alpha.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "eww" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0j583vh5kn0k1adsh0q8mdscadlsqximd9scs76sg2n7jy4x19bi")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-egui-wgpu" ,rust-egui-wgpu-0.0.1) + ("rust-egui-winit" ,rust-egui-winit-0.0.1)))) + (home-page "https://github.com/LU15W1R7H/eww") + (synopsis "egui backend (winit + wgpu)") + (description "egui backend (winit + wgpu)") + (license license:asl2.0))) diff --git a/guix/syl.scm b/guix/syl.scm index c60aa07..8392223 100644 --- a/guix/syl.scm +++ b/guix/syl.scm @@ -21,9 +21,14 @@ #:use-module (nongnu packages linux) #:use-module (nongnu system linux-initrd)) + (operating-system (inherit base-operating-system) (host-name "syl") + + (services (append (fprintd-service-type) + base-system-services)) + (file-systems (cons* (file-system (mount-point "/boot/efi") (device (uuid "BA76-3723"