From 1d3021727ecb1fea3b5fb8fd3e04fe07c8176be4 Mon Sep 17 00:00:00 2001 From: berkeley Date: Tue, 26 Nov 2024 01:31:02 +0000 Subject: [PATCH] Upload files to "/" --- config.scm | 375 ++++++++++++++--------------------------------------- 1 file changed, 94 insertions(+), 281 deletions(-) diff --git a/config.scm b/config.scm index 582a067..d92f868 100644 --- a/config.scm +++ b/config.scm @@ -2,12 +2,26 @@ (gnu) (guix store) (guix packages) +(gnu packages i2p) +(ajatt packages dictionaries) +(nongnu packages game-client) +(ajatt packages suckless) +(ajatt packages readers) +(ajatt packages audio) +(gnu packages zig-xyz) (gnu packages databases) +(gnu packages antivirus) (rosenthal packages binaries) (rosenthal packages emacs-xyz) +(gnu packages tor-browsers) +(small-guix packages mullvad) +(radix services admin) +(radix packages xdisorg) +(radix packages tex) +(radix packages image-viewers) +(saayix packages binaries) (guix transformations) (gnu packages audio) -(gnu packages librewolf) (gnu packages sqlite) (gnu packages gdb) (gnu packages graphics) @@ -78,6 +92,7 @@ commencement) (gnu packages web-browsers) (gnu services) (gnu services vpn) +(gnu services herd) (gnu services dbus) (gnu services shepherd) (gnu system shadow) @@ -107,12 +122,10 @@ commencement) (gnu packages gnupg) (gnu packages haskell-apps) (gnu packages imagemagick) -(gnu packages libreoffice) (gnu packages linux) (gnu packages package-management) (gnu packages rsync) (gnu packages ssh) -(gnu packages telegram) (gnu packages video) (gnu packages wm) (gnu packages benchmark) @@ -120,6 +133,8 @@ commencement) (gnu packages xorg) (gnu home services gnupg) (gnu home services xdg) +(gnu home-services wm) +(small-guix services mullvad) (gnu packages lisp) (gnu packages networking) (gnu packages security-token) @@ -129,17 +144,16 @@ commencement) (nongnu packages linux) (nongnu system linux-initrd)) -(use-service-modules web security base certbot shepherd nix cups desktop networking ssh docker xorg linux virtualization) +(use-service-modules web security networking base certbot shepherd nix cups desktop networking ssh docker xorg linux virtualization) (use-package-modules package-management version-control gcc bash certs admin linux) +;; general rules for doas +(define general + (list (permit (identity ":wheel") + (setenv + `(("GUILE_LOAD_PATH" . #t) + ("GUILE_LOAD_COMPILED_PATH" . #t)))))) + (define my-kernel linux) -(define xmonad-0.18.0 - (package - (inherit xmonad) - (version "0.18.0"))) -(define my-packages - (list - xmonad-0.18.0 - )) (operating-system (kernel my-kernel) @@ -194,18 +208,18 @@ commencement) ;; under their own account: use 'guix search KEYWORD' to search ;; for packages and 'guix install PACKAGE' to install a package. (packages (append (list - ;emacs-org-roam - ;emacs-org-roam-ui - postgresql - ;foliate polybar gstreamer gst-plugins-bad gst-plugins-good nyxt - cmus v4l-utils + fnott + ibus + swww + waybar xdg-utils + fuzzel-lowercase wl-clipboard wlrctl wlsunset curl gthumb mangohud @@ -217,7 +231,6 @@ commencement) mpv kitty maim - ;; procps scrot mupdf @@ -227,192 +240,46 @@ commencement) go clisp fdm - ;;jami - ;navidrome-bin - ;mullvad-vpn + mullvad-vpn-desktop smartmontools - ;; udevil samba cifs-utils mergerfs parted net-tools - ntfs-3g - texlive-lua-uni-algos - texlive-csplain - texlive-lua-uni-algos -texlive-pwebmac -texlive-olsak-misc -texlive-pdfoverlay -texlive-texosquery -texlive-pdfx -texlive-pdfprivacy -texlive-pdfcomment -texlive-iftex -texlive-tex -texlive-montex -texlive-pdfescape -texlive-texdef -texlive-pdfpages -extractpdfmark -texlive-csplain -poppler-qt5 -poppler -texlive-pdf14 -texlive-thumbpdf -texlive-pax -texlive-etex -texlive-axodraw2 -texlive-repltext -texlive-luatex -texlive-hyperref -texlive-xetex -texlive-pdftexcmds -texlive-epstopdf -texlive-epsf-dvipdfmx -texlive-dvipdfmx -texlive-texsurgery -texlive-ptex2pdf -texlive-jadetex -texlive-texlogfilter -texlive-svg-inkscape -texlive-purifyeps -texlive-navigator -texlive-latex-uni8 -texlive-biblatex -texlive-latex-make -texlive-pgf -texlive-pdftricks -texlive-pdflatexpicscale -texlive-pdfmanagement-testphase -texlive-pdflatexpicscale -texlive-pdfextra -texlive-tagpdf -texlive-pdfreview -texlive-pdfmsym -texlive-mptopdf -texlive-inter -texlive-pdftex-quiet -texlive-pdftex -texlive-knuth-pdf -texlive-xmltexconfig -texlive-pdfjam -texlive-luatex85 -texlive-grayhints -texlive-fig4latex -texlive-tpic2pdftex -texlive-pst2pdf -texlive-pdfslide -texlive-minim-pdf -texlive-hvextern -texlive-flippdf -texlive-combinedgraphics -texlive-autopdf -texlive-xetex-pstricks -texlive-texonly -texlive-scikgtex -texlive-pdfsync -texlive-mathastext -texlive-luainputenc -texlive-pdfcomment -texlive-pdfprivacy -texlive-pdfoverlay -texlive-pdfpages -texlive-latexmk -texlive-hyperxmp -texlive-datetime2-en-fulltext -texlive-commonunicode -texlive-pict2e -texlive-intopdf -texlive-filemod -texlive-textcsc -texlive-texpower -texlive-texdoc -texlive-pst-pdf -texlive-pdfpc-movie -texlive-pdfmarginpar -texlive-pdfbook2 -texlive-pdf-trans -texlive-lobster2 -texlive-hitex -texlive-epstopdf-pkg -texlive-epspdfconversion -texlive-collection-luatex -texlive-bxpdfver -texlive-asmeconf -texlive-synctex -texlive-pdfcolmk -texlive-pdfcolfoot -texlive-lapdf -texlive-fixpdfmag -python-pdfminer-six -texlive-zhmetrics-uptex -texlive-xpdfopen -texlive-xcpdftips -texlive-quattrocento -texlive-pdfxup -texlive-pdfpc -texlive-pdfarticle -texlive-oswald -texlive-nunito -texlive-magra -texlive-librebaskerville -texlive-l3experimental -texlive-knuth-hint -texlive-forum -texlive-epspdf -texlive-dickimaw -texlive-convbkmk -texlive-changebar -texlive-cascadia-code -texlive-cabin -texlive-bitter -texlive-auto-pst-pdf-lua -texlive-arvo -texlive-archivo -texlive-sanitize-umlaut -texlive-protex -texlive-pdftricks2 -texlive-pdflscape -texlive-ocg-p -texlive-minim-xmp -texlive-gregoriotex -texlive-docshots -texlive-biber -emacs-latex-preview-pane - texlive-pwebmac - texlive-olsak-misc - texlive-pdfoverlay - texlive-texosquery - texlive-pdfx - texlive-pdfprivacy - texlive-pdfcomment - texlive-iftex - texlive-tex - texlive-montex - texlive-pdfescape - texlive-texdef - texlive-pdfpages - texlive-twemoji-colr - texlive-noto-emoji - texlive-hwemoji - texlive-byo-twemojis - unicode-emoji - texlive-twemojis - texlive-emojicite - texlive-emoji - texlive-scheme-basic - texlive-cm-super - texlive-listings + ntfs-3g + youtube-dl + noisetorch + linux-firmware + nix + dmidecode + senpai texmaker + texlive-latexmk + texlive-bibtex + texlive-hyperref + texlive-pdfpages + texlive-biblatex texlive-pgf texlive-beamer - texlive-hyperref + texlive-montex + texlive-pdftex + texlive-iftex + texlive-luatex + texlive-xetex + texlive-epstopdf + texlive-pdfcomment + texlive-luatex85 + texlive-texdoc + texlive-dvipdfmx + texlive-pdfextra + python-pdfminer-six + texmaker + emacs-latex-preview-pane alacritty libxfont libxft - ;;protonup-ng wipe imagemagick unzip @@ -420,12 +287,10 @@ emacs-latex-preview-pane p7zip gedit htop + btop openjdk - ;;element-desktop - ;; bluetooth bluez blueman - ;; ime fcitx5 fcitx5-gtk fcitx5-qt @@ -435,29 +300,24 @@ emacs-latex-preview-pane netdiscover fping gparted - texstudio - texlive-bibtex bcachefs-tools whois python-pip setxkbmap xfe - ;;clamav + clamav libbluray libaacs libbdplus vim neovim - ;emacs-telega cmake neofetch kleopatra flatpak - fuse pfetch icecat qutebrowser - ;;mullvadbrowser nftables git-lfs ghc-git-lfs @@ -468,7 +328,6 @@ emacs-latex-preview-pane openshot obs go - ;ffmpeg-vvdec lm-sensors vlc virt-manager @@ -476,16 +335,10 @@ emacs-latex-preview-pane nsxiv git inxi - tor monero-gui - ; emacs-org-roam - torsocks - tor-client privoxy - terminator openvpn kiwix-tools - librewolf pavucontrol pavucontrol-qt emacs @@ -494,7 +347,8 @@ emacs-latex-preview-pane tcpdump nmap firejail - xf86-video-amdgpu + radeontop + xf86-video-amdgpu asciinema alsa-lib alsa-utils @@ -515,17 +369,10 @@ emacs-latex-preview-pane xf86-input-libinput xf86-input-mouse xf86-input-synaptics - ;;emacs-org-timeblock xrandr - ungoogled-chromium qbittorrent macchanger - ;ghc-ncurses guile-ncurses - ;ncurses - ;guile - ;emacs-geiser - ;emacs-geiser-guile fontconfig picom mpd @@ -550,7 +397,6 @@ emacs-latex-preview-pane nomacs meson ncurses - ;;ueberzug++ ;; lots of fonts from package fonts.scm font-adobe-source-code-pro font-adobe-source-han-sans font-adobe-source-sans-pro font-adobe-source-serif-pro @@ -576,10 +422,8 @@ emacs-latex-preview-pane ranger xmessage xrdb - xmonad sysbench xmobar - ghc ghc-xmonad-contrib gcc gcc-toolchain @@ -588,71 +432,61 @@ emacs-latex-preview-pane rofi emacs-emojify unicode-emoji - ;;rust-unic-emoji-char r-emojifont font-google-noto-emoji - ;; font-apple-color-emoji emacs-company-emoji font-openmoji vim-characterize -extractpdfmark -poppler-qt5 -poppler -python-pdfminer-six -lz4 -zstd + poppler-qt5 + poppler + lz4 + zstd rust blueman bluez bluez-alsa - ;goldendict-ng - ;suckless-dictpopup - ;;rust-version-check - ;;rust-deunicode nheko lf - fuse ;; lots of fonts from package xorg.scm font-adobe100dpi font-adobe75dpi font-cronyx-cyrillic font-dec-misc font-isas-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 - youtube-dl - noisetorch - linux-firmware - nix - dmidecode + (specification->package "xmonad") (specification->package "i3-wm") (specification->package "dmidecode") (specification->package "i3status") (specification->package "dmenu") - (specification->package "st") + (specification->package "kitty") + (specification->package "mullvad-vpn-desktop") + (specification->package "tor") (specification->package "emacs") (specification->package "jami") (specification->package "steam") + (specification->package "protonup-ng") (specification->package "texstudio") - (specification->package "libreoffice") (specification->package "qemu") - (specification->package "telegram-desktop") (specification->package "alacritty") (specification->package "xkill") - (specification->package "guile") + (specification->package "guile") (specification->package "ueberzug++") (specification->package "fcitx5-gtk4") (specification->package "fcitx5-qt") (specification->package "fcitx5-gtk") (specification->package "torbrowser") + (specification->package "i2pd") + (specification->package "tor") (specification->package "unrar") (specification->package "nicotine+") (specification->package "icecat") - (specification->package "qutebrowser") + (specification->package "qutebrowser") (specification->package "gimp") (specification->package "tor-client") (specification->package "make") (specification->package "element-desktop") (specification->package "font-apple-color-emoji") - (specification->package "xmonad") + (specification->package "zen-browser-bin-generic") (specification->package "xmobar") (specification->package "xmodmap") (specification->package "rofi") @@ -660,6 +494,7 @@ zstd (specification->package "bluez") (specification->package "fuse") (specification->package "blueman") + (specification->package "cmus") (specification->package "navidrome-bin")) %base-packages)) @@ -678,57 +513,35 @@ zstd (bluetooth-configuration (auto-enable? #t))) (udev-rules-service 'fido2 libfido2 #:groups '("plugdev")) - -(service iptables-service-type - (iptables-configuration - (ipv4-rules (plain-file "iptables.rules" "*filter -:INPUT DROP -:FORWARD DROP -:OUTPUT ACCEPT --A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT --A INPUT -p tcp -s 127.0.0.1 -j ACCEPT --A INPUT -p tcp --dport 631 -j REJECT --reject-with icmp-port-unreachable --A INPUT -p udp --dport 631 -j REJECT --reject-with icmp-port-unreachable --A INPUT -j REJECT --reject-with icmp-port-unreachable --A FORWARD -m state --state INVALID -j DROP --A OUTPUT -o lo -j ACCEPT --A OUTPUT -o tun+ -j ACCEPT --A OUTPUT -m owner --gid-owner openvpn -j ACCEPT --A OUTPUT -m state --state INVALID -j DROP --t nat -A OUTPUT -p tcp -m owner --uid-owner berkeley -m tcp -j REDIRECT --to-ports 9040 --t nat -A OUTPUT -p udp -m owner --uid-owner berkeley -m udp --dport 53 -j REDIRECT --to-ports 53 --t filter -A OUTPUT -p tcp -m owner --uid-owner berkeley -m tcp --dport 9040 -j ACCEPT --t filter -A OUTPUT -p udp -m owner --uid-owner berkeley -m udp --dport 53 -j ACCEPT --t filter -A OUTPUT -m owner --uid-owner berkeley -j DROP -COMMIT -")))) - + (service nftables-service-type) (simple-service 'blueman dbus-root-service-type (list blueman)) (simple-service 'my-jp-ime-env session-environment-service-type - '(("GTK_IM_MODULE" . "fcitx") + '(("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"))) + ("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 mullvad-daemon-service-type) (service docker-service-type) (service containerd-service-type) (service nix-service-type) (service tor-service-type (tor-configuration - (config-file (plain-file "torrc" - "HttpTunnelPort 9050\n\ - VirtualAddrNetwork 10.192.0.0/10\n\ - AutomapHostsOnResolve 1\n\ - TransPort 9040\n\ - DNSPort 53\n\ - SOCKSPort 0\n\ - ORPort 443\n\ - BridgeRelay 1\n\ - ExitRelay 0")))) + (config-file (plain-file "tor.conf" " + Log stdout + DataDirectory /var/lib/tor + SOCKSPort 9050 + ControlPort 9051")))) (service libvirt-service-type (libvirt-configuration (unix-sock-group "libvirt") @@ -762,7 +575,7 @@ COMMIT (targets (list "/dev/nvme0n1")) (theme (grub-theme (resolution '(1920 . 1080)) - (image (local-file "/var/cache/wallpaper.png")))))) + (image (local-file "/home/berkeley/grub.png")))))) (swap-devices (list (swap-space (priority 50) (target (uuid @@ -788,7 +601,7 @@ COMMIT (type "ext4")) (file-system - (mount-point "/var/cache") + (mount-point "/steam/") (device (uuid "9d009d01-d635-4d56-987a-ffc2699da9fb" 'ext4)) (type "ext4"))