diff --git a/users/ryan/common.nix b/users/ryan/common.nix
index 1beaa7c..58346e7 100644
--- a/users/ryan/common.nix
+++ b/users/ryan/common.nix
@@ -149,6 +149,24 @@
# packages to nix (all commented out of home-configuration.scm's package
# list), same as the darwin config always has.
home.packages = with pkgs; [
+ bat
+ fd
+ fzf
+ tmux
+ restic
+ rsync
+ pv
+ jq
+ htop
+ (pkgs.zathura.override {
+ plugins = [ pkgs.zathuraPkgs.zathura-pdf-mupdf ];
+ })
+ go
+ pass
+ file
+ pandoc
+ weechat
+ python3
yt-dlp
aerc
gdu
@@ -156,6 +174,9 @@
delta
prismlauncher
git-lfs
+ kdePackages.kdenlive
+ audacity
+ blender
];
xdg.configFile."aerc" = {
diff --git a/users/ryan/darwin.nix b/users/ryan/darwin.nix
index 0557509..e721347 100644
--- a/users/ryan/darwin.nix
+++ b/users/ryan/darwin.nix
@@ -29,13 +29,7 @@
home.file.".config/homebrew".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.homebrew";
home.packages = with pkgs; [
- bat
- pass
- pandoc
iina # Media player (frontend to mpv essentially)
- audacity
- ffmpeg
- blender
nerd-fonts.anonymice
jujutsu
netbird-tui
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
diff --git a/users/ryan/linux/firefox-nightly/.to-be-deleted b/users/ryan/linux/firefox-nightly/.to-be-deleted
new file mode 100644
index 0000000..e69de29
diff --git a/users/ryan/linux/mailvelope/gpgmejson.json b/users/ryan/linux/mailvelope/gpgmejson.json
deleted file mode 100644
index 7ad8586..0000000
--- a/users/ryan/linux/mailvelope/gpgmejson.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "name": "gpgmejson",
- "description": "JavaScript binding for GnuPG",
- "path": "/home/ryan/.local/share/mailvelope/start.sh",
- "type": "stdio",
- "allowed_extensions": ["jid1-AQqSMBYb0a8ADg@jetpack"]
-}
diff --git a/users/ryan/linux/mailvelope/start.sh b/users/ryan/linux/mailvelope/start.sh
deleted file mode 100755
index 01b3ee2..0000000
--- a/users/ryan/linux/mailvelope/start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Wrap for gpgme-json so firefox can use it
-exec gpgme-json $@
diff --git a/users/ryan/linux/spotify-player/app.toml b/users/ryan/linux/spotify-player/app.toml
deleted file mode 100644
index 4eac5e4..0000000
--- a/users/ryan/linux/spotify-player/app.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-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}"