remove nur in favor of a plain nixpkgs overlay

6 files changed, 20 insertions, 62 deletions

diff --git a/share/cfg/default.nix b/share/cfg/default.nix
index 6b74ae4..c834122 100644
--- a/share/cfg/default.nix
+++ b/share/cfg/default.nix
@@ -11,7 +11,6 @@
     ./shellenv.nix
     ./fish.nix
     ./hyprland.nix
-    ./jujutsu.nix
     ./emacs.nix
     ./foot.nix
     ./zed
diff --git a/share/cfg/jujutsu.nix b/share/cfg/jujutsu.nix
deleted file mode 100644
index 9904a42..0000000
--- a/share/cfg/jujutsu.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ ... }:
-{
-  programs.jujutsu.settings = {
-    user = {
-      email = "isabella@sorre.xyz";
-      name = "Isabella Bastaja";
-    };
-    ui.paginate = "never";
-    signing = {
-      behavior = "own";
-      backend = "gpg";
-      key = "isabella@sorre.xyz";
-      backends.gpg.allow-expired-keys = false;
-    };
-    git = {
-      sign-on-push = true;
-      private-commits = "description(glob:'private:*')";
-      write-change-id-header = true;
-    };
-
-    # `jj l` shows commits on the working-copy commit's (anonymous) branch
-    # compared to the `main` branch
-    aliases.l = [
-      "log"
-      "-r"
-      "(main..@):: | (main..@)-"
-    ];
-
-    aliases.tug = [
-      "bookmark"
-      "move"
-      "--from"
-      "heads(::@- & bookmarks())"
-      "--to"
-      "@-"
-    ];
-  };
-  programs.delta.enableJujutsuIntegration = true;
-}
diff --git a/share/cfg/waybar.css b/share/cfg/waybar.css
index 9bbb802..b17e6d1 100644
--- a/share/cfg/waybar.css
+++ b/share/cfg/waybar.css
@@ -1,12 +1,12 @@
 * {
   /* `otf-font-awesome` is required to be installed for icons */
   font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
-  font-size: 13px;
+  font-size: 1.1rem;
 }
 
 window#waybar {
   background-color: rgba(43, 48, 59, 0.5);
-  border-bottom: 3px solid rgba(100, 114, 125, 0.5);
+  border-bottom: 2px solid rgba(100, 114, 125, 0.5);
   color: #ffffff;
   transition-property: background-color;
   transition-duration: 0.5s;
@@ -27,7 +27,7 @@ window#waybar.chromium {
 
 button {
   /* Use box-shadow instead of border so the text isn't offset */
-  box-shadow: inset 0 -3px transparent;
+  box-shadow: inset 0 -2px transparent;
   /* Avoid rounded borders under each button name */
   border: none;
   border-radius: 0;
@@ -36,7 +36,7 @@ button {
 /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 button:hover {
   background: inherit;
-  box-shadow: inset 0 -3px #ffffff;
+  box-shadow: inset 0 -2px #ffffff;
 }
 
 #workspaces button {
@@ -51,7 +51,7 @@ button:hover {
 
 #workspaces button.focused {
   background-color: #64727d;
-  box-shadow: inset 0 -3px #ffffff;
+  box-shadow: inset 0 -2px #ffffff;
 }
 
 #workspaces button.urgent {
@@ -60,7 +60,7 @@ button:hover {
 
 #mode {
   background-color: #64727d;
-  box-shadow: inset 0 -3px #ffffff;
+  box-shadow: inset 0 -2px #ffffff;
 }
 
 #clock,
@@ -85,7 +85,7 @@ button:hover {
 }
 
 #window {
-  margin: 0 4px;
+  margin: 0 2px;
 }
 
 #clock {
@@ -121,7 +121,7 @@ button:hover {
 }
 
 #power-profiles-daemon {
-  padding-right: 15px;
+  padding-right: 1.25rem;
 }
 
 #power-profiles-daemon.performance {
@@ -222,7 +222,7 @@ label:focus {
   color: #740864;
   padding: 0 5px;
   margin: 0 5px;
-  min-width: 16px;
+  min-width: 1.25rem;
 }
 
 #keyboard-state {
diff --git a/share/home/dev-stuff.nix b/share/home/dev-stuff.nix
index 9c5baa0..53012ad 100644
--- a/share/home/dev-stuff.nix
+++ b/share/home/dev-stuff.nix
@@ -1,4 +1,7 @@
-{ pkgs, ... }:
+{
+  pkgs,
+  ...
+}:
 let
   python = pkgs.python313.withPackages (
     python-pkgs: with python-pkgs; [
@@ -84,7 +87,10 @@ in
   };
 
   programs.git.enable = true;
-  programs.jujutsu.enable = true;
+  programs.jujutsu = {
+    enable = true;
+    package = pkgs.sorre.jujutsu;
+  };
   services.emacs.enable = true;
   programs.helix = {
     enable = true;
diff --git a/share/home/shell.nix b/share/home/shell.nix
index c0d4f84..c91f956 100644
--- a/share/home/shell.nix
+++ b/share/home/shell.nix
@@ -8,7 +8,7 @@
   };
 
   home.packages = [
-    pkgs.nur.repos.sorre.lightnovel-crawler
+    pkgs.sorre.lightnovel-crawler
   ]
   ++ builtins.attrValues {
     inherit (pkgs)
diff --git a/share/system/client-common.nix b/share/system/client-common.nix
index 8cdff36..4f4223c 100644
--- a/share/system/client-common.nix
+++ b/share/system/client-common.nix
@@ -12,15 +12,7 @@
   nixpkgs = {
     overlays = [
       inputs.niri-flake.overlays.niri
-      (final: prev: {
-        nur = import inputs.nur {
-          nurpkgs = prev;
-          pkgs = prev;
-          repoOverrides = {
-            sorre = import inputs.sorrepkgs { pkgs = prev; };
-          };
-        };
-      })
+      inputs.xpkgs.overlays.default
     ];
     config.allowUnfree = true;
   };
@@ -65,7 +57,7 @@
     automatic = true;
     persistent = true;
     randomizedDelaySec = "15min";
-    options = ''--delete-older-than 7d'';
+    options = "--delete-older-than 7d";
   };
 
   networking = {