kylekrein/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Flatpak, ente photos, dns/net utils

Browse source
This commit is contained in:
Aleksandr Lebedev 2025-12-07 15:26:32 +01:00
parent de6f08c1c0
commit 7ea90427b0
4 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
guix-config/channels-lock.scm
View file

@ -3,7 +3,7 @@
(url "https://git.guix.gnu.org/guix.git") (url "https://git.guix.gnu.org/guix.git")
(branch "master") (branch "master")
(commit (commit
"a43b3549010ea2a9475fbaa94c4d407249e71339") "7c7bad305a66da1e83299ce7fa2e96c803667d0a")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad" "9edb3f66fd807b096b48283debdcddccfea34bad"

31
guix-config/home/services/flatpak.scm
View file

@ -1,6 +1,7 @@
(define-module (guix-config home services flatpak) (define-module (guix-config home services flatpak)
#:use-module (gnu home services) #:use-module (gnu home services)
#:use-module (gnu home services utils) #:use-module (gnu home services utils)
#:use-module (gnu home services shells)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu packages package-management) #:use-module (gnu packages package-management)
#:use-module (guix gexp) #:use-module (guix gexp)
@ -43,29 +44,13 @@
(run (string-append "flatpak install -y --user " app))) (run (string-append "flatpak install -y --user " app)))
'#$(home-flatpak-configuration-apps config)))) '#$(home-flatpak-configuration-apps config))))
(define (home-flatpak-service config) (define (home-flatpak-env config)
(list (home-bash-extension
;; 1. Ensure flatpak installed (bashrc
(simple-service (list
'flatpak-packages (file-append (home-flatpak-configuration-flatpak-package config)
home-profile-service-type "/etc/profile.d/flatpak.sh")))))
(list (home-flatpak-configuration-flatpak-package config)))
;; 2. Add flatpak apps to XDG_DATA_DIRS
;; https://forum.systemcrafters.net/t/gnome-software-center-flatpak-support/1702/3
(simple-service
'flatpak-env
home-shell-profile-service-type
(list (local-file
(string-append (getenv "HOME") "/.guix-profile/etc/profile.d/flatpak.sh")
"flatpak.sh")))
;; 3. Activation phase
(simple-service
'flatpak-activation
home-activation-service-type
(home-flatpak-activation config))))
(define home-flatpak-service-type (define home-flatpak-service-type
(service-type (service-type
@ -73,6 +58,8 @@
(extensions (extensions
(list (service-extension home-profile-service-type (list (service-extension home-profile-service-type
(compose list home-flatpak-configuration-flatpak-package)) (compose list home-flatpak-configuration-flatpak-package))
(service-extension home-bash-service-type
home-flatpak-env)
(service-extension home-activation-service-type (service-extension home-activation-service-type
home-flatpak-activation))) home-flatpak-activation)))
(default-value (home-flatpak-configuration)) (default-value (home-flatpak-configuration))

12
guix-config/home/workstation.scm
View file

@ -30,6 +30,7 @@
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages monitoring) #:use-module (gnu packages monitoring)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages texlive)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (gnu home services shells) #:use-module (gnu home services shells)
@ -47,6 +48,7 @@
#:use-module (gnu packages gimp) #:use-module (gnu packages gimp)
#:use-module (gnu packages inkscape) #:use-module (gnu packages inkscape)
#:use-module (gnu packages wm) #:use-module (gnu packages wm)
#:use-module (gnu packages dns)
) )
(define tune (define tune
@ -56,6 +58,8 @@
;; Below is the list of packages that will show up in your ;; Below is the list of packages that will show up in your
;; Home profile, under ~/.guix-home/profile. ;; Home profile, under ~/.guix-home/profile.
(packages (list git (packages (list git
texlive
libnotify
kitty kitty
btop btop
fastfetch fastfetch
@ -80,6 +84,8 @@
nautilus nautilus
dankmaterialshell dankmaterialshell
secretsd secretsd
`(,isc-bind "utils") ;; dig for dns
inetutils
xournalpp)) xournalpp))
;; Below is the list of Home services. To search for available ;; Below is the list of Home services. To search for available
@ -116,9 +122,9 @@
(home-dotfiles-configuration (home-dotfiles-configuration
(directories '("../../files")))) (directories '("../../files"))))
;(service home-secretsd-service-type) ;(service home-secretsd-service-type)
;(service home-flatpak-service-type (service home-flatpak-service-type
; (home-flatpak-configuration (home-flatpak-configuration
; (apps '("in.cinny.Cinny")))) (apps '("io.ente.photos"))))
(service home-emacs-service-type (service home-emacs-service-type
(home-emacs-configuration (home-emacs-configuration
(emacs (tune guixmacs)) (emacs (tune guixmacs))

9
guix-config/system/anaconda.scm
View file

@ -1,10 +1,19 @@
(define-module (guix-config system anaconda) (define-module (guix-config system anaconda)
#:use-module (gnu) #:use-module (gnu)
#:use-module (guix transformations)
#:use-module (guix packages)
#:use-module (gnu packages linux)
#:use-module (guix-config system base-system)) #:use-module (guix-config system base-system))
(define tune
(options->transformation '((tune . "alderlake"))))
(operating-system (operating-system
(inherit base-system) (inherit base-system)
(host-name "anaconda") (host-name "anaconda")
(kernel (tune (package
(inherit linux-libre)
(properties '((tunable? . #t))))))
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-efi-bootloader) (bootloader grub-efi-bootloader)
(targets (list "/boot/efi")) (targets (list "/boot/efi"))