From 08d200c7b0c9210afe5bc2819b99a2726b4421a7 Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Sun, 23 Aug 2026 21:35:26 -0400 Subject: cleanup work --- users/ryan/linux.nix | 41 ++--------------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) (limited to 'users/ryan/linux.nix') diff --git a/users/ryan/linux.nix b/users/ryan/linux.nix index a86cad1..a93a065 100644 --- a/users/ryan/linux.nix +++ b/users/ryan/linux.nix @@ -2,7 +2,6 @@ { imports = [ - ./linux/firefox-nightly ]; home.username = "ryan"; @@ -11,18 +10,6 @@ nixpkgs.config.allowUnfree = true; - 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; @@ -39,8 +26,6 @@ ]; }; - # 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" ]; @@ -48,9 +33,6 @@ 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. home.pointerCursor = { enable = true; package = pkgs.bibata-cursors; @@ -60,8 +42,6 @@ x11.enable = true; }; - # gpg-agent itself is enabled in common.nix; nixpkgs' pinentry here instead - # of depending on Guix's system profile path. services.gpg-agent.pinentry.package = pkgs.pinentry-qt; wayland.windowManager.hyprland = { @@ -88,26 +68,18 @@ "mpv" = { source = ./linux/mpv; recursive = true; }; "pulse/client.conf".source = ./linux/pulseaudio/client.conf; - "spotify-player/app.toml".source = ./linux/spotify-player/app.toml; }; home.file = { - ".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; + # Files that need to be in ~ go here }; home.packages = with pkgs; [ - rustup - zoxide - pnpm gcc pkg-config wttrbar wl-clip-persist - gifski waypaper - spotify-player xwayland xdg-desktop-portal xdg-desktop-portal-gtk @@ -121,22 +93,13 @@ wl-mirror pyprland satty - fluxcd sops restic - kdePackages.kdenlive bluetui supercell-wx chromium + foot - # 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 -- cgit v1.3.1