help

hosts/subsurface/default.nix

@@ -11,8 +11,10 @@
       dolphin
       discord
       wl-clipboard
+      firefox-wayland
       inkscape
       blender
+      polymc
     ];
   };
 
@@ -55,6 +57,9 @@
          neovim.enable = true;
          codium.enable = true;
       };
+      gaming = {
+        minecraft.enable = true;
+      };
     };
     dev = {
       llvm.enable = true;

hosts/subsurface/hardware-configuration.nix

@@ -60,7 +60,7 @@
     "/" = {
       device = "/dev/disk/by-uuid/e1416adb-648e-4b34-b665-8305b7a765f8";
       fsType = "f2fs";
-      options = [ "defaults" "noatime" "noadirtime" ];
+      options = [ "defaults" "noatime" "nodiratime" ];
     };
 
     "/boot" = {
@@ -75,7 +75,7 @@
 
     "/run/media/aether/bf2d91f1-a6b3-4629-8755-76301b3f6f56" = {
       device = "/dev/disk/by-uuid/bf2d91f1-a6b3-4629-8755-76301b3f6f56";
-#      fsType = "ext4";
+      fsType = "f2fs";
       options = [ "defaults" "noatime" "nodiratime" "user" "nofail" ];
     };
 
@@ -89,12 +89,13 @@
       device = "/run/media/aether/bf2d91f1-a6b3-4629-8755-76301b3f6f56/home delta/Pictures";
       options = [ "bind" ];
     };
+*/
 
     "/home/aether/Documents" = {
       device = "/run/media/aether/bf2d91f1-a6b3-4629-8755-76301b3f6f56/home delta/Documents";
       options = [ "bind" ];
     };
-*/
+
     "/home/aether/Music" = {
       device = "/run/media/aether/bf2d91f1-a6b3-4629-8755-76301b3f6f56/home delta/home delta delta/Music";
       options = [ "bind" ];

modules/desktop/apps/firefox.nix

@@ -8,17 +8,15 @@ in {
   options.modules.desktop.apps.firefox = {
     enable = mkOption {
       type = types.bool;
-      default = trace "penis" false;
+      default = false;
     };
   };
 
-  config = mkIf cfg.enable {
-/*
-    user.packages = with pkgs; [
+  config = trace "penis" (mkIf cfg.enable {
+    user.packages = mkMerge (if wayland then with pkgs; [
       firefox-wayland
-#      firefox
-    ];
-*/
-    user.packages = abort "sussy balls";
-  };
+    ] else with pkgs; [
+      firefox
+    ]);
+  });
 }

modules/desktop/apps/menus/nwggrid.nix

@@ -16,6 +16,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    config.modules.desktop.apps.nwg-launchers.enale = true;
+    modules.desktop.apps.nwg-launchers.enable = true;
   };
 }

modules/desktop/apps/nwg-launchers.nix

@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.desktop.nwg-launchers;
+  cfg = config.modules.desktop.apps.nwg-launchers;
 in {
-  options.modules.desktop.nwg-launchers = {
-    enable = mkOptions {
+  options.modules.desktop.apps.nwg-launchers = {
+    enable = mkOption {
       type = types.bool;
       default = false;
     };

modules/desktop/gaming/minecraft.nix

@@ -13,6 +13,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home._.packages.polymc.enable = true;
+    user.packages = [ polymc ];
   };
 }

modules/shell/fish.nix

@@ -0,0 +1,33 @@
+{ config, lib, options, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.modules.shell.fish;
+  cfgDir = config.configDir;
+in {
+/*
+  options.modules.shell.fish = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+    };
+    executable = mkOption {
+      type = types.str;
+      default = "${pkgs.fish}/bin/fish";
+    };
+  };
+
+  config = cfg.enable {
+    home._.programs.fish = {
+      enable = true;
+    };
+
+    home.configFile = {
+      "fish" = {
+        source = "${cfgDir}/fish";
+        target = "$HOME.config/fish";
+      };
+    };
+  };
+*/
+}

modules/shell/zsh.nix

@@ -3,7 +3,6 @@
 with lib;
 let
   cfg = config.modules.shell.zsh;
-  inherit (config) configDir;
 in {
   options.modules.shell.zsh = {
     enable = mkOption {
@@ -12,7 +11,7 @@ in {
     };
     executable = mkOption {
       type = types.str;
-      default = "${pkgs.fish}/bin/zsh";
+      default = "${pkgs.zsh}/bin/zsh";
     };
   };
 
@@ -26,7 +25,7 @@ in {
       enableCompletion = true;
       enableAutosuggestions = true;
 #      dotDir = "${config.home.configFile."zsh".source}";
-     dotDir = ".config/zsh";
+      dotDir = ".config/zsh";
       history = {
         path = "$XDG_DATA_HOME/zsh/zsh_history";
         save = 1000;

modules/theme/still/default.nix

@@ -23,7 +23,7 @@ in {
           "sway" = { source = ./config/sway; target = "$HOME.config/sway"; recursive = true; };
         })
 
-        (mkIf desktop.nwg-launchers.enable {
+        (mkIf desktop.apps.nwg-launchers.enable {
           "nwg-launchers/nwggrid/style.css" = { source = ./config/nwggrid/style.css; };
         })
       ];