From 0330e8ac8b82469f00c33fc9dbc6b153f0d84bf1 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Thu, 27 Jun 2024 08:23:38 +0200
Subject: Desktop update

---
 modules/base-client.nix       |  2 +-
 modules/base.nix              |  1 -
 modules/users/Rory.client.nix | 58 +++++++++++++++++++++----------------------
 modules/users/Rory.nix        |  3 ++-
 4 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'modules')

diff --git a/modules/base-client.nix b/modules/base-client.nix
index f36cd16..c88db02 100755
--- a/modules/base-client.nix
+++ b/modules/base-client.nix
@@ -41,7 +41,7 @@
     gnome.gnome-screenshot
   ];
 
-  fonts.fonts = with pkgs; [
+  fonts.packages = with pkgs; [
     (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
     cozette
   ];
diff --git a/modules/base.nix b/modules/base.nix
index 51098ee..5d382aa 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -48,7 +48,6 @@
     loader = {
       grub = {
         enable = lib.mkDefault true;
-        version = 2;
       };
       timeout = 1;
     };
diff --git a/modules/users/Rory.client.nix b/modules/users/Rory.client.nix
index b3ef89f..b74bbd9 100755
--- a/modules/users/Rory.client.nix
+++ b/modules/users/Rory.client.nix
@@ -17,35 +17,35 @@
       };
     };
     # keepassxc, maybe?
-    systemd.user.services.keepassxc = {
-      Unit = {
-        Description = "KeePassXC password manager";
-        #After = [ "graphical-session-pre.target" ];
-        PartOf = [ "default.target" ];
-      };
-
-      Install = { WantedBy = [ "default.target" ]; };
-
-      Service = { 
-        ExecStart = "${pkgs.keepassxc}/bin/keepassxc ~/.secrets.kdbx";
-        Restart = "always";
-      };
-    };
-
-    systemd.user.services.easyeffects = {
-      Unit = {
-        Description = "EasyEffects";
-        #After = [ "graphical-session-pre.target" ];
-        PartOf = [ "default.target" ];
-      };
-
-      Install = { WantedBy = [ "default.target" ]; };
-
-      Service = { 
-        ExecStart = "${pkgs.easyeffects}/bin/easyeffects";
-        Restart = "always";
-      };
-    };
+    #systemd.user.services.keepassxc = {
+    #  Unit = {
+    #    Description = "KeePassXC password manager";
+    #    #After = [ "graphical-session-pre.target" ];
+    #    PartOf = [ "default.target" ];
+    #  };
+#
+    #  Install = { WantedBy = [ "default.target" ]; };
+#
+    #  Service = { 
+    #    ExecStart = "${pkgs.keepassxc}/bin/keepassxc ~/.secrets.kdbx";
+    #    Restart = "always";
+    #  };
+    #};
+#
+    #systemd.user.services.easyeffects = {
+    #  Unit = {
+    #    Description = "EasyEffects";
+    #    #After = [ "graphical-session-pre.target" ];
+    #    PartOf = [ "default.target" ];
+    #  };
+#
+    #  Install = { WantedBy = [ "default.target" ]; };
+#
+    #  Service = { 
+    #    ExecStart = "${pkgs.easyeffects}/bin/easyeffects";
+    #    Restart = "always";
+    #  };
+    #};
 
     home.stateVersion = "22.11";
   };
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index 414a70c..5bba267 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -51,7 +51,8 @@
       };
       zsh = {
         enable = true;
-        enableAutosuggestions = true;
+        #enableAutosuggestions = true;
+        autosuggestion.enable = true;
         enableVteIntegration = true;
         autocd = true;
 
-- 
cgit 1.4.1