diff --git a/flake.lock b/flake.lock
index ffac991..092229d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,27 +7,27 @@
         ]
       },
       "locked": {
-        "lastModified": 1699368917,
-        "narHash": "sha256-nUtGIWf86BOkUbtksWtfglvCZ/otP0FTZlQH8Rzc7PA=",
+        "lastModified": 1725180166,
+        "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6a8444467c83c961e2f5ff64fb4f422e303c98d3",
+        "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6a8444467c83c961e2f5ff64fb4f422e303c98d3",
+        "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
         "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1711352745,
-        "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
+        "lastModified": 1725477728,
+        "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
+        "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce",
         "type": "github"
       },
       "original": {
@@ -38,31 +38,31 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701282334,
-        "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
+        "lastModified": 1716394534,
+        "narHash": "sha256-R5cP4FbP/YLhkE2B1omXTZEUTOZG0tjCe4/n/yz+LwQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
+        "rev": "4a817d2083d6cd7068dc55511fbf90f84653b301",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "23.11",
+        "ref": "24.11-pre",
         "type": "indirect"
       }
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1711233294,
-        "narHash": "sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc=",
+        "lastModified": 1721524707,
+        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68",
+        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -83,11 +83,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1711249319,
-        "narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=",
+        "lastModified": 1725201042,
+        "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "405987a66cce9a4a82f321f11b205982a7127c88",
+        "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d5c1334..a8e2f09 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,13 +2,13 @@
   description = "NixOS configurations for my machines";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/23.11";
+    nixpkgs.url = "nixpkgs/24.11-pre";
     nixos-hardware = {
       url = github:nixos/nixos-hardware;
     };
     home-manager = {
       # url = github:nix-community/home-manager;
-      url = github:nix-community/home-manager/6a8444467c83c961e2f5ff64fb4f422e303c98d3;
+      url = github:nix-community/home-manager/471e3eb0a114265bcd62d11d58ba8d3421ee68eb;
       inputs.nixpkgs.follows = "nixpkgs";
     };
     sops-nix = {
@@ -59,7 +59,7 @@
       ];
       # ThinkCentre M700 mini-pc (server)
       cj = mkNixosSystem [
-        nixos-hardware.nixosModules.common-pc-hdd
+        #nixos-hardware.nixosModules.common-pc-hdd
         nixos-hardware.nixosModules.common-cpu-intel-cpu-only
         ./machines/cj/configuration.nix 
       ];
diff --git a/home/jacob.nix b/home/jacob.nix
index eda4d9f..9c65cd5 100644
--- a/home/jacob.nix
+++ b/home/jacob.nix
@@ -56,7 +56,7 @@
       sops
       speedcrunch
       spotify
-      spotify-tui
+      #spotify-tui  # this has been removed as of 2024.05
       sxiv
       #texlive.combined.scheme-full
       tree
@@ -153,11 +153,7 @@
     };
     firefox = {
       enable = true;
-      package = pkgs.firefox.override {
-        cfg = {
-          enableTridactylNative = true;
-        };
-      };
+      #nativeMessagingHosts.packages = [ pkgs.tridactyl-native ];
     };
     git = {
       enable = true;
@@ -261,9 +257,6 @@
         "--fx ''"  # don't apply effects
       ];
     };
-    dunst = {
-      enable = true;
-    };
     flameshot.enable = true;
     mbsync = {
       enable = true;
diff --git a/machines/cj/configuration.nix b/machines/cj/configuration.nix
index 1debded..d866d12 100644
--- a/machines/cj/configuration.nix
+++ b/machines/cj/configuration.nix
@@ -211,20 +211,14 @@
     # Enable the X11 windowing system.
     xserver = {
       enable = true;
-      dpi = 180;
       displayManager = {
-        defaultSession = "none+i3";
-        autoLogin = {
-          enable = true;
-          user = "jacob";
-        };
         lightdm = {
           enable = true;
           greeter.enable = false;
         };
       };
-      layout = "us";
-      libinput.enable = true;
+      dpi = 180;
+      xkb.layout = "us";
       windowManager.i3 = {
         enable = true;
         extraPackages = with pkgs; [
@@ -236,6 +230,15 @@
       };
     };
 
+    libinput.enable = true;
+    displayManager = {
+      defaultSession = "none+i3";
+      autoLogin = {
+        enable = true;
+        user = "jacob";
+      };
+    };
+
     # ZFS services
     zfs = {
       trim.enable = true;
@@ -251,6 +254,20 @@
     };
   };
 
+  power.ups = {
+    enable = false;
+    mode = "netserver";
+    ups."myups" = {
+      driver = "usbhid-ups";
+      description = "CJ UPS";
+      port = "auto";
+    };
+  };
+
+  #environment.etc."nut/upsd.conf".source = ./config/upsd.conf;
+  #environment.etc."nut/upsd.users".source = ./config/upsd.users;
+  #environment.etc."nut/upsmon.conf".source = ./config/upsmon.conf;
+
   # Due to bug in home assistant, this workaround is suggested temporarily as of May 6, 2022
   # https://github.com/nix-community/home-manager/issues/2942#issuecomment-1119760100
   #nixpkgs.config.allowUnfree = true;
diff --git a/machines/cj/pihole.nix b/machines/cj/pihole.nix
index 7c145a3..909523b 100644
--- a/machines/cj/pihole.nix
+++ b/machines/cj/pihole.nix
@@ -1,5 +1,5 @@
 { serverIP, serverIP6 } : {
-  image = "pihole/pihole:2024.01.0";
+  image = "pihole/pihole:2024.07.0";
   ports = [
     "53:53/tcp"
     "53:53/udp"