From d1d61a7b57d319fcc0c157e5f6389858c81e104c Mon Sep 17 00:00:00 2001
From: Lauren Lagarde <lauren@lagarde.dev>
Date: Sun, 29 Jun 2025 16:45:38 -0500
Subject: [PATCH] Better utilize home-manager for several applications and
 services

---
 home-manager/i3.nix                | 43 +++++++++++++++++++++++-------
 systems/ll-latitude-e5591/home.nix | 19 -------------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/home-manager/i3.nix b/home-manager/i3.nix
index 6f5057b..d4d7b7d 100644
--- a/home-manager/i3.nix
+++ b/home-manager/i3.nix
@@ -7,20 +7,48 @@
     ./programs/gnome-terminal.nix
   ];
 
+  services.blueman-applet.enable = true;
+  services.network-manager-applet.enable = true;
+
+  services.flameshot = {
+    enable = true;
+    settings.General.showStartupLaunchMessage = false;
+  };
+
+  programs.mpv.enable = true;
+  programs.firefox.enable = true;
+  programs.chromium.enable = true;
   programs.browserpass.enable = true;
 
+  programs.rofi = {
+    enable = true;
+    theme = "solarized";
+    font = "ubuntu mono 10";
+  };
+
   home.packages = with pkgs; [
+    # TODO: Figure these ones out
+    #dunst
+    #xidlehook?
+
     feh
+    vlc
+    loupe
     arandr
+    gparted
     brightnessctl
     pavucontrol
-    blueman
-    rofi
     pinentry-qt
     gnome-terminal
-    networkmanagerapplet
-    loupe
     xorg.xkill
+    nemo-with-extensions
+
+    # Other Apps
+    librecad
+    libreoffice
+    virt-manager
+    sublime-merge
+    openscad-unstable
   ];
 
   home.file = {
@@ -61,9 +89,6 @@
       bindsym $mod+Shift+w exec curl -X POST https://homeassistant.mlaga97.space/api/webhook/-tbHkUPb8aLVcFaOQcXbBdIJb
       bindsym $mod+Shift+o exec curl -X POST https://homeassistant.mlaga97.space/api/webhook/-fmYa59UtZaMXythyEsda_ulo
       
-      # Network Manager
-      exec nm-applet
-      
       # Allow gnome apps to prompt for password
       #exec --no-startup-id /usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 &
       
@@ -107,7 +132,7 @@
       bindsym $mod+Control+b exec blueman-manager
       
       # Fast calculator
-      bindsym $mod+c exec rofi -theme solarized -font "ubuntu mono 16" -show calc -modi "calc:qalc +u8 -nocurrencies"
+      bindsym $mod+c exec rofi -show calc -modi "calc:qalc +u8 -nocurrencies"
       
       ################################################################################
       # Session Management
@@ -185,7 +210,7 @@
       bindsym $mod+Shift+q kill
       
       # Run a Program
-      bindsym $mod+d exec rofi -combi-modi run#window#ssh -theme solarized -font "ubuntu mono 10" -show combi
+      bindsym $mod+d exec rofi -show combi -combi-modi run#window#ssh
       
       # Cycle Through Windows
       bindsym $mod+h focus left
diff --git a/systems/ll-latitude-e5591/home.nix b/systems/ll-latitude-e5591/home.nix
index 5eb8d9f..947babb 100644
--- a/systems/ll-latitude-e5591/home.nix
+++ b/systems/ll-latitude-e5591/home.nix
@@ -52,25 +52,6 @@
   };
 
   home.packages = with pkgs; [
-    # TODO: Figure these ones out
-    #dunst
-    #xidlehook?
-
-    # Lauren Base GUI
-    vlc
-    mpv
-    gparted
-    shutter
-    nemo-with-extensions
-
-    # Other Apps
-    chromium
-    librecad
-    libreoffice
-    virt-manager
-    sublime-merge
-    openscad-unstable
-
     # Dotspace
     gthumb
     qtpass