Fish: fix

flake.lock

@@ -407,11 +407,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1734129402,
-        "narHash": "sha256-SSyk9SJ5Uu3/LhaoH2Bsgbx8fDgR6ZYQZG/13aNjL3M=",
+        "lastModified": 1734219437,
+        "narHash": "sha256-NVQIAvfSpBSJaJ4BP1cE1yVGjCuvXs0NN1G1t+f52Ss=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "3cba4ba44e7ba3cc8bb67ac71bc61245b5aca347",
+        "rev": "db249648776875ce3142141d0d3055e43ce606aa",
         "type": "github"
       },
       "original": {
@@ -633,11 +633,11 @@
     },
     "nixpkgs-smol": {
       "locked": {
-        "lastModified": 1734143535,
-        "narHash": "sha256-YVchPYuRpCFWqx6EVA1V1CY0NCTI1d3fADjOlB6oYe0=",
+        "lastModified": 1734187240,
+        "narHash": "sha256-I8cMXXWtf/+3DJT3QGm9BAp/b1oOCdKfgvpZ5XAUnp4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6160d771fb09b838abefba72df27c0c32699fe45",
+        "rev": "119bb2941c87b630c56b5e36b9ed63e3daa0e2d3",
         "type": "github"
       },
       "original": {
@@ -750,11 +750,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1734172733,
-        "narHash": "sha256-26j5mCeAIFmrTCbNyQq4H8Ikda+dX9+n6YJhHcZ6m6Y=",
+        "lastModified": 1734221225,
+        "narHash": "sha256-PQtNGbg3B93+MINMe4/mwYWZkVDNzaf+O2Hw7xDznNk=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "e06a083e1258845c7c8bcd5f4dcc2aab9964318c",
+        "rev": "12bcdb7c86a2598761a7e2ada1b1e6cd7542197c",
         "type": "github"
       },
       "original": {

flake.nix

@@ -99,6 +99,12 @@
         };
 
         epimetheus = nixpkgs.lib.nixosSystem {
+          specialArgs = {
+            inherit inputs;
+            pkgs-smol = import nixpkgs-smol {
+              inherit system;
+            };
+          };
           modules =
             [ ./hosts/epimetheus/configuration.nix disko.nixosModules.disko ];
         };

hosts/epimetheus/configuration.nix

@@ -1,9 +1,14 @@
-{ pkgs, lib, modulesPath, config, ... }: {
+{ pkgs, pkgs-smol, lib, modulesPath, config, ... }: {
 
   imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ];
 
   boot = {
-    kernelPackages = pkgs.linuxPackages_6_12;
+    supportedFilesystems = [ "zfs" ];
+    zfs = {
+      forceImportRoot = false;
+      package = pkgs-smol.zfs;
+    };
+    kernelPackages = pkgs-smol.linuxPackages_6_12;
     kernelParams = lib.mkAfter [ "noquiet" "toram" ];
     enableContainers = false;
   };

hosts/nyx/configuration.nix

@@ -18,12 +18,12 @@
       };
       efi.canTouchEfiVariables = true;
     };
-    #supportedFilesystems = [ "zfs" ];
-    #zfs = {
-    #  forceImportRoot = false;
-    #  package = pkgs.zfs;
-    #};
-    kernelPackages = pkgs.linuxPackages_6_12;
+    supportedFilesystems = [ "zfs" ];
+    zfs = {
+      forceImportRoot = false;
+      package = pkgs-smol.zfs;
+    };
+    kernelPackages = pkgs-smol.linuxPackages_6_12;
     kernel = { sysctl = { "vm.max_map_count" = 2147483642; }; };
   };
 

hosts/theia/configuration.nix

@@ -20,6 +20,10 @@
     kernel = {
       sysctl = {
         "vm.max_map_count" = 2147483642;
+        "vm.swappiness" = 200;
+        "vm.watermark_boost_factor" = 0;
+        "vm.watermark_scale_factor" = 125;
+        "vm.page-cluster" = 0;
         "net.ipv4.ip_forward" = 1;
         "net.ipv6.conf.all.forwarding" = 1;
       };
@@ -57,6 +61,11 @@
     options = [ "fmask=0022" "dmask=0022" ];
   };
 
+  swapDevices = [{
+    device = "/var/lib/swapfile";
+    size = 16 * 1024;
+  }];
+
   networking = {
     enableIPv6 = false; # Had to disable for now due to problems with resolving
     firewall = {

modules/home-manager/cli/fish/default.nix

@@ -59,13 +59,10 @@
 
     functions = {
       os-age = ''
-        function os-age
         stat / | awk '/Birth: /{print $2 " " substr($3,1,5)}'
-        end
       '';
 
       build-iso = ''
-        function build-iso
           cd ~/.config/nixos 
           nix build .#nixosConfigurations.epimetheus.config.system.build.isoImage
       '';
@@ -73,21 +70,15 @@
       # Credit for these 3
       # https://www.reddit.com/r/linux/comments/1fq0za8/comment/lp1ybdn
       disks = ''
-        function disks
         lsblk -o NAME,MOUNTPOINT,FSTYPE,FSUSE%,SIZE
-        end
       '';
 
       gr = ''
-        function gr
         set GROOT (git rev-parse --show-toplevel 2>/dev/null); and cd $GROOT; or return $argv
-        end
       '';
 
       mkcd = ''
-        function mkcd
         mkdir -p -- $argv[1] && cd $argv; or return $status
-        end
       '';
 
     };