From 1c68283f067d1edb10236dc9c45bad6ec54ca8e6 Mon Sep 17 00:00:00 2001
From: Schrottkatze <git@schrottkatze.de>
Date: Mon, 25 Sep 2023 19:24:42 +0200
Subject: [PATCH] meow

---
 common.nix                                    | 30 ++++++++++--
 hosts/catbook-j/configuration.nix             | 28 ++++++++++-
 .../monosodium-glutamate-g/configuration.nix  | 48 +++++++++----------
 modules/desktop/default.nix                   |  7 +++
 4 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/common.nix b/common.nix
index d524cfd..423e577 100644
--- a/common.nix
+++ b/common.nix
@@ -50,6 +50,25 @@ with builtins;
     };
   };
 
+  console.colors = [
+    "282828"
+    "cc241d"
+    "98971a"
+    "d79921"
+    "458588"
+    "b16286"
+    "689d6a"
+    "a89984"
+    "928374"
+    "fb4934"
+    "b8bb26"
+    "fabd2f"
+    "83a598"
+    "d3869b"
+    "8ec07c"
+    "ebdbb2"
+  ];
+
   programs = {
     dconf.enable = true;
 
@@ -66,10 +85,10 @@ with builtins;
     home.sessionVariables.TZ = nixosConfig.time.timeZone;
   };
 
-  #nixpkgs.config.packageOverrides = pkgs: {
-    #sudo = pkgs.sudo.override { withInsults = true; };
-  #};
-  #security.sudo.extraConfig = "Defaults insults";
+  nixpkgs.config.packageOverrides = pkgs: {
+   sudo = pkgs.sudo.override { withInsults = true; };
+  };
+  security.sudo.extraConfig = "Defaults insults";
 
   boot.kernel.sysctl."vm.max_map_count" = 2147483642;
 
@@ -93,6 +112,7 @@ users.users.jade = {
     algorithm = "zstd";
   };
 
-  users.defaultUserShell = pkgs.nushell.override { additionalFeatures = (p: p ++ ["dataframe"]); };
+  # users.defaultUserShell = pkgs.nushell.override { additionalFeatures = (p: p ++ ["dataframe" "extra"]); };
+  users.defaultUserShell = pkgs.nushellFull;
 }
 
diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix
index 8348d95..2db92c3 100644
--- a/hosts/catbook-j/configuration.nix
+++ b/hosts/catbook-j/configuration.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 let
   evremap = pkgs.rustPlatform.buildRustPackage {
     pname = "evremap";
@@ -82,6 +82,32 @@ in {
     };
   };
 
+  nixpkgs = {
+    overlays = [
+      (self: super: {
+        linux_zen_xeniafied = pkgs.linuxPackagesFor (pkgs.linuxKernel.kernels.linux_zen.override {
+          structuredExtraConfig = with lib.kernel; {
+            "FB" = yes;
+            "FRAMEBUFFER_CONSOLE" = yes;
+            "VGA_CONSOLE" = yes;
+            "VIDEO_SELECT" = yes;
+            LOGO = lib.mkForce yes;
+            LOGO_LINUX_CLUT224 = yes;
+          };
+          ignoreConfigErrors = true;
+        });
+      })
+    ];
+  };
+
+  boot.kernelPackages = pkgs.linuxPackages_zen;
+  boot.kernelPatches = [ 
+    {
+      name = "fomx";
+      patch = ../../other/0001-fomx.patch;
+    } 
+  ];
+
   services.xserver.displayManager.autoLogin = {
     enable = true;
     user = "jade";
diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix
index 2164c40..dee73a9 100644
--- a/hosts/monosodium-glutamate-g/configuration.nix
+++ b/hosts/monosodium-glutamate-g/configuration.nix
@@ -10,23 +10,23 @@
       ../../modules
   ];
 
-  #nixpkgs = {
-    #overlays = [
-      #(self: super: {
-        #linux_zen_xeniafied = pkgs.linuxPackagesFor (pkgs.linuxKernel.kernels.linux_zen.override {
-          #structuredExtraConfig = with lib.kernel; {
-            #"FB" = yes;
-            #"FRAMEBUFFER_CONSOLE" = yes;
-            #"VGA_CONSOLE" = yes;
-            #"VIDEO_SELECT" = yes;
-            #LOGO = lib.mkForce yes;
-            #LOGO_LINUX_CLUT224 = yes;
-          #};
-          #ignoreConfigErrors = true;
-        #});
-      #})
-    #];
-  #};
+  # nixpkgs = {
+  #   overlays = [
+  #     (self: super: {
+  #       linux_zen_xeniafied = pkgs.linuxPackagesFor (pkgs.linuxKernel.kernels.linux_zen.override {
+  #         structuredExtraConfig = with lib.kernel; {
+  #           "FB" = yes;
+  #           "FRAMEBUFFER_CONSOLE" = yes;
+  #           "VGA_CONSOLE" = yes;
+  #           "VIDEO_SELECT" = yes;
+  #           LOGO = lib.mkForce yes;
+  #           LOGO_LINUX_CLUT224 = yes;
+  #         };
+  #         ignoreConfigErrors = true;
+  #       });
+  #     })
+  #   ];
+  # };
 
   jade = {
     flatpak.enable = true;
@@ -57,13 +57,13 @@
     # latest linux kernel
     #boot.kernelPackages = pkgs.linuxPackages_latest;
     #boot.kernelPackages = pkgs.linux_zen_xeniafied;
-    kernelPackages = pkgs.linuxPackages_zen;
-    #boot.kernelPatches = [ 
-      #{
-        #name = "fomx";
-        #patch = ../other/0001-fomx.patch;
-      #} 
-    #];
+    boot.kernelPackages = pkgs.linuxPackages_zen;
+    # boot.kernelPatches = [ 
+    #   {
+    #     name = "fomx";
+    #     patch = ../other/0001-fomx.patch;
+    #   } 
+    # ];
 
     binfmt.emulatedSystems = [ "aarch64-linux" ];
   };
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index b450790..ca4bd97 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -153,6 +153,7 @@ in with lib; {
       notifications.x11.enable = true;
       notifications.test = true; 
     };
+    services.colord.enable = true;
 
     home-manager.users.jade = { pkgs, ... }: {
       programs.bat = {
@@ -167,6 +168,9 @@ in with lib; {
         enable = true;
         package = config.users.defaultUserShell;
         configFile.source = ../../other/config.nu;
+        extraConfig = ''
+          source ${pkgs.nu_scripts}/share/nu_scripts/modules/nix/nix.nu;
+        '';
       };
       programs.ripgrep = {
         enable = true;
@@ -196,6 +200,9 @@ in with lib; {
 
         magic-wormhole-rs
 
+        argyllcms
+        displaycal
+
         # carapace completer
         carapace