added host Marisa (haven't tested config yet)

satori/boot.nix

@@ -1,8 +1,6 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{lib, config, pkgs, ... }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
   boot = {
     kernelPackages = pkgs.linuxPackagesFor (pkgs.linux_zen.override {
       structuredExtraConfig = with lib.kernel; {

satori/hardware.nix

@@ -9,7 +9,7 @@
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/4c02ddf5-d00e-4d84-856f-c327ae44d047";
       fsType = "btrfs";
-      options = ["compress-force=zstd:4"];
+      options = ["compress-force=zstd:2"];
     };
 
   fileSystems."/boot/efi" =
@@ -40,7 +40,7 @@
   fileSystems."/mnt/LinuxGames" = 
   { device = "/dev/sda5";
     fsType = "btrfs";
-    options = ["rw" "compress-force=zstd:4"];
+    options = ["rw" "compress-force=zstd:2"];
   };
 
   swapDevices = [ {device = "/dev/nvme0n1p7";} ];

satori/networking.nix

@@ -1,4 +1,4 @@
-{lib, config,  ... }:
+{config,  ... }:
 
 {
   networking = {
@@ -15,6 +15,6 @@
       };
     };
     defaultGateway = "192.168.0.1";
-    nameservers = [ "192.168.0.1" ];
+    nameservers = [ "1.1.1.1" "8.8.8.8" ];
   };
 }

satori/pkgs.nix

@@ -28,6 +28,7 @@
     dmenu
     st
     kbd
+    cachix
   ];
   programs = {
     steam.enable = true;
@@ -38,13 +39,23 @@
         pinentryFlavor = "curses";
       };
     };
-    fish.enable = true;
+    zsh = {
+      enable = true;
+      promptInit = "PROMPT='%F{cyan}%~ %F{blue}>%f '\nRPROMPT='%F{cyan}%n%f@%F{red}%m'";
+      histSize = 12000;
+      enableCompletion = true;
+      syntaxHighlighting.enable = true;
+      autosuggestions. enable = true;
+      ohMyZsh.enable = true;
+    };
     dconf.enable = true;
+    adb.enable = true;
   };
   nix = {
     package = pkgs.nixUnstable;
     extraOptions = ''
       experimental-features = nix-command ca-references flakes
     '';
+    trustedUsers = [ "root" "natto" ];
   };
 }

satori/stuff.nix

@@ -1,10 +1,5 @@
-{lib, config, agenix, pkgs, ... }:
+{config, agenix, pkgs, ... }:
 {
-  imports = [
-    ./stuff/fonts.nix
-    ./stuff/users.nix
-    ./stuff/services.nix
-  ];
   time.timeZone = "Asia/Kolkata";
   environment = {
     sessionVariables = {
@@ -30,8 +25,16 @@
     automatic = false;
     dates = "20:15";
   };
-  nixpkgs.config = {
-    allowUnfree = true;
-    allowBroken = true;
+  fonts.fonts = with pkgs; [
+    fira-mono
+    font-awesome
+    vistafonts
+    noto-fonts-cjk
+  ];
+  users.users.natto = {
+    isNormalUser = true;
+    shell = pkgs.zsh;
+    home = "/home/natto";
+    extraGroups = [ "wheel" "adbusers" ];
   };
 }

satori/stuff/fonts.nix

@@ -1,12 +0,0 @@
-{lib, config, pkgs, ... }:
-
-{
-  fonts.fonts = with pkgs; [
-    fira-mono
-    font-awesome-ttf
-    powerline-fonts
-    vistafonts
-    noto-fonts-cjk
-    noto-fonts-emoji
-  ];
-}

satori/stuff/users.nix

@@ -1,10 +0,0 @@
-{config, pkgs, ... }:
-
-{
-  users.users.natto = {
-    isNormalUser = true;
-    shell = pkgs.fish;
-    home = "/home/natto";
-    extraGroups = [ "wheel" "video" "audio" ];
-  };
-}