guix-dotfiles · Ryan's Git Repos

diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm

index e7627d5..1436167 100644

--- a/home-config/home-configuration.scm

+++ b/home-config/home-configuration.scm

@@ -27,123 +27,123 @@

(rosenthal packages binaries)

(ryan-packages mozilla))

-(define my-neovim

- (package

- (inherit neovim)

- (native-inputs

- (modify-inputs (package-native-inputs neovim)

- (prepend gcc-13)))))

+; (define my-neovim

+; (package

+; (inherit neovim)

+; (native-inputs

+; (modify-inputs (package-native-inputs neovim)

+; (prepend gcc-13)))))

-(define %home-symlinks

- `((".config/guix/home-config/fish" ".config/fish")

- (".config/guix/home-config/nix-config" ".config/nix")

- (".config/guix/home-config/nix-combined" ".config/home-manager")))

+ (define %home-symlinks

+; `((".config/guix/home-config/fish" ".config/fish")

+; (".config/guix/home-config/nix-config" ".config/nix")

+ (".config/guix/home-config/nix-combined" ".config/home-manager")))

(home-symlinks %home-symlinks)

(home-environment

;; Below is the list of packages that will show up in your

;; Home profile, under ~/.guix-home/profile.

- (packages (append (specifications->packages (list "bat"

- "fd"

+ ;(packages (append (specifications->packages (list ;"bat"

+ ;"fd"

;"fish"

- "xdg-utils"

+ ;"xdg-utils"

;"abook"

- "libnotify"

- "fzf"

+ ;"libnotify"

+ ;"fzf"

;"waypipe"

- "foot"

- "pulseaudio" ;only for pactl

- "qpwgraph"

- "gnunet"

+ ;"foot"

+ ;"pulseaudio" ;only for pactl

+ ;"qpwgraph"

+ ;"gnunet"

;"ffmpeg" ; removed for mpv prop input

- "qrencode"

- "tmux"

- "binutils"

- "gcc-toolchain"

- "borg"

+ ;"qrencode"

+ ;"tmux"

+ ;"binutils"

+ ;"gcc-toolchain"

+ ;"borg"

;"restic"

- "rsync"

- "cloc"

- "sc-im"

- "pv"

- "jq"

- "gpgme"

- "bombadillo"

- "python-msgpack"

- "wdisplays"

- "kanshi"

- "libreoffice"

- "flatpak"

- "gnupg"

+ ;"rsync"

+ ;"cloc"

+ ;"sc-im"

+ ;"pv"

+ ;"jq"

+ ;"gpgme"

+ ;"bombadillo"

+ ;"python-msgpack"

+ ;"wdisplays"

+ ;"kanshi"

+ ;"libreoffice"

+ ;"flatpak"

+ ;"gnupg"

;"spotifyd"

- "lsof"

- "pavucontrol"

- "netcat"

- "bind:utils"

- "font-cns11643-swjz"

- "font-google-noto-emoji"

- "syncthing"

+ ;"lsof"

+ ;"pavucontrol"

+ ;"netcat"

+ ;"bind:utils"

+ ;"font-cns11643-swjz"

+ ;"font-google-noto-emoji"

+ ;"syncthing"

;"taskwarrior"

;"tasksh"

;"imv" ; Nix pkg now for MESA stuff

- "perl"

- "tor"

- "unzip"

- "htop"

- "curl"

- "pandoc"

- "texlive-bin"

- "texlive-scheme-basic"

- "texlive-txfonts"

- "texlive-amsfonts"

- "texlive-lm"

- "texlive-lm-math"

- "texlive-iftex"

- "texlive-unicode-math"

- "texlive-fontspec"

- "texlive-xcolor"

- "texlive-geometry"

- "texlive-hyperref"

- "texlive-parskip"

- "texlive-etoolbox"

- "texlive-setspace"

- "texlive-booktabs"

- "texlive-mdwtools"

- "texlive-caption"

- "texlive-diagbox"

- "texlive-pict2e"

- "texlive-ulem"

- "texlive-pgf"

- "zathura"

- "zathura-pdf-mupdf"

- "go"

- "fzf"

- "weechat"

- "gimp"

- "python"

- "python:tk"

- "file"

- "python-lsp-server"

+ ;"perl"

+ ;"tor"

+ ;"unzip"

+ ;"htop"

+ ;"curl"

+ ;"pandoc"

+ ;"texlive-bin"

+ ;"texlive-scheme-basic"

+ ;"texlive-txfonts"

+ ;"texlive-amsfonts"

+ ;"texlive-lm"

+ ;"texlive-lm-math"

+ ;"texlive-iftex"

+ ;"texlive-unicode-math"

+ ;"texlive-fontspec"

+ ;"texlive-xcolor"

+ ;"texlive-geometry"

+ ;"texlive-hyperref"

+ ;"texlive-parskip"

+ ;"texlive-etoolbox"

+ ;"texlive-setspace"

+ ;"texlive-booktabs"

+ ;"texlive-mdwtools"

+ ;"texlive-caption"

+ ;"texlive-diagbox"

+ ;"texlive-pict2e"

+ ;"texlive-ulem"

+ ;"texlive-pgf"

+ ;"zathura"

+ ;"zathura-pdf-mupdf"

+ ;"go"

+ ;"fzf"

+ ;"weechat"

+ ;"gimp"

+ ;"python"

+ ;"python:tk"

+ ;"file"

+ ;"python-lsp-server"

;"kdenlive"

- "sqlite"

+ ;"sqlite"

;"mpv" ; Now a nix pkg for MESA stuff

- "qbittorrent"

- "playerctl"

+ ;"qbittorrent"

+ ;"playerctl"

;"aerc"

- "tcpdump"

- "pamixer"

- "git"

- "git:send-email"

- "password-store"

- "node"

- "kanshi"

+ ;"tcpdump"

+ ;"pamixer"

+ ;"git"

+ ;"git:send-email"

+ ;"password-store"

+ ;"node"

+ ;"kanshi"

;"firefox"

- "signal-desktop"

- "sc-im"

- "tree-sitter-cli"

- "git-lfs"))

- (list calcurse-fixed )))

+ ;"signal-desktop"

+ ;"sc-im"

+ ;"tree-sitter-cli"

+ ;"git-lfs"))

+ ;(list calcurse-fixed )))

;; Below is the list of Home services. To search for available

;; services, run 'guix home search KEYWORD' in a terminal.

@@ -158,64 +158,65 @@

"bashrc")))

(bash-profile (list (local-file

"bash_profile")))))

- (service home-xdg-configuration-files-service-type

- `(("nvim/init.vim" ,(local-file "nvim/config/init.vim"))

- ("nvim/after/ftplugin/markdown/custom.vim" ,(local-file "nvim/config/after/ftplugin/markdown/custom.vim"))

- ("nvim/after/ftplugin/mail/custom.vim" ,(local-file "nvim/config/after/ftplugin/mail/custom.vim"))

- ("sway" ,(local-file "sway" #:recursive? #t))

+ ;(service home-xdg-configuration-files-service-type

+ ; Migrated to nix

+ ;`(("nvim/init.vim" ,(local-file "nvim/config/init.vim"))

+ ;("nvim/after/ftplugin/markdown/custom.vim" ,(local-file "nvim/config/after/ftplugin/markdown/custom.vim"))

+ ;("nvim/after/ftplugin/mail/custom.vim" ,(local-file "nvim/config/after/ftplugin/mail/custom.vim"))

+ ;("sway" ,(local-file "sway" #:recursive? #t))

;("hypr" ,(local-file "hypr" #:recursive? #t))

- ("hypr/monitors.conf", (local-file "hypr/monitors.conf"))

- ("hypr/pyprland.toml", (local-file "hypr/pyprland.toml"))

- ("hypr/family_guy.mp4", (local-file "hypr/family_guy.mp4"))

- ("hypr/hyprlock.conf", (local-file "hypr/hyprlock.conf"))

- ("hypr/hypridle.conf", (local-file "hypr/hypridle.conf"))

- ("hypr/kanshi.conf", (local-file "hypr/kanshi.conf"))

- ("hypr/subwaysurfer.webm", (local-file "hypr/subwaysurfer.webm"))

- ("hypr/Wallpapers", (local-file "hypr/Wallpapers" #:recursive? #t))

- ("hypr/scripts", (local-file "hypr/scripts" #:recursive? #t))

- ("wpaperd" ,(local-file "wpaperd" #:recursive? #t))

- ("mpv" ,(local-file "mpv" #:recursive? #t))

- ("foot" ,(local-file "foot" #:recursive? #t))

- ("pulse/client.conf" ,(local-file "pulseaudio/client.conf"))

- ("waybar" ,(local-file "waybar" #:recursive? #t))

- ("alacritty" ,(local-file "alacritty" #:recursive? #t))

- ("aerc" ,(local-file "aerc" #:recursive? #t)) ))

- (service home-files-service-type

- `((".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plugin-manager/plug.vim"))

- (".ssh/config" ,(local-file "ssh/config"))

- (".icons" ,(local-file "icons" #:recursive? #t))

+ ;("hypr/monitors.conf", (local-file "hypr/monitors.conf"))

+ ;("hypr/pyprland.toml", (local-file "hypr/pyprland.toml"))

+ ;("hypr/family_guy.mp4", (local-file "hypr/family_guy.mp4"))

+ ;("hypr/hyprlock.conf", (local-file "hypr/hyprlock.conf"))

+ ;("hypr/hypridle.conf", (local-file "hypr/hypridle.conf"))

+ ;("hypr/kanshi.conf", (local-file "hypr/kanshi.conf"))

+ ;("hypr/subwaysurfer.webm", (local-file "hypr/subwaysurfer.webm"))

+ ;("hypr/Wallpapers", (local-file "hypr/Wallpapers" #:recursive? #t))

+ ;("hypr/scripts", (local-file "hypr/scripts" #:recursive? #t))

+ ;("wpaperd" ,(local-file "wpaperd" #:recursive? #t))

+ ;("mpv" ,(local-file "mpv" #:recursive? #t))

+ ;("foot" ,(local-file "foot" #:recursive? #t))

+ ;("pulse/client.conf" ,(local-file "pulseaudio/client.conf"))

+ ;("waybar" ,(local-file "waybar" #:recursive? #t))

+ ;("alacritty" ,(local-file "alacritty" #:recursive? #t))

+ ;("aerc" ,(local-file "aerc" #:recursive? #t)) ))

+ ;(service home-files-service-type

+ ;l`(;(".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plugin-manager/plug.vim"))

+ ;(".ssh/config" ,(local-file "ssh/config"))

+ ;(".icons" ,(local-file "icons" #:recursive? #t))

;(".mozilla/native-messaging-hosts/gpgmejson.json" ,(local-file "mailvelope/gpgmejson.json"))

- (".local/share/mailvelope" ,(local-file "mailvelope" #:recursive? #t))

- (".mozilla/native-messaging-hosts/tridactyl.json" ,(local-file "tridactyl/tridactyl.json"))

- (".local/share/tridactyl" ,(local-file "tridactyl" #:recursive? #t))

+ ;(".local/share/mailvelope" ,(local-file "mailvelope" #:recursive? #t))

+ ;(".mozilla/native-messaging-hosts/tridactyl.json" ,(local-file "tridactyl/tridactyl.json"))

+ ;(".local/share/tridactyl" ,(local-file "tridactyl" #:recursive? #t))

;(".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol"))

;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf"))

;(".gnupg/gpg.conf" ,(local-file "gnupg/gpg.conf"))

- (".local/share/fonts" ,(local-file "fonts" #:recursive? #t))

- (".gitconfig" ,(local-file "gitconfig"))

- (".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t))

- (".nix-channels" ,(local-file "nix-channels"))))

+ ;(".local/share/fonts" ,(local-file "fonts" #:recursive? #t))

+ ;(".gitconfig" ,(local-file "gitconfig"))

+ ;(".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t))

+ ;(".nix-channels" ,(local-file "nix-channels"))))

(service home-pipewire-service-type)

;(service home-spotifyd-service-type)

; font things for nix to play nice

- (simple-service 'additional-fonts-service

- home-fontconfig-service-type

- (list "~/.nix-profile/share/fonts"

- '(match (@ (target "pattern"))

- (edit (@ (name "family") (mode "prepend"))

- (string "DejaVu Sans")))

- '(alias

- (family "serif")

- (prefer

- (family "DejaVu Serif")))

- '(alias

- (family "sans")

- (prefer

- (family "DejaVu Sans")))

- '(alias

- (family "monospace")

- (prefer

- (family "DejaVu Sans Mono")))))

+ ; (simple-service 'additional-fonts-service

+ ; home-fontconfig-service-type

+ ; (list "~/.nix-profile/share/fonts"

+ ; '(match (@ (target "pattern"))

+ ; (edit (@ (name "family") (mode "prepend"))

+ ; (string "DejaVu Sans")))

+ ; '(alias

+ ; (family "serif")

+ ; (prefer

+ ; (family "DejaVu Serif")))

+ ; '(alias

+ ; (family "sans")

+ ; (prefer

+ ; (family "DejaVu Sans")))

+ ; '(alias

+ ; (family "monospace")

+ ; (prefer

+ ; (family "DejaVu Sans Mono")))))

(service home-dbus-service-type)

(service downloads-garbage-collector-service-type

(downloads-garbage-collector-configuration

@@ -224,8 +225,9 @@

;(template-files "."

;'("spotify-player/app.toml"

;;;

- (service home-gpg-agent-service-type

- (home-gpg-agent-configuration

- (pinentry-program

- (file-append pinentry "/bin/pinentry"))

- (ssh-support? #t))) )))

+ ;(service home-gpg-agent-service-type

+ ; (home-gpg-agent-configuration

+ ; (pinentry-program

+ ; (file-append pinentry "/bin/pinentry"))

+ ; (ssh-support? #t))) )))

+)))

diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm

index c75ab7c..d84744b 100644

--- a/modules/ryan-config/base-system.scm

+++ b/modules/ryan-config/base-system.scm

@@ -118,7 +118,7 @@

(name "ryan")

(comment "Ryan")

(group "users")

- ;(shell (file-append zsh "/bin/zsh"))

+ (shell (file-append zsh "/bin/zsh"))

(home-directory "/home/ryan")

(supplementary-groups '("wheel" "netdev" "audio" "video" "lp" "plugdev" "docker" "libvirt" "kvm" "dialout")))

%base-user-accounts))

@@ -126,27 +126,27 @@

;; Packages installed system-wide. Users can also install packages

;; under their own account: use 'guix search KEYWORD' to search

;; for packages and 'guix install PACKAGE' to install a package.

- (packages (append (map specification->package (list "sway"

+ (packages (append (map specification->package (list ;"sway"

;"hyprland"

- "swaybg"

+ ;"swaybg"

;"swayidle"

;"swaylock-effects"

- "fuzzel"

- "foot"

+ ;"fuzzel"

+ ;"foot"

"linux-pam" ; installed directly to get libs in profile directly

- "pinentry-qt"

+ ;"pinentry-qt"

"adwaita-icon-theme"

"hicolor-icon-theme"

- "git"

- "waybar-experimental"

- "gnupg"

+ ;"git"

+ ;"waybar-experimental"

+ ;"gnupg"

"light"

"avahi"

- "mako"

- "grim"

- "grimblast"

- "slurp"

- "wl-clipboard"

+ ;"mako"

+ ;"grim"

+ ;"grimblast"

+ ;"slurp"

+ ;"wl-clipboard"

;"bluez"

;"blueman"

"ldacbt"

@@ -166,9 +166,9 @@

"wireshark"

;"openconnect"

;"openconnect-sso"

- "webkitgtk-with-libsoup2" ; Needed for Go wails development

+ ;"webkitgtk-with-libsoup2" ; Needed for Go wails development

"zsh"))

- (list my-ca-certs virt-manager-ovmf bluez-ryan netbird-bin neovim-ryan)

+ (list my-ca-certs virt-manager-ovmf bluez-ryan netbird-bin) ;neovim-ryan)

%my-base-packages ))

;; Below is the list of system services. To search for available

@@ -190,9 +190,9 @@

(publish-workstation? #f))) ;; do not advertise, I want this to be as silent as possible

(service docker-service-type)

; Tailscale daemon from rosenthal

- (service tailscale-service-type

- (tailscale-configuration

- (socket "/var/run/tailscale/tailscaled.sock")))

+ ; (service tailscale-service-type

+ ; (tailscale-configuration

+ ; (socket "/var/run/tailscale/tailscaled.sock")))

(service netbird-service-type)

(service containerd-service-type)

(service nix-service-type

@@ -206,32 +206,32 @@

(list

(pam-entry (control "include")

(module "login")))))))

- (simple-service 'ly-pam pam-root-service-type

- (list

- (pam-service

- (name "ly")

- (account

- (list