Trimmed out some unnecessary packages

flake.lock

@@ -876,11 +876,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1709863839,
+        "lastModified": 1709950089,
-        "narHash": "sha256-QpEL5FmZNi2By3sKZY55wGniFXc4wEn9PQczlE8TG0o=",
+        "narHash": "sha256-JjZINymxtnDY9EDdxnVPideZvHPR2Cm/GdKAptCWLI4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "e5ab9ee98f479081ad971473d2bc13c59e9fbc0a",
+        "rev": "d3a05d053b145349b8ad395741c5951f332280ef",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,43 +1,34 @@
 {
   description = "Flake of LibrePhoenix";
 
-  outputs = inputs@{ self, nixpkgs, nixpkgs-stable, home-manager, nix-doom-emacs
+  outputs = inputs@{ self, nixpkgs, nixpkgs-stable, home-manager, nix-doom-emacs,
-    , nix-straight, stylix, blocklist-hosts, rust-overlay, hyprland-plugins, eaf
+                     nix-straight, stylix, blocklist-hosts, hyprland-plugins, rust-overlay,
-    , eaf-browser, org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll
+                     org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }:
-    , ... }:
     let
       # ---- SYSTEM SETTINGS ---- #
       systemSettings = {
         system = "x86_64-linux"; # system arch
         hostname = "snowfire"; # hostname
-        profile =
+        profile = "personal"; # select a profile defined from my profiles directory
-          "personal"; # select a profile defined from my profiles directory
         timezone = "America/Chicago"; # select timezone
         locale = "en_US.UTF-8"; # select locale
         bootMode = "uefi"; # uefi or bios
-        bootMountPath =
+        bootMountPath = "/boot"; # mount path for efi boot partition; only used for uefi boot mode
-          "/boot"; # mount path for efi boot partition; only used for uefi boot mode
+        grubDevice = ""; # device identifier for grub; only used for legacy (bios) boot mode
-        grubDevice =
-          ""; # device identifier for grub; only used for legacy (bios) boot mode
       };
 
       # ----- USER SETTINGS ----- #
       userSettings = rec {
         username = "emmet"; # username
         name = "Emmet"; # name/identifier
-        email =
+        email = "emmet@librephoenix.com"; # email (used for certain configurations)
-          "emmet@librephoenix.com"; # email (used for certain configurations)
         dotfilesDir = "~/.dotfiles"; # absolute path of the local repo
-        theme =
+        theme = "uwunicorn-yt"; # selcted theme from my themes directory (./themes/)
-          "uwunicorn-yt"; # selcted theme from my themes directory (./themes/)
+        wm = "hyprland"; # Selected window manager or desktop environment; must select one in both ./user/wm/ and ./system/wm/
-        wm =
-          "hyprland"; # Selected window manager or desktop environment; must select one in both ./user/wm/ and ./system/wm/
         # window manager type (hyprland or x11) translator
         wmType = if (wm == "hyprland") then "wayland" else "x11";
-        browser =
+        browser = "qutebrowser"; # Default browser; must select one from ./user/app/browser/
-          "qutebrowser"; # Default browser; must select one from ./user/app/browser/
+        defaultRoamDir = "Personal.p"; # Default org roam directory relative to ~/Org
-        defaultRoamDir =
-          "Personal.p"; # Default org roam directory relative to ~/Org
         term = "alacritty"; # Default terminal command;
         font = "Intel One Mono"; # Selected font
         fontPkg = pkgs.intel-one-mono; # Font package
@@ -49,8 +40,9 @@
         spawnEditor = if (editor == "emacsclient") then
                         "emacsclient -c -a 'emacs'"
                       else
-          (if ((editor == "vim") || (editor == "nvim")
+                        (if ((editor == "vim") ||
-            || (editor == "nano")) then
+                             (editor == "nvim") ||
+                             (editor == "nano")) then
                                "exec " + term + " -e " + editor
                          else
                            editor);
@@ -80,7 +72,6 @@
           allowUnfree = true;
           allowUnfreePredicate = (_: true);
         };
-        overlays = [ rust-overlay.overlays.default ];
       };
 
       # configure lib
@@ -111,8 +102,6 @@
             inherit systemSettings;
             inherit userSettings;
             inherit (inputs) nix-doom-emacs;
-            inherit (inputs) eaf;
-            inherit (inputs) eaf-browser;
             inherit (inputs) org-nursery;
             inherit (inputs) org-yaap;
             inherit (inputs) org-side-tree;
@@ -211,8 +200,6 @@
 
     rust-overlay.url = "github:oxalica/rust-overlay";
 
-    #nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.2.0";
-
     blocklist-hosts = {
       url = "github:StevenBlack/hosts";
       flake = false;

user/app/games/games.nix

@@ -1,4 +1,4 @@
-{ pkgs, pkgs-stable, ... }:
+{ pkgs, ... }:
 let
   myRetroarch =
     (pkgs.retroarch.override {
@@ -18,7 +18,7 @@ let
         }))
         dolphin
         genesis-plus-gx
-      ] ++ [pkgs-stable.libretro.citra];
+      ];
     });
 in
 {

user/bin/ytsub-wrappers.nix

@@ -1,25 +0,0 @@
-{ pkgs, ... }:
-let
-  myYtpScript = ''
-    #!/bin/sh
-    ytsub --video-player mpv
-  '';
-  myYtaScript = ''
-    #!/bin/sh
-    yt-dlp -x --audio-format mp3 $1
-  '';
-  myYtdScript = ''
-    #!/bin/sh
-    pushd ~/Media/Podcasts;
-    ytsub --video-player ~/.nix-profile/bin/yta;
-    popd;
-  '';
-in
-{
-  home.packages = [
-    pkgs.yt-dlp
-    (pkgs.writeScriptBin "ytp" myYtpScript)
-    (pkgs.writeScriptBin "yta" myYtaScript)
-    (pkgs.writeScriptBin "ytd" myYtdScript)
-  ];
-}

user/pkgs/russ.nix

@@ -1,34 +0,0 @@
-{ lib, fetchgit, pkgs, ... }:
-let
-  rustPlatform = pkgs.makeRustPlatform {
-    cargo = pkgs.rust-bin.stable.latest.minimal;
-    rustc = pkgs.rust-bin.stable.latest.minimal;
-  };
-in
-rustPlatform.buildRustPackage rec {
-  pname = "russ";
-  version = "unstable";
-
-  src = fetchgit {
-    url = "https://github.com/ckampfe/russ.git";
-    rev = "1482bb1df13738fdd4ea1badf2146a9ed8e6656e";
-    sha256 = "sha256-MvTMo2q/cQ/LQNdUV8SmHgGlA42kLl0i9mdcoAFV/I4=";
-  };
-
-  cargoSha256 = "sha256-/r1Dp7eh2qVYRGINVdPq6e8c9U/R2AzVEy/g+j/GRPo=";
-
-  checkType = "debug";
-  checkFlags = [
-    # network required tests don't work when building with nix for some reason
-    "--skip=rss::tests::it_fetches"
-    "--skip=rss::tests::it_subscribes_to_a_feed"
-    "--skip=rss::tests::refresh_feed_does_not_add_any_items_if_there_are_no_new_items"
-  ];
-
-  meta = with lib; {
-    description = "A TUI RSS reader with vim-like controls and a local-first, offline-first focus ";
-    homepage = "https://github.com/ckampfe/russ";
-    license = licenses.agpl3Only;
-    maintainers = [];
-  };
-}

user/pkgs/ytsub.nix

@@ -1,28 +0,0 @@
-{ lib, pkgs, ... }:
-let
-  rustPlatform = pkgs.makeRustPlatform {
-    cargo = pkgs.rust-bin.stable.latest.minimal;
-    rustc = pkgs.rust-bin.stable.latest.minimal;
-  };
-in
-rustPlatform.buildRustPackage rec {
-  pname = "ytsub";
-  version = "0.4.0";
-
-  src = fetchTarball {
-    url = "https://github.com/sarowish/ytsub/archive/refs/tags/v0.4.0.tar.gz";
-    sha256 = "1124mf5r2507d2939833xkavy2vi2rbws67dkim4vwah376k3rlf";
-  };
-
-  cargoSha256 = "sha256-pv4eKD2XgaDAJqSf3JzfnsayofmOSy4XRzZ8rkZrHAo=";
-
-  buildNoDefaultFeatures = true;
-  buildFeatures = [ "bundled_sqlite" ];
-
-  meta = with lib; {
-    description = "A subscriptions only TUI Youtube client that uses the Invidious API";
-    homepage = "https://github.com/sarowish/ytsub";
-    license = licenses.gpl3Only;
-    maintainers = [];
-  };
-}

user/shell/cli-collection.nix

@@ -4,29 +4,26 @@
   # Collection of useful CLI apps
   home.packages = with pkgs; [
     # Command Line
-    disfetch neofetch lolcat cowsay onefetch starfetch
+    disfetch lolcat cowsay
+    starfetch
     cava
-    gnugrep gnused
     killall
     libnotify
     timer
+    brightnessctl
+    gnugrep
     bat eza fd bottom ripgrep
     rsync
-    tmux
-    htop
-    hwinfo
     unzip
-    brightnessctl
+    tmux
     w3m
-    fzf
     pandoc
+    hwinfo
     pciutils
     (pkgs.callPackage ../pkgs/smartcalc.nix { })
     (pkgs.writeShellScriptBin "sc" ''smartcalc'')
-    #(pkgs.callPackage ../pkgs/ytsub.nix { })
-    #(pkgs.callPackage ../pkgs/russ.nix { })
-    #(pkgs.python3Packages.callPackage ../pkgs/impressive.nix { })
     (pkgs.callPackage ../pkgs/pokemon-colorscripts.nix { })
+    #(pkgs.python3Packages.callPackage ../pkgs/impressive.nix { })
     (pkgs.writeShellScriptBin "airplane-mode" ''
       #!/bin/sh
       connectivity="$(nmcli n connectivity)"
@@ -42,6 +39,5 @@
 
   imports = [
     ../bin/phoenix.nix # My nix command wrapper
-    ../bin/ytsub-wrappers.nix # My ytsub wrapper
   ];
 }