From c3b41a4aaba409646f29387c3fb16c137c0dbdcf Mon Sep 17 00:00:00 2001 From: hashirama Date: Wed, 30 Oct 2024 01:17:17 +0000 Subject: [PATCH] Update config.scm --- config.scm | 469 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 266 insertions(+), 203 deletions(-) diff --git a/config.scm b/config.scm index fa4e07a..ad2a1e4 100644 --- a/config.scm +++ b/config.scm @@ -1,4 +1,4 @@ -; This is an operating system configuration generated + ; This is an operating system configuration generated ;; by the graphical installer. ;; ;; Once installation is complete, you can learn and modify @@ -12,10 +12,19 @@ (use-modules (gnu) (guix packages) + (ajatt packages dictionaries) + (ajatt packages suckless) + (ajatt packages readers) + (ajatt packages audio) (rosenthal packages binaries) (rosenthal packages emacs-xyz) + (radix services admin) + (radix packages image-viewers) + (gnu packages disk) (guix transformations) (gnu packages python-xyz) + (gnu packages fonts) + (gnu packages pdf) (gnu packages audio) (gnu packages librewolf) (gnu packages sync) @@ -35,6 +44,7 @@ (rde features bluetooth) (gnu packages gcc) (gnu packages pulseaudio) + (gnu packages mail) (gnu packages enchant) (gnu packages hunspell) (gnu packages upnp) @@ -95,6 +105,7 @@ (guix inferior) (gnu packages networking) (nongnu packages compression) + (nongnu packages messaging) (nongnu packages linux)) @@ -116,6 +127,14 @@ KERNEL==\"xpad\", SUBSYSTEM==\"drivers\", ACTION==\"add\", ATTR{new_id}=\"2dc8 3 +;; general rules for doas +(define general + (list (permit (identity ":wheel") + (setenv + `(("GUILE_LOAD_PATH" . #t) + ("GUILE_LOAD_COMPILED_PATH" . #t)))))) + + (define my-kernel linux-6.1) @@ -133,9 +152,9 @@ KERNEL==\"xpad\", SUBSYSTEM==\"drivers\", ACTION==\"add\", ATTR{new_id}=\"2dc8 3 (locale "en_US.utf8") (kernel-arguments (list "modprobe.blacklist=hid-nintendo" - "noatime" - - )) + "noatime" + + )) (timezone "America/Manaus") (keyboard-layout (keyboard-layout "us")) (host-name "lisp-machine") @@ -156,153 +175,182 @@ KERNEL==\"xpad\", SUBSYSTEM==\"drivers\", ACTION==\"add\", ATTR{new_id}=\"2dc8 3 ;; under their own account: use 'guix search KEYWORD' to search ;; for packages and 'guix install PACKAGE' to install a package. (packages (append (list - my-zfs - ;;emacs-org-roam - ;;emacs-org-roam-ui - ;; ----- - ;;necessary for nyxt - gstreamer - gst-plugins-bad - gst-plugins-good - ;;------ - nyxt - ;;------ - cmus - emacs-ox-hugo - sbcl-coleslaw - numix-gtk-theme - tor - python-psutil - python-schedule - xsel - gerbera - ibus - dconf - gimp - blender - gimp-resynthesizer - wmctrl - imagemagick - zpaq - libwebp - libreoffice - librewolf - ;; audio - ardour - noise-repellent - ;; - ;; nextcloud-client - xprop - fzf - zstd - aria2 - ;; wakatime - wakapi-bin + my-zfs + ;;emacs-org-roam + ;;emacs-org-roam-ui + ;; ----- + ;;necessary for nyxt + gstreamer + gst-plugins-bad + gst-plugins-good + ;;------ + nyxt + ;;------ + cmus + emacs-ox-hugo + emacs-dirvish + qt-creator + sbcl-coleslaw + numix-gtk-theme + tor + python-psutil + python-schedule + xsel + ;; ajatt + suckless-dictpopup + goldendict-ng + foliate + impd + sylpheed + sselp + navidrome-bin + ;; + kitty + element-desktop + lm-sensors + ;;emulators + mupen64plus-ui-console + mupen64plus-input-sdl + mupen64plus-audio-sdl + mupen64plus-core + mupen64plus-video-glide64 + dolphin-emu + ;;-------------------- + gerbera + ibus + ueberzug++ + dconf + gimp + sioyek + nextcloud-client + blender + gimp-resynthesizer + wmctrl + imagemagick + zpaq + libwebp + libreoffice + librewolf + ;; audio + ardour + noise-repellent + ;; + ;; nextcloud-client + xset + xprop + fzf + zstd + aria2 + ;; wakatime + wakapi-bin wakatime-cli-bin - emacs-wakatime-mode - ;; - xrdb - noisetorch - mpv - qtwebengine ;; required by some applications, like anki - ;;emasc-everywhere - xdotool - xprop - xclip - xwininfo - ;; - xdg-user-dirs - xdg-desktop-portal-gtk - xdg-desktop-portal - tmux - polybar - gnupg - sdcv - alacritty - font-dejavu - ;;------ - higan - maim - p7zip - htop - scrot - flameshot - neofetch - pfetch - openjdk - ;;element-desktop - ;; bluetooth - bluez - bluez-alsa - blueman - ;; ime - enchant - hunspell - fcitx5 - fcitx5-gtk - fcitx5-qt - fcitx5-anthy - fcitx5-gtk4 - fcitx5-configtool - ;; - icecat - ffmpeg - nsxiv - pinentry - git - pavucontrol-qt - emacs - emacs-bluetooth - xrandr - qbittorrent - emacs-rainbow-delimiters - emacs-olivetti - emacs-telega - emacs-sly - emacs-ccls - emacs-lsp-mode - emacs-lsp-ui - emacs-rmsbolt - sbcl - emacs-nerd-icons - emacs-esxml - ripgrep - gdb - emacs-olivetti - emacs-deadgrep - emacs-realgud - emacs-rg - emacs-dumb-jump - emacs-circe - zip - thunar - unzip - ;;emacs-nov-el + emacs-wakatime-mode + ;; + xrdb + noisetorch + mpv + ;;emasc-everywhere + xdotool + xprop + xclip + xwininfo + ;; + xdg-user-dirs + xdg-desktop-portal-gtk + xdg-desktop-portal + tmux + pinentry + polybar + gnupg + sdcv + alacritty + font-dejavu + ;;------ + higan + maim + p7zip + htop + scrot + flameshot + neofetch + pfetch + openjdk + ;;element-desktop + ;; bluetooth + bluez + bluez-alsa + blueman + ;; ime + enchant + hunspell + fcitx5 + fcitx5-gtk + fcitx5-qt + fcitx5-anthy + fcitx5-gtk4 + fcitx5-configtool + ;; + icecat + ffmpeg + nsxiv + pinentry + git + pavucontrol-qt + emacs + emacs-bluetooth + xrandr + qbittorrent + emacs-rainbow-delimiters + emacs-olivetti + emacs-haskell-mode + emacs-ligature + emacs-sly + emacs-org-roam + emacs-ccls + emacs-lsp-mode + emacs-lsp-ui + emacs-rmsbolt + font-iosevka-comfy + sbcl + emacs-nerd-icons + emacs-esxml + ripgrep + gdb + emacs-olivetti + emacs-deadgrep + emacs-realgud + emacs-rg + emacs-dumb-jump + emacs-circe + zip + thunar + unzip + ;;emacs-nov-el fontconfig - ;; font-apple-color-emoji - picom - feh - ;; ================ - ;; haskell - cabal-install - ;; deps for xmonad - xmonad - xmobar - ghc ;; ridiculous, gcc and ghc are runtime dependencies , yet people didnt put in the package description - ghc-xmonad-contrib - ;; ================== - gcc - gcc-toolchain - xmessage - xmodmap - rofi - linux-libre-headers - ;;-------- - yt-dlp - ;; nicotine+ - linux-firmware - (specification->package "jami") - ) + ;; font-apple-color-emoji + picom + feh + ;; ================ + ;; haskell + cabal-install + ;; deps for xmonad + xmonad + xmobar + ghc ;; ridiculous, gcc and ghc are runtime dependencies , yet people didnt put in the package description + ghc-xmonad-contrib + ;; ================== + gcc + gcc-toolchain + xmessage + xmodmap + rofi + linux-libre-headers + ;;-------- + yt-dlp + ;; nicotine+ + linux-firmware + (specification->package "jami") + ) %base-packages)) ;;(home-environment (packages (cons* anki ))) ;; figure out how to install it from here @@ -312,47 +360,58 @@ KERNEL==\"xpad\", SUBSYSTEM==\"drivers\", ACTION==\"add\", ATTR{new_id}=\"2dc8 3 (services (append (list (simple-service 'my-zfs-loader - kernel-module-loader-service-type - '("zfs")) - (simple-service 'my-jp-ime-env session-environment-service-type - '(("GTK_IM_MODULE" . "fcitx") - ("QT_IM_MODULE" . "fcitx") - ("GUIX_GTK2_IM_MODULE_FILE" . "/run/current-system/profile/lib/gtk-2.0/2.10.0/immodules-gtk2.cache") - ("GUIX_GTK3_IM_MODULE_FILE" . "/run/current-system/profile/lib/gtk-3.0/3.0.0/immodules-gtk3.cache") - ("XMODIFIERS=@im=" . "fcitx") - ("INPUT_METHOD" . "fcitx") - ("XIM_PROGRAM" . "fcitx") - ("GLFW_IM_MODULE" . "ibus"))) - (service zram-device-service-type - (zram-device-configuration - (size "6G") - (compression-algorithm 'xz) - (priority 100))) - ;; (service oci-forgejo-service-type) - (set-xorg-configuration - (xorg-configuration - - (keyboard-layout keyboard-layout))) - (udev-rules-service '8bitdo %8bitdo-udev-rules) - - (service nix-service-type) + kernel-module-loader-service-type + '("zfs")) + (simple-service 'my-jp-ime-env session-environment-service-type + '(("GTK_IM_MODULE" . "fcitx") + ("QT_IM_MODULE" . "fcitx") + ("GUIX_GTK2_IM_MODULE_FILE" . "/run/current-system/profile/lib/gtk-2.0/2.10.0/immodules-gtk2.cache") + ("GUIX_GTK3_IM_MODULE_FILE" . "/run/current-system/profile/lib/gtk-3.0/3.0.0/immodules-gtk3.cache") + ("XMODIFIERS=@im=" . "fcitx") + ("INPUT_METHOD" . "fcitx") + ("XIM_PROGRAM" . "fcitx") + ("GLFW_IM_MODULE" . "ibus") + ;; this makes qt programs looks sharper + ("QML_DISABLE_DISTANCEFIELD" . "1") + ("QT_QUICK_CONTROLS_STYLE" . "Fusion") + ("QT_ENABLE_HIGHDPI_SCALING" . "0") + ("R600_TEX_ANISO" . "16") + )) + + (service zram-device-service-type + (zram-device-configuration + (size "6G") + (compression-algorithm 'xz) + (priority 100))) + ;; (service oci-forgejo-service-type) + (set-xorg-configuration + (xorg-configuration + + (keyboard-layout keyboard-layout))) + (udev-rules-service '8bitdo %8bitdo-udev-rules) + + (service nix-service-type) - ;; bluetooth - (service bluetooth-service-type - (bluetooth-configuration - (auto-enable? #t))) + ;; bluetooth + (service bluetooth-service-type + (bluetooth-configuration + (auto-enable? #t))) - (simple-service 'blueman dbus-root-service-type (list blueman)) - - #| Compress my mpv screenshots periodically |# - (service mcron-service-type - (mcron-configuration - (jobs (list #~(job "10 15 * * *" - "find /mnt/Data/mpv-screenshots/ -type f \\( -iname '*.png' -o -iname '*.jpg' \\) -exec sh -c 'cwebp -q 80 \"$0\" -o \"${0%.*}.webp\" && rm \"$0\"' {} \\;"))))) - - ) - - %desktop-services) + (simple-service 'blueman dbus-root-service-type (list blueman)) + + (service opendoas-service-type + (opendoas-configuration + (rules (append general)))) + + #| Compress my mpv screenshots periodically |# + (service mcron-service-type + (mcron-configuration + (jobs (list #~(job "10 15 * * *" + "find /mnt/Data/mpv-screenshots/ -type f \\( -iname '*.png' -o -iname '*.jpg' \\) -exec sh -c 'cwebp -q 80 \"$0\" -o \"${0%.*}.webp\" && rm \"$0\"' {} \\;"))))) + + ) + + %desktop-services) ) @@ -362,28 +421,32 @@ KERNEL==\"xpad\", SUBSYSTEM==\"drivers\", ACTION==\"add\", ATTR{new_id}=\"2dc8 3 (keyboard-layout keyboard-layout))) (swap-devices (list (swap-space (target (uuid - "4f829a61-6f51-435b-bade-2991c094080f"))))) + "4f829a61-6f51-435b-bade-2991c094080f"))))) +;; Do not generate a sudoers file +(sudoers-file #f) + + ;; The list of file systems that get "mounted". The unique ;; file system identifiers there ("UUIDs") can be obtained ;; by running 'blkid' in a terminal. (file-systems (cons* (file-system - (mount-point "/boot/efi") - (device (uuid "7C90-0F50" + (mount-point "/boot/efi") + (device (uuid "7C90-0F50" 'fat32)) - (type "vfat")) + (type "vfat")) (file-system - (mount-point "/") - (device (uuid + (mount-point "/") + (device (uuid "ef8ef1c0-99bd-431a-abde-e2fc6421da60" 'ext4)) - (type "ext4")) - ;; (file-system - ;; (mount-point "/mnt/Reading") - ;; (device (uuid - ;; "223baecf-e5f4-453f-90c7-d33edbbae145" - ;; 'ext4)) - ;; (type "ext4")) - + (type "ext4")) + ;; (file-system + ;; (mount-point "/mnt/Reading") + ;; (device (uuid + ;; "223baecf-e5f4-453f-90c7-d33edbbae145" + ;; 'ext4)) + ;; (type "ext4")) + - %base-file-systems))) \ No newline at end of file + %base-file-systems)))