diff options
Diffstat (limited to 'guix/config-desktop.scm')
| -rw-r--r-- | guix/config-desktop.scm | 95 |
1 files changed, 67 insertions, 28 deletions
diff --git a/guix/config-desktop.scm b/guix/config-desktop.scm index c731650..010490f 100644 --- a/guix/config-desktop.scm +++ b/guix/config-desktop.scm @@ -6,7 +6,7 @@ (nongnu system linux-initrd) (gnu home services shells)) -(use-service-modules guix cups desktop networking ssh xorg docker nix admin vnc lightdm syncthing virtualization databases linux) +(use-service-modules guix cups desktop networking ssh xorg docker nix admin vnc lightdm syncthing virtualization databases linux web backup telephony file-sharing) (use-package-modules gnome xdisorg vnc databases) (load "/home/w96k/projects/dotfiles/guix/.dotfiles/home-configuration.scm") @@ -20,6 +20,7 @@ (locale "en_US.utf8") (timezone "Asia/Tbilisi") (kernel linux) + (kernel-arguments '("video=HDMI-A-1:1920x1080@240")) (initrd microcode-initrd) (firmware (list linux-firmware)) (keyboard-layout (keyboard-layout "us,ru" @@ -32,7 +33,7 @@ (comment "W96K") (group "users") (home-directory "/home/w96k") - (supplementary-groups '("wheel" "netdev" "audio" "video" "docker"))) + (supplementary-groups '("wheel" "netdev" "audio" "video" "kvm"))) %base-user-accounts)) ;; (packages %base-packages) @@ -41,7 +42,7 @@ (map specification->package '( - + "font-gnu-freefont" "font-gnu-unifont" )) %base-packages)) @@ -49,7 +50,7 @@ ;; services, run 'guix system search KEYWORD' in a terminal. (services (append (list - (service guix-home-service-type `(("w96k" ,wkz-home) ("wkz" ,wkz-home))) + (service guix-home-service-type `(("w96k" ,wkz-home))) (service block-facebook-hosts-service-type) (service zram-device-service-type @@ -57,10 +58,18 @@ (compression-algorithm 'zlib) (priority 100))) - (service tor-service-type) + (service tor-service-type + (tor-configuration + (config-file (plain-file "tor-config" + "HTTPTunnelPort 127.0.0.1:9250")))) (service openssh-service-type) - (service containerd-service-type) - (service docker-service-type) + + (service transmission-daemon-service-type) + + ;; (service containerd-service-type) + ;; (service docker-service-type) + ;; (service restic-backup-service-type) + ;; (service hurd-vm-service-type ;; (hurd-vm-configuration ;; (disk-size (* 5000 (expt 2 20))) ;5G @@ -73,39 +82,55 @@ ;; (localhost? #f) ;; (geometry "1280x800"))) - (service syncthing-service-type - (syncthing-configuration - (user "w96k"))) - - (service postgresql-service-type - (postgresql-configuration - (postgresql postgresql-15))) - - (service connman-service-type) + ;; (service syncthing-service-type + ;; (syncthing-configuration + ;; (user "w96k"))) + + ;; (service postgresql-service-type + ;; (postgresql-configuration + ;; (postgresql postgresql-15))) + + (service dhcp-client-service-type) + + (service httpd-service-type + (httpd-configuration + (config + (httpd-config-file + (modules (cons* + (httpd-module + (name "proxy_module") + (file "modules/mod_proxy.so")) + (httpd-module + (name "proxy_fcgi_module") + (file "modules/mod_proxy_fcgi.so")) + %default-httpd-modules)) + (extra-config (list "\ +<FilesMatch \\.php$> + SetHandler \"proxy:unix:/var/run/php-fpm.sock|fcgi://localhost/\" +</FilesMatch>")))))) + (service php-fpm-service-type + (php-fpm-configuration + (socket "/var/run/php-fpm.sock") + (socket-group "httpd"))) ;; (service screen-locker-service-type ;; (screen-locker-configuration ;; (name "xlock") ;; (program (file-append xlockmore "/bin/xlock")))) - - ;; (service slim-service-type - ;; (slim-configuration - ;; (default-user "w96k") - ;; (xorg-configuration - ;; (xorg-configuration - ;; (keyboard-layout keyboard-layout))))) ) (modify-services %desktop-services (delete screen-locker-service-type) (delete modem-manager-service-type) - (delete udisks-service-type) + ;; (delete udisks-service-type) (delete upower-service-type) (delete network-manager-service-type) - (delete usb-modeswitch-service-type) + (delete wpa-supplicant-service-type) + ;; (delete usb-modeswitch-service-type) (delete geoclue-service-type) ;;(delete elogind-service-type) (delete colord-service-type) + (delete ntp-service-type) (guix-service-type config => (guix-configuration @@ -114,8 +139,10 @@ (log-compression 'none) (extra-options '("--max-jobs=10")) (substitute-urls - (append (list "https://substitutes.nonguix.org") - %default-substitute-urls)) + (list + "https://4zwzi66wwdaalbhgnix55ea3ab4pvvw66ll2ow53kjub6se4q2bclcyd.onion" + "https://substitutes.nonguix.org")) + (http-proxy "http://localhost:9250") (authorized-keys (append (list (plain-file "non-guix.pub" " @@ -143,7 +170,19 @@ (mount-point "/") (device "/dev/mapper/cryptroot") (type "btrfs") - (options "compress=zlib:6,autodefrag") + (options "compress=zlib:9,autodefrag") + (dependencies mapped-devices)) + (file-system + (mount-point "/home/w96k/") + (device "/dev/mapper/cryptroot") + (type "btrfs") + (options "compress=zlib:7,autodefrag,subvol=/home/w96k/") + (dependencies mapped-devices)) + (file-system + (mount-point "/home/w96k/Snapshots/") + (device "/dev/mapper/cryptroot") + (type "btrfs") + (options "compress=zlib:9,autodefrag,subvol=/home/w96k/Snapshots") (dependencies mapped-devices)) (file-system (mount-point "/boot/efi") |