From 2f60d7894ca0818e8b0f55fb4cbe599f58952ccb Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 15 Oct 2023 12:27:16 +0100
Subject: [PATCH] Bit more theming

Move nix settings to flake.nix and (hopefully) set nixpkgs to current flake
---
 flake.nix          | 35 ++++++++++++++++++++++++++++++++++-
 home/alacritty.nix |  6 ------
 home/default.nix   | 10 +++-------
 system/default.nix | 24 ------------------------
 system/desktop.nix | 10 ++++------
 5 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7ef004d0..c7239990 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,12 +82,45 @@
             ./hosts/${hostName}/hardware-configuration.nix
             home-manager.nixosModules.home-manager
             stylix.nixosModules.stylix
-            ({ pkgs, ... }: {
+            ({ config, lib, pkgs, ... }: {
               boot.loader = {
                 systemd-boot.enable = true;
                 efi.canTouchEfiVariables = true;
               };
               programs.${shell}.enable = true;
+              nix = {
+                enable = true;
+                settings = {
+                  experimental-features = [ "nix-command" "flakes" ];
+                  auto-optimise-store = true;
+                };
+                channel.enable = false;
+                nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
+                registry = {
+                  nixpkgs.to = {
+                    type = "path";
+                    path = pkgs.path;
+                  };
+                };
+                gc = {
+                  automatic = true;
+                  options = "--delete-older-than 7d";
+                };
+                optimise.automatic = true;
+                extraOptions = ''
+                  keep-outputs = true
+                  keep-derivations = true
+                  min-free = ${toString (100 * 1024 * 1024)}
+                  max-free = ${toString (1024 * 1024 * 1024)}
+                '';
+              };
+              nixpkgs.config.allowUnfreePredicate = pkg:
+                builtins.elem (lib.getName pkg) [
+                  "steam"
+                  "steam-original"
+                  "steam-run"
+                  "nomachine-client"
+                ];
               system = { inherit stateVersion; };
               networking = { inherit hostName; };
               users.users.${user} = {
diff --git a/home/alacritty.nix b/home/alacritty.nix
index 3b164825..6752b31f 100644
--- a/home/alacritty.nix
+++ b/home/alacritty.nix
@@ -1,7 +1,6 @@
 { pkgs, tokyonight-folke, ... }:
 
 {
-  stylix.targets.alacritty.enable = false;
   programs.alacritty = {
     enable = true;
     settings = {
@@ -13,11 +12,6 @@
           y = 10;
         };
         decorations = "none";
-        opacity = 0.8;
-      };
-      font = {
-        normal.family = "Fira Mono";
-        size = 14.0;
       };
       selection.save_to_clipboard = true;
       live_config_reload = true;
diff --git a/home/default.nix b/home/default.nix
index ba8d625c..33575611 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -99,17 +99,14 @@
         command_timeout = 1000;
         add_newline = true;
         character = {
-          success_symbol = "[󱢠 ❯](green)";
-          error_symbol = "[❯](red)";
+          success_symbol = "[➜](bold green)";
+          error_symbol = "[✗](bold red)";
         };
         directory = {
           truncation_length = 2;
           fish_style_pwd_dir_length = 1;
           read_only = " 󰉐";
-          # style = "bold lavender";
           truncate_to_repo = false;
-          # before_repo_root_style = "bold lavender";
-          # repo_root_style = "bold teal";
         };
         line_break.disabled = false;
         git_branch = {
@@ -126,7 +123,6 @@
         hostname = {
           ssh_only = true;
           ssh_symbol = "󰢹 ";
-          # style = "bold green";
         };
         localip.disabled = false;
         memory_usage = {
@@ -137,7 +133,7 @@
         os = {
           disabled = false;
           format = "on [$symbol $name ]($style)";
-          # style = "bold blue";
+          style = "bold blue";
           symbols = {
             Alpine = " ";
             Android = " ";
diff --git a/system/default.nix b/system/default.nix
index fa2e19b3..f432fb5a 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -1,30 +1,6 @@
 { config, lib, pkgs, ... }:
 let flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main";
 in {
-  nix = {
-    settings = {
-      experimental-features = [ "nix-command" "flakes" ];
-      auto-optimise-store = true;
-    };
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 30d";
-    };
-    extraOptions = ''
-      keep-outputs = true
-      keep-derivations = true
-      min-free = ${toString (100 * 1024 * 1024)}
-      max-free = ${toString (1024 * 1024 * 1024)}
-    '';
-  };
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (lib.getName pkg) [
-      "steam"
-      "steam-original"
-      "steam-run"
-      "nomachine-client"
-    ];
   networking = {
     networkmanager.enable = true;
     nameservers = [ "9.9.9.9" ];
diff --git a/system/desktop.nix b/system/desktop.nix
index 24eb3193..cb80d964 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -22,6 +22,10 @@
   stylix = {
     image = ./wallpapers/default.jpg;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
+    opacity = {
+      popups = 0.8;
+      terminal = 0.8;
+    };
     fonts = rec {
       emoji = {
         name = "Noto Color Emoji";
@@ -36,12 +40,6 @@
         package = pkgs.fira;
       };
       serif = sansSerif;
-      sizes = {
-        applications = 12;
-        desktop = 12;
-        popups = 12;
-        terminal = 12;
-      };
     };
     homeManagerIntegration.followSystem = true;
   };