Compare

-# Migrating guix-dotfiles onto nix-combined

-

-This repo supersedes `guix-dotfiles/home-config/nix-home-manager` (the ad-hoc

-home-manager flake guix-dotfiles was already using) and pulls Linux desktop

-config that used to live in `guix-dotfiles/home-config/home-configuration.scm`

-into home-manager proper. It does **not** replace Guix itself: package

-management, the system config, and three specific home services stay in

-Guix (see "Stays in Guix" below).

-

-`nix-combined` is deliberately its own repo (own history, own remote) so

-that darwin machines never need to clone anything guix-related. It's wired

-into `guix-dotfiles` as a **git submodule** at

-`guix-dotfiles/home-config/nix-combined` - the rest of this section covers

-that wiring; everything after "Stays in Guix" is still a plan for you to

-apply by hand.

-

-## 1. Submodule wiring (already done in this working tree)

-

-Already applied, not yet committed/pushed - review with `git status`/`git

-diff` in `guix-dotfiles` before committing:

-

-- `guix-dotfiles/.gitmodules` added, pointing `home-config/nix-combined` at

- **the local filesystem path** to this checkout of `nix-combined`. That

- only works on this machine. **Before pushing**, create the real remote

- (recommend `https://git.rschanz.org/nix-combined`, matching the

- `nix-dotfiles`/`guix-dotfiles` naming convention) and push `nix-combined`

- there, then run, from `guix-dotfiles`:

- ```

- git submodule set-url home-config/nix-combined https://git.rschanz.org/nix-combined

- git add .gitmodules

- git commit

- ```

-- `home-configuration.scm`'s `%home-symlinks` now points

- `.config/guix/home-config/nix-combined` at `.config/home-manager`

- (previously `.config/guix/home-config/nix-home-manager`).

-- `deploy.sh`'s fresh-install clone now uses `git clone --recurse-submodules`

- so a from-scratch deploy pulls `nix-combined` in the same step.

-

-**On existing machines**, after pulling this change:

-```

-git submodule update --init --recursive

-```

-(or `git clone --recurse-submodules` next time you clone `guix-dotfiles`

-fresh). Then switch with `home-manager switch --flake ~/.config/home-manager#ryan`

-(the `rebuild` zsh alias does this on Linux).

-

-**Updating `nix-combined` later**: since the submodule pins an exact commit,

-pulling new `nix-combined` changes needs a bump in `guix-dotfiles`:

-```

-cd home-config/nix-combined && git pull origin main && cd -

-git add home-config/nix-combined

-git commit -m "bump nix-combined"

-```

-

-The old `guix-dotfiles/home-config/nix-home-manager` directory (the

-pre-submodule ad-hoc flake) can be deleted once you've confirmed the new

-one builds and switches cleanly.

-

-**Leave the `nix-config` symlink entry alone for the first switch.** It's

-what sets `experimental-features = nix-command flakes` for your user today,

-which is what lets `home-manager`/`nix` read this flake at all -

-home-manager can't bootstrap its own prerequisite. `linux.nix` now writes

-its own `~/.config/nix/nix.conf` and `~/.config/nix/registry.json` via

-`xdg.configFile`, so *after* the first successful switch, remove the

-`nix-config` entry from `%home-symlinks` too - otherwise HM's files resolve

-through that symlink and land as untracked files inside the guix-dotfiles

-checkout instead of in the Nix store.

-

-## 2. Remove entries `home-configuration.scm` now duplicates

-

-Once nix-combined delivers a path, Guix must stop also writing it, or

-activation will collide (two things trying to own the same symlink target).

-In `home-configuration.scm`'s `home-xdg-configuration-files-service-type` and

-`home-files-service-type`, remove these lines (nix-combined now owns them):

-

-- `"nvim/init.vim"`, `"nvim/after/ftplugin/markdown/custom.vim"`,

- `"nvim/after/ftplugin/mail/custom.vim"` - nix-combined's neovim config

- (lazy.nvim-based, in `users/ryan/modules/nvim`) is the canonical one now;

- the old vim-plug based `nvim/config/init.vim` + `plug.vim` is superseded.

-- `"hypr/monitors.conf"`, `"hypr/pyprland.toml"`, `"hypr/family_guy.mp4"`,

- `"hypr/hyprlock.conf"`, `"hypr/hypridle.conf"`, `"hypr/kanshi.conf"`,

- `"hypr/subwaysurfer.webm"`, `"hypr/scripts"` (the `hyprland.conf` itself

- was already coming from the old nix-home-manager flake, unchanged in

- spirit here - just re-homed)

-- `"wpaperd"`, `"mpv"`, `"foot"`, `"waybar"`, `"alacritty"`, `"aerc"`

-- `"pulse/client.conf"`

-- `.local/share/nvim/site/autoload/plug.vim` (dead once nvim is lazy.nvim-based)

-- `.local/share/mailvelope`, `.mozilla/native-messaging-hosts/tridactyl.json`,

- `.local/share/tridactyl`

-- **`.icons`** (from `home-files-service-type`) - this one isn't optional

- cleanup, it's a hard prerequisite. Guix delivers `.icons` today as a

- single recursive `local-file` symlink, but `linux.nix`'s

- `home.pointerCursor` (with `x11.enable = true`) needs to write

- `~/.icons/default/index.theme` itself. With the old symlink still in

- place, HM can't create a file inside a symlinked-to-store directory and

- activation fails outright. Remove this entry before your first

- `home-manager switch`.

-- `.gitconfig` (nix-combined's `programs.git` now owns this, with the

- `filter.lfs` and `[sendemail]` sections merged in - they existed in

- guix-dotfiles' `.gitconfig` but were missing from the old nix-dotfiles config)

-- `.ssh/config` (same story - nix-combined's `programs.ssh.settings` is a

- strict superset: added the `linode` host, the `192.168.216.1`

- legacy-algorithm host, the `KexAlgorithms` exclusion on `Host *`, and the

- `Match host * exec "gpg-connect-agent ..."` line)

-- `.docker/cli-plugins` (docker-compose plugin - if you still want this,

- it's cheap to add to `users/ryan/linux.nix`'s `home.file`; it wasn't

- carried over because nothing else referenced it and I didn't want to

- guess at whether you still use it)

-

-`hypr/Wallpapers` and the sway config were left alone deliberately - you said

-you'd handle wallpapers yourself, and `sway` isn't referenced by anything

-active (Hyprland is the real WM; see "Dead/unused" below).

-

-## 3. Switch the login shell to zsh

-

-`guix-dotfiles/modules/ryan-config/base-system.scm`'s `base-operating-system`

-has:

-

-```scheme

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

-```

-

-commented out, so your account's login shell is still bash even though the

-canonical config (nix-dotfiles, and now nix-combined) is zsh. Uncomment that

-line (and rebuild/reconfigure the system) so `programs.zsh` in

-`users/ryan/common.nix` is actually what runs on login. Until you do, bash

-still runs (Guix's `home-bash-service-type` config, if still present, keeps

-working - just don't remove it from `home-configuration.scm` until the shell

-is actually switched, or you'll drop to a shell with no rc file at all).

-

-## Stays in Guix - no home-manager equivalent without systemd

-

-Home-manager's `services.*` modules assume a systemd user session to

-autostart things (or launchd on macOS). Guix uses shepherd instead, and

-home-manager has no shepherd backend. These three keep running exactly as

-they do today, defined in `guix-dotfiles/modules/ryan-services/`:

-

-- **`home-pipewire-service-type`** (pipewire + wireplumber daemons)

-- **`home-dbus-service-type`** (per-user session dbus, since Guix has no

- systemd --user to provide one)

-- **`downloads-garbage-collector-service-type`** (the weekly Downloads

- cleanup shepherd timer)

-

-`home-gpg-agent-service-type` is the one service that *did* migrate cleanly:

-gpg-agent doesn't need a supervisor. It's socket-activated the same way on

-both platforms via the zsh init in `common.nix`

-(`gpgconf --launch gpg-agent` + exporting `SSH_AUTH_SOCK`), which is exactly

-what nix-dotfiles' darwin config already did. `linux.nix` points

-`services.gpg-agent.pinentry.package` at nixpkgs' `pinentry-qt` rather than

-Guix's system profile path, so it isn't cross-dependent on Guix.

-

-`home-spotifyd-service-type` is already commented out/disabled in

-`home-configuration.scm` - nothing to do there.

-

-## Dead/unused - candidates to delete from guix-dotfiles

-

-Found while comparing the two repos; none of these are referenced by

-anything active, so nothing carried them into nix-combined:

-

-- **fish** (`home-config/fish/`) - the `fish` package is commented out of

- `home-configuration.scm`'s package list, but the dotfiles are still

- checked in. Orphaned.

-- **`.nix-channels`** - classic (non-flake) nix-channel file. Now that

- everything is flake-based, this shouldn't be needed.

-- **`icons/XCursor-Pro-Dark*`** - not referenced anywhere; only

- `Bibata-Modern-*` appears in `hypr/hyprland.conf`.

-- **`fonts/Fira Code`, `fonts/Lilex`, `fonts/Monofur For Powerline`,

- `fonts/AnonymicePro`, `fonts/MonofurNerdFont`** - superseded by

- `nerd-fonts.{fira-code,lilex,anonymice,monofur}` from nixpkgs

- (`linux.nix`'s `home.packages`), which ship the same font families.

-- **`home-spotifyd-service-type`** usage - already disabled.

-- **`alacritty`** - config exists in both repos, but no package installs the

- `alacritty` binary in either the guix or the old nix-home-manager config.

- `foot` is what's actually wired into the system (Guix package list,

- kmscon login). I added `pkgs.alacritty` to `linux.nix` so the config isn't

- dead weight, but confirm whether you still use it - if not, drop both the

- package and `users/ryan/linux/alacritty/`.

-- **`sway` config** - not referenced by anything; Hyprland (via

- home-manager) is the actual compositor in use.

-

-## Additive merges (things nix-dotfiles was missing, now fixed)

-

-- **aerc**: `signature_personal`, `signature_rit_personal`,

- `templates/quoted_reply`, `templates/thanks` existed only in

- guix-dotfiles' aerc config, even though `accounts.conf`/`aerc.conf`

- already referenced them by path. Copied into `users/ryan/aerc/`.

-- **git**: `filter.lfs` and `[sendemail]` sections, merged into

- `common.nix`'s `programs.git.settings`.

-- **ssh**: `linode`, `192.168.216.1` (legacy host key/pubkey algorithms),

- the `KexAlgorithms` exclusion, and the `Match host * exec ...` line,

- merged into `common.nix`'s `programs.ssh`.

-

-## Linux desktop stack re-pin (see also the flake-version conversation)

-

-The old `guix-dotfiles/home-config/nix-home-manager/flake.nix` pinned

-home-manager to a 2024 commit specifically so it'd match separately-pinned

-`hyprland`/`hyprlock`/`hyprpicker`/`wpaperd` flake inputs (plus a

-`ryan77627/nixGL` fork and a `rust-overlay` pin for wpaperd). Sharing

-`common.nix` with the darwin config (which tracks home-manager master)

-required moving Linux onto the same nixpkgs/home-manager as darwin.

-

-The good news: current nixpkgs-unstable now packages `hyprland` (0.52.2),

-`hyprlock`, `hypridle`, `hyprpicker`, `wpaperd`, `kanshi`, and `pyprland`

-directly, so those five extra flake inputs (and the rust-overlay pin) are

-gone entirely - `linux.nix` just uses `pkgs.hyprland` etc. Only two

-Linux-specific flake inputs remain in `flake.nix`:

-

-- `nixgl` (still needed - it exists specifically to patch Guix's mesa/GL

- mismatch, unrelated to nixpkgs version)

-- `clipboard-sync` (not in nixpkgs)

-

-**Dropped**: the `hypr-dynamic-cursors` Hyprland plugin (animated cursor

-trails). It has no nixpkgs package and pinning a matching flake input just

-for one cosmetic plugin didn't seem worth the added re-pin risk. If you want

-it back, add it as a flake input with `inputs.nixpkgs.follows = "nixpkgs"`

-and pass it as a plugin in `wayland.windowManager.hyprland.plugins`.

-

-**Dropped**: `mozff` (firefox-nightly flake) - unused. The

-`firefox-nightly` module's package line was already commented out in the

-guix config; it just configures `programs.firefox` (nixpkgs' own package).

-

-**Cursor theme changed**: the vendored `Bibata-Modern-Classic-Hyprland` /

-`Bibata-Modern-daed9-v1.0.2-x11` asset had oddly-versioned internal theme

-names from however that release was originally packaged. Replaced with

-nixpkgs' `bibata-cursors` (`home.pointerCursor` in `linux.nix`) - the

-`HYPRCURSOR_THEME`/`XCURSOR_THEME` env vars in `hyprland.conf` were updated

-to the plain name `Bibata-Modern-Classic` to match. nixpkgs' build doesn't

-have a `-Hyprland`-suffixed hyprcursor variant; Hyprland falls back to

-rendering the XCursor theme directly, which works fine, just without the

-optional cleaner hyprcursor rendering path.

-

-## Verification note

-

-`homeConfigurations.ryan` was checked with:

-

-```

-nix eval --raw .#homeConfigurations.ryan.activationPackage.drvPath

-```

-

-which forces full module evaluation (catches missing options and

-darwin-only packages referenced on Linux) without building anything.

-

-`darwinConfigurations.RyanMac` could not be evaluated on this machine (no

-aarch64-darwin builder). It was verified by structural diff instead:

-`flake.nix`'s darwin-facing inputs/outputs, `hosts/RyanMac/configuration.nix`,

-and `modules/darwin/random-wallpaper` are unchanged from `nix-dotfiles`;

-`common.nix`/`darwin.nix` reproduce `nix-dotfiles/users/ryan/home.nix`

-line-for-line except where noted above. Please run

-`darwin-rebuild build --flake .#RyanMac` yourself before switching for real.

-# nix-combined

-

-One flake, two targets:

-

-- `darwinConfigurations.RyanMac` - the mac system (nix-darwin + home-manager),

- equivalent to what `nix-dotfiles` built.

-- `homeConfigurations.ryan` - standalone home-manager for `x86_64-linux`,

- meant to run *on top of* Guix System as the home-manager substitute for

- what `guix-dotfiles/home-config/home-configuration.scm` used to fully own.

- Guix still owns the system config, package management, and three home

- services that need shepherd (pipewire, dbus, downloads-gc) - see

- `MIGRATION.md`.

-

-`users/ryan/common.nix` holds everything shared by both (git, ssh, gpg-agent,

-starship, zsh, zen-browser, neovim). `darwin.nix` and `linux.nix` hold the

-platform-specific rest.

-

-## Darwin

-

-```

-sudo nix run --extra-experimental-features "nix-command flakes" github:nix-darwin/nix-darwin -- switch --flake .#RyanMac \

- --option "extra-substituters" "https://virby-nix-darwin.cachix.org" \

- --option "extra-trusted-public-keys" "virby-nix-darwin.cachix.org-1:z9GiEZeBU5bEeoDQjyfHPMGPBaIQJOOvYOOjGMKIlLo="

-```

-

-Subsequent rebuilds: `rebuild` (zsh alias) or

-`sudo darwin-rebuild switch --flake ~/.config/nix/.`

-

-## Linux (Guix)

-

-Requires `experimental-features = nix-command flakes` in

-`~/.config/nix/nix.conf` (guix-dotfiles already symlinks this in).

-

-```

-nix run --extra-experimental-features "nix-command flakes" home-manager -- switch --flake .#ryan

-```

-

-Subsequent rebuilds: `rebuild` (zsh alias) or

-`home-manager switch --flake ~/.config/home-manager#ryan`.

-

-See `MIGRATION.md` for what needs to change in `guix-dotfiles` for this to

-slot in cleanly (symlink target, overlapping config entries to remove, the

-zsh login-shell switch), what stays Guix-native and why, and what got

-dropped as dead weight along the way.

- "lastModified": 1785569296,

- "narHash": "sha256-ux2+60xcjl4LloKPevqrkP+uY4DNZXhzVd+TYrfE2+w=",

- "rev": "945e834a12a97a5e3b08869960e35c7ccfde6f69",

- description = "Combined nix flake: darwin system (RyanMac) + standalone home-manager for Guix (ryan@linux)";

- # Linux-only. hyprland/hyprlock/hypridle/hyprpicker/wpaperd/kanshi/pyprland

- # all now ship in nixpkgs itself, so only the pieces nixpkgs doesn't carry

- # need their own flake input:

- # Ryan's fork exists to patch Guix's mesa/OpenGL mismatch, unrelated to

- # nixpkgs version - keep tracking it regardless of the nixpkgs bump.

- mkSpace = i: {

- name = toString (117+i);

- value = {

- enabled = true;

- value = {

- type = "standard";

- parameters = [ (48 + i) (builtins.elemAt [ 18 19 20 21 22 23 25 26 28 ] (i - 1)) 524288 ]; # opt + num

- #parameters = [ (48 + i) (builtins.elemAt [ 18 19 20 21 22 23 25 26 28 ] (i - 1)) 1048576 ]; # cmd + num

- };

- };

- };

-

- spaceHotkeys = builtins.listToAttrs (map mkSpace (lib.range 1 9));

-

- services.yabai = {

- enableScriptingAddition = false;

- config = {

- mouse_follows_focus = "on";

- layout = "bsp";

- window_placement = "second_child";

- top_padding = "10";

- bottom_padding = "10";

- left_padding = "10";

- right_padding = "10";

- window_gap = "10";

- mouse_modifier = "alt";

- mouse_drop_action = "swap";

- mouse_action1 = "move";

- mouse_action2 = "resize";

- focus_follows_mouse = "autofocus";

- extraConfig = ''

- yabai -m rule --add app='System Settings' manage=off

- yabai -m rule --add app="^Zen$" title="^Picture-in-Picture$" manage=off

- ''

- # Add simple-bar signals if enabled

- + lib.optionalString config.home-manager.users.${username}.ryan.simple-bar.enable ''

- yabai -m signal --add event=window_focused action="curl http://localhost:7776/yabai/spaces/refresh && curl http://localhost:7776/yabai/windows/refresh" label="Refresh simple-bar spaces & windows when focused application changes"

- yabai -m signal --add event=window_resized action="curl http://localhost:7776/yabai/spaces/refresh && curl http://localhost:7776/yabai/windows/refresh" label="Refresh simple-bar spaces & windows when a window is resized"

- yabai -m signal --add event=window_destroyed action="curl http://localhost:7776/yabai/spaces/refresh && curl http://localhost:7776/yabai/windows/refresh" label="Refresh simple-ba spaces & windows when an application window is closed"

- yabai -m signal --add event=space_changed action="curl http://localhost:7776/yabai/spaces/refresh && curl http://localhost:7776/yabai/windows/refresh" label="Refresh simple-bar spaces & windows on space change"

- yabai -m signal --add event=display_changed action="curl http://localhost:7776/yabai/spaces/refresh && curl http://localhost:7776/yabai/windows/refresh" label="Refresh simple-bar spaces & windows on display focus change"

- yabai -m signal --add event=window_title_changed action="curl http://localhost:7776/yabai/spaces/refresh && curl http://localhost:7776/yabai/windows/refresh" label="Refresh simple-bar spaces & windows when current window title changes"

- yabai -m signal --add event=space_destroyed action="curl http://localhost:7776/yabai/spaces/refresh && curl http://localhost:7776/yabai/windows/refresh" label="Refresh simple-bar spaces & windows on space removal"

- yabai -m signal --add event=space_created action="curl http://localhost:7776/yabai/spaces/refresh && curl http://localhost:7776/yabai/windows/refresh" label="Refresh simple-bar spaces & windows on space creation"

- yabai -m signal --add event=application_activated action="curl http://localhost:7776/yabai/spaces/refresh && curl http://localhost:7776/yabai/windows/refresh" label="Refresh simple-bar spaces & windows when application is activated"

- yabai -m signal --add event=display_added action="curl http://localhost:7776/yabai/displays/refresh" label="Refresh simple-bar displays when a new dispay is added"

- yabai -m signal --add event=display_removed action="curl http://localhost:7776/yabai/displays/refresh" label="Refresh simple-bar displays when a dispay is removed"

- yabai -m signal --add event=display_moved action="curl http://localhost:7776/yabai/displays/refresh" label="Refresh simple-bar displays when a dispay is moved"

- '';

-

- shift + alt - q : ${pkgs.yabai}/bin/yabai -m window --close

-

- alt - up : ${pkgs.yabai}/bin/yabai -m window --focus north || ${pkgs.yabai}/bin/yabai -m display --focus north

- shift + alt - up : ${pkgs.yabai}/bin/yabai -m window --swap north || ${pkgs.yabai}/bin/yabai -m window --display north

- alt - down : ${pkgs.yabai}/bin/yabai -m window --focus south || ${pkgs.yabai}/bin/yabai -m display --focus south

- shift + alt - down : ${pkgs.yabai}/bin/yabai -m window --swap south || ${pkgs.yabai}/bin/yabai -m window --display south

- alt - right : ${pkgs.yabai}/bin/yabai -m window --focus east || ${pkgs.yabai}/bin/yabai -m display --focus east

- shift + alt - right : ${pkgs.yabai}/bin/yabai -m window --swap east || ${pkgs.yabai}/bin/yabai -m window --display east

- alt - left : ${pkgs.yabai}/bin/yabai -m window --focus west || ${pkgs.yabai}/bin/yabai -m display --focus west

- shift + alt - left: ${pkgs.yabai}/bin/yabai -m window --swap west || ${pkgs.yabai}/bin/yabai -m window --display west

-

- shift + alt - space: ${pkgs.yabai}/bin/yabai -m window --toggle float

-

- shift + alt - return: ${pkgs.yabai}/bin/yabai -m window --toggle sticky

-

- alt - f : ${pkgs.yabai}/bin/yabai -m window --toggle zoom-fullscreen

-

- shift + alt - f: ${pkgs.yabai}/bin/yabai -m window --toggle native-fullscreen

-

- shift + alt - 1 : ${pkgs.yabai}/bin/yabai -m window --space 1

- shift + alt - 2 : ${pkgs.yabai}/bin/yabai -m window --space 2

- shift + alt - 3 : ${pkgs.yabai}/bin/yabai -m window --space 3

- shift + alt - 4 : ${pkgs.yabai}/bin/yabai -m window --space 4

- shift + alt - 5 : ${pkgs.yabai}/bin/yabai -m window --space 5

- shift + alt - 6 : ${pkgs.yabai}/bin/yabai -m window --space 6

- shift + alt - 7 : ${pkgs.yabai}/bin/yabai -m window --space 7

- shift + alt - 8 : ${pkgs.yabai}/bin/yabai -m window --space 8

- shift + alt - 9 : ${pkgs.yabai}/bin/yabai -m window --space 9

- WindowManager = {

- EnableTilingOptionAccelerator = false;

- };

-

- "com.apple.symbolichotkeys" = {

- AppleSymbolicHotKeys = manualHotkeys // spaceHotkeys;

- };

- home.stateVersion = "26.05"; # Please read the comment before changing.

-

- bat

- pass

- pandoc

- audacity

- ffmpeg

- blender

- nerd-fonts.anonymice

-{ config, pkgs, lib, inputs, ... }:

- ./linux/firefox-nightly

- home.stateVersion = "23.11"; # Please read the comment before changing.

- programs.zsh.shellAliases = {

- ls = "ls -p --color=auto";

- spt = "spotify_player";

- python = "python3";

- # `nix shell nixpkgs#...`/`nix run nixpkgs#...` etc. resolve `nixpkgs` to

- # this flake's own pinned input instead of fetching latest nixpkgs-unstable.

- # This is the standalone-HM equivalent of RyanMac's /etc/nix/flake-registry.json.

- # HM owns the whole ~/.config/nix directory (including nix.conf) so this

- # doesn't end up writing through guix-dotfiles' `nix-config` symlink - see

- # MIGRATION.md.

- xdg.configFile."nix/nix.conf".text = "experimental-features = nix-command flakes\n";

- xdg.configFile."nix/registry.json".text = builtins.toJSON {

- version = 2;

- flakes = [

- {

- from = { type = "indirect"; id = "nixpkgs"; };

- to = {

- type = "path";

- path = inputs.nixpkgs.outPath;

- lastModified = inputs.nixpkgs.lastModified;

- narHash = inputs.nixpkgs.narHash;

- };

- }

- ];

- # Non-NixOS (Guix), so HM has to write its own fontconfig instead of

- # relying on a system module.

- fonts.fontconfig.enable = true;

- fonts.fontconfig.defaultFonts = {

- monospace = [ "DejaVu Sans Mono" ];

- sansSerif = [ "DejaVu Sans" ];

- serif = [ "DejaVu Serif" ];

- # Cursor theme. Replaces the previously hand-vendored Bibata asset (which

- # embedded oddly-versioned theme names) with nixpkgs' own build - see the

- # comment in linux/hypr/hyprland.conf for the corresponding env var change.

- # gpg-agent itself is enabled in common.nix; nixpkgs' pinentry here instead

- # of depending on Guix's system profile path.

- "spotify-player/app.toml".source = ./linux/spotify-player/app.toml;

- ".local/share/mailvelope" = { source = ./linux/mailvelope; recursive = true; };

- ".local/share/tridactyl" = { source = ./linux/tridactyl; recursive = true; };

- ".mozilla/native-messaging-hosts/tridactyl.json".source = ./linux/tridactyl/tridactyl.json;

- rustup

- zoxide

- pnpm

- gifski

- spotify-player

- fluxcd

- kdePackages.kdenlive

- # foot is Guix system-packaged and is the terminal actually wired into

- # the WM; alacritty's config was carried over from guix-dotfiles but

- # nothing provided its binary there either - see MIGRATION.md.

- alacritty

-

- # Nerd Fonts, replacing the hand-vendored ttf files that used to live in

- # guix-dotfiles/home-config/fonts (Fira Code and "Monofur For Powerline"

- # dropped - superseded by these, unreferenced anywhere)

- nerd-fonts.anonymice

- nerd-fonts.monofur

- nerd-fonts.lilex

- nerd-fonts.fira-code

- # hyprlock built by nix needs Guix's PAM/fontconfig libs preloaded to run

- # under the Guix system profile - same interop hack as before.

- (pkgs.writeScriptBin "hyprlock" ''

- #! ${pkgs.bash}/bin/bash

- export LD_PRELOAD="/run/current-system/profile/lib/libpam.so.0:/run/current-system/profile/lib/libfontconfig.so:$LD_PRELOAD"

- exec ${pkgs.hyprlock}/bin/hyprlock "$@"

- '')

-

- # Guix's mesa doesn't match nixpkgs', so GL apps built by nix need nixGL.

- inputs.nixgl.packages.${pkgs.system}.nixGLIntel

- inputs.clipboard-sync.packages.${pkgs.system}.default

- pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below

-# windowrule = float, ^(kitty)$

-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$

-bind = $mainMod, P, pseudo, # dwindle

-bind = $mainMod, J, togglesplit, # dwindle

-windowrulev2 = float, class:^(zen-beta)$, title:^(Picture-in-Picture)$

-windowrulev2 = pin, class:^(zen-beta)$, title:^(Picture-in-Picture)$

-windowrulev2 = size 22% 22%, class:^(zen-beta)$, title:^(Picture-in-Picture)$

-windowrulev2 = move 76% 8%, class:^(zen-beta)$, title:^(Picture-in-Picture)$

-windowrulev2 = float, class:^(firefox)$, title:^(Firefox — Sharing Indicator)$

-windowrulev2 = size 56 31, class:^(firefox)$, title:^(Firefox — Sharing Indicator)$

-windowrulev2 = move 50% 0, class:^(firefox)$, title:^(Firefox — Sharing Indicator)$

-windowrulev2 = suppressevent fullscreen maximize, class:^(firefox)$, title:^(Firefox — Sharing Indicator)$

-windowrulev2 = float,class:^(ala-wttr)$

-windowrulev2 = size 822 1026, class:^(ala-wttr)$

-windowrulev2 = float,class:^(float-foot)$

-windowrulev2 = size 930 680,class:^(float-foot)$

-windowrulev2 = center,class:^(float-foot)$

-windowrulev2 = bordercolor rgba(bf0000ee) rgba(ab00adee) 45deg,pinned:1

-windowrulev2 = float,class:^(mpv)$, title:^(subwaysurfer.webm - mpv)$

-windowrulev2 = size 310 554,class:^(mpv)$, title:^(subwaysurfer.webm - mpv)$

-windowrulev2 = move 81% 46% ,class:^(mpv)$, title:^(subwaysurfer.webm - mpv)$

-windowrulev2 = pin,class:^(mpv)$, title:^(subwaysurfer.webm - mpv)$

-windowrulev2 = float,class:^(mpv)$, title:^(family_guy.mp4 - mpv)$

-windowrulev2 = size 595 336,class:^(mpv)$, title:^(family_guy.mp4 - mpv)$

-windowrulev2 = move 67% 5% ,class:^(mpv)$, title:^(family_guy.mp4 - mpv)$

-windowrulev2 = pin,class:^(mpv)$, title:^(family_guy.mp4 - mpv)$

-windowrulev2 = fullscreen,class:^(com.gabm.satty)$

-nice -n13 swww init &

-

-{

- "name": "gpgmejson",

- "description": "JavaScript binding for GnuPG",

- "path": "/home/ryan/.local/share/mailvelope/start.sh",

- "type": "stdio",

- "allowed_extensions": ["jid1-AQqSMBYb0a8ADg@jetpack"]

-}

-#!/usr/bin/env bash

-

-# Wrap for gpgme-json so firefox can use it

-exec gpgme-json $@

-theme = "dracula"

-client_id = "4b1219bdc29945bc8ca914f80a8a6a47"

-client_port = 8888

-playback_format = """

-{track} • {artists}

-{album}

-{metadata}"""

-tracks_playback_limit = 50

-app_refresh_duration_in_ms = 32

-playback_refresh_duration_in_ms = 0

-cover_image_refresh_duration_in_ms = 2000

-page_size_in_rows = 20

-play_icon = "▶"

-pause_icon = "▌▌"

-liked_icon = "♥"

-border_type = "Plain"

-progress_bar_type = "Rectangle"

-playback_window_position = "Top"

-cover_img_length = 9

-cover_img_width = 5

-cover_img_scale = 1.0

-playback_window_width = 6

-enable_media_control = true

-enable_streaming = "DaemonOnly"

-enable_cover_image_cache = true

-default_device = "RyanThinkpad"

-

-[copy_command]

-command = "wlcopy"

-args = []

-

-[notify_format]

-summary = "{track} • {artists}"

-body = "{album}"

- "modules-right": ["tray", "custom/spotify", "privacy", "custom/weather", "custom/mail", "custom/storage", "backlight", "bluetooth", "pulseaudio", "network", "idle_inhibitor", "battery", "battery#num2", "clock"],

- "format-icons": ["", "", "", "", ""],

- "format-charging": "{capacity}% ",

- "bat":"BAT0"

- "format-icons": ["", "", "", "", ""],

- "format-charging": "{capacity}% ",

- "bat":"BAT1"

- "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",

- "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",

- "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%"

- "wifi": ["󰤟", "󰤢" ,"󰤥", "󰤨"],

- "ethernet": [""],

- "disconnected": ["󰤭"]

- "icon-spacing":4,

- "icon-size":18,

- "transition-duration":250,

- "type":"screenshare",

- "tooltip":true,

- "tooltip-icon-size":24

- "type":"audio-in",

- "tooltip":true,

- "tooltip-icon-size":24

- "phone": [" ", " ", " ", " "],

- "default": ["", "", "", ""]

- "custom/spotify": {

- "interval": 2,

- "return-type": "json",

- "exec": "~/.config/waybar/modules/spotify.sh",

- "exec-if": "~/.config/waybar/modules/check-for-music.sh",

- "escape": true,

- "on-click": "playerctl play-pause"

- },

- "format-icons": ["", ""],

- "exec": "exit=101; while [ $exit = 101 ]; do wttrbar --main-indicator temp_F --fahrenheit; exit=$(echo $?); sleep 1; done",

-mount="/"

-df -h -P -l "$mount" | awk -v warning=$warning -v critical=$critical '

-/\/.*/ {

- text=$4

- tooltip="Filesystem: "$1"\rSize: "$2"\rUsed: "$3"\rAvail: "$4"\rUse%: "$5"\rMounted on: "$6

- use=$5

- exit 0

-END {

- class=""

- gsub(/%$/,"",use)

- if ((100 - use) < critical) {

- } else if ((100 - use) < warning) {

- }

- print "{\"text\":\""text"\", \"percentage\":"use",\"tooltip\":\""tooltip"\", \"class\":\""class"\"}"

-}

-'

- font-family: AnonymicePro Nerd Font;

-path = "~/.config/hypr/Wallpapers/static/"