From 7a49be2b82194580de62cf7acb14c252a511b729 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sat, 24 Feb 2024 08:44:26 +0000
Subject: [PATCH] Set cursor theme using stylix

Misc cleanup of flake.nix
---
 flake.nix                 | 70 ++++++++++++++-------------------------
 home/emacs/default.nix    |  2 --
 home/hyprland/default.nix |  5 ---
 3 files changed, 25 insertions(+), 52 deletions(-)

diff --git a/flake.nix b/flake.nix
index b5f130a9..ecff9b2b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,35 +19,19 @@
     stylix,
     ...
   }: let
-    default = {
-      hostName = "Atlas";
-      user = "xenia";
-      system = "x86_64-linux";
-      group = "users";
-      shell = "zsh";
-      wallpaper = ./wallpapers/default.jpg;
-      base16Scheme = ./schemes/modus-vivendi-tinted.yaml;
-      accentColour = "base0E"; # magenta
-      systemModules = [./system/hyprland.nix];
-      serviceModules = [];
-      homeModules = [./home/hyprland/default.nix];
-      stateVersion = "23.05";
-    };
     systemConfig = {
-      hostName ? default.hostName,
-      user ? default.user,
-      system ? default.system,
-      group ? default.group,
-      shell ? default.shell,
-      wallpaper ? default.wallpaper,
-      base16Scheme ? default.base16Scheme,
-      accentColour ? default.accentColour,
-      systemModules ? default.systemModules,
-      serviceModules ? default.serviceModules,
-      homeModules ? default.homeModules,
-      stateVersion ? default.stateVersion,
+      hostName ? "Atlas",
+      user ? "xenia",
+      system ? "x86_64-linux",
+      stateVersion ? "23.05",
+      systemModules ? [./system/hyprland.nix],
+      homeModules ? [./home/hyprland/default.nix],
     }: let
-      specialArgs = {inherit hostName user group shell accentColour;};
+      shell = "zsh";
+      specialArgs = {
+        inherit hostName user;
+        accentColour = "base0E"; # magenta
+      };
     in
       nixpkgs.lib.nixosSystem {
         inherit system specialArgs;
@@ -57,12 +41,7 @@
             ./hosts/${hostName}/hardware-configuration.nix
             home-manager.nixosModules.home-manager
             stylix.nixosModules.stylix
-            ({
-              config,
-              lib,
-              pkgs,
-              ...
-            }: let
+            ({pkgs, ...}: let
               flakeURL = "https://git.xenia.me.uk/xenia/nixos.git?ref=main";
             in {
               boot.loader = {
@@ -145,8 +124,6 @@
                   flags = [
                     "--update-input"
                     "nixpkgs"
-                    "--update-input"
-                    "home-manager"
                     "--no-write-lock-file"
                     "-L" # print build logs
                   ];
@@ -158,14 +135,14 @@
                 firewall.enable = true;
               };
               stylix = {
-                inherit base16Scheme;
+                base16Scheme = ./schemes/modus-vivendi-tinted.yaml;
                 autoEnable = false;
                 targets = {
                   chromium.enable = true;
                   console.enable = true;
                   fish.enable = true;
                 };
-                image = wallpaper;
+                image = ./wallpapers/default.jpg;
                 polarity = "dark";
                 opacity = {
                   applications = 0.85;
@@ -173,6 +150,11 @@
                   popups = 0.5;
                   terminal = 0.85;
                 };
+                cursor = {
+                  package = pkgs.volantes-cursors;
+                  name = "volantes_cursors";
+                  size = 24;
+                };
                 fonts = rec {
                   sizes = {
                     applications = 16;
@@ -217,7 +199,7 @@
                 in {
                   root.openssh = {inherit authorizedKeys;};
                   ${user} = {
-                    inherit group;
+                    group = "users";
                     isNormalUser = true;
                     description = "Evie Litherland-Smith";
                     extraGroups = ["networkmanager" "wheel" "video" "input" "uinput"];
@@ -261,8 +243,7 @@
               };
             })
           ]
-          ++ systemModules
-          ++ serviceModules;
+          ++ systemModules;
       };
   in {
     nixosConfigurations = {
@@ -275,14 +256,13 @@
       in
         systemConfig {
           inherit hostName user system;
-          systemModules = [./system/default.nix];
-          serviceModules = [
+          systemModules = [
+            ./system/default.nix
             ./services/adguardhome.nix
             ./services/caddy.nix
             ./services/gitea.nix
             ./services/grafana.nix
             ./services/minecraft.nix
-            # ./services/ntfy-sh.nix
             ./services/sshd.nix
             ./services/syncthing.nix
           ];
@@ -298,7 +278,7 @@
       in
         systemConfig {
           inherit hostName user system;
-          systemModules = default.systemModules ++ [./system/games.nix];
+          systemModules = [./system/hyprland.nix ./system/games.nix];
         };
 
       Vanguard = let
@@ -308,7 +288,7 @@
       in
         systemConfig {
           inherit hostName user system;
-          systemModules = default.systemModules ++ [./system/games.nix];
+          systemModules = [./system/hyprland.nix ./system/games.nix];
         };
 
       ## Work
diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index 348b0443..e4b0ab40 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  shell,
   ...
 }: {
   imports = [../git/default.nix ../prog/default.nix];
@@ -15,7 +14,6 @@
       font = "${stylix.fonts.monospace.name}-${toString stylix.fonts.sizes.applications}";
       alpha = "${toString (floor (mul stylix.opacity.applications 100))}";
     in ''
-      (customize-set-variable 'shell-file-name "${pkgs.${shell}}/bin/${shell}")
       (add-to-list 'initial-frame-alist '(font . "${font}"))
       (add-to-list 'default-frame-alist '(font . "${font}"))
       (add-to-list 'initial-frame-alist '(alpha-background . ${alpha}))
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index ae2aa219..09462e0b 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -50,11 +50,6 @@
   };
   gtk = {
     enable = true;
-    cursorTheme = {
-      package = pkgs.volantes-cursors;
-      name = "volantes_cursors";
-      size = 24;
-    };
     iconTheme = {
       package = pkgs.sweet-folders;
       name = "Sweet-Rainbow";