Home/Darwinix: Set environment variables

README.md

@@ -3,7 +3,6 @@
 Modular NixOS configuration, using [Niri](https://github.com/niri-wm/niri) and [Waybar](https://github.com/Alexays/Waybar) for a light desktop.
 
 ![](FastFetch.png)
-![](Darwin.png)
 
 To install, run `nixos-rebuild` with the `--flake` parameter from the `NixFlake` directory: `nixos-rebuild switch --flake .#nixinator`.
 Alternatively, use `nh os switch` or `nh os boot`.

home/homemodules/fish/default.nix

@@ -45,18 +45,6 @@ in {
     programs.fish = lib.mkMerge [
       # Darwin exclusive config
       (lib.mkIf pkgs.stdenv.isDarwin {
-        shellInit = ''
-          set fish_greeting
-          yes | fish_config theme save "system-theme"
-
-          set --global --export HOMEBREW_PREFIX "/opt/homebrew"
-          set --global --export HOMEBREW_CELLAR "/opt/homebrew/Cellar"
-          set --global --export HOMEBREW_REPOSITORY "/opt/homebrew"
-          fish_add_path --global --move --path "/opt/homebrew/bin" "/opt/homebrew/sbin"
-          if test -n "$MANPATH[1]"; set --global --export MANPATH ''' $MANPATH; end;
-          if not contains "/opt/homebrew/share/info" $INFOPATH; set --global --export INFOPATH "/opt/homebrew/share/info" $INFOPATH; end;
-        '';
-
         shellAbbrs = let
           # These can be used for my config.homemodules and for HM config.programs,
           # as both of these add the package to home.packages
@@ -78,11 +66,6 @@ in {
       (lib.mkIf pkgs.stdenv.isLinux {
         generateCompletions = nixosConfig.programs.fish.generateCompletions;
 
-        shellInit = ''
-          set fish_greeting
-          yes | fish_config theme save "system-theme"
-        '';
-
         functions = lib.mergeAttrsList [
           (lib.optionalAttrs config.homemodules.nnn.enable {
             nnncd = {
@@ -245,6 +228,11 @@ in {
           ];
 
         plugins = [];
+
+        shellInit = ''
+          set fish_greeting
+          yes | fish_config theme save "system-theme"
+        '';
       }
     ];
 

system/darwinix/default.nix

@@ -34,7 +34,7 @@
   };
 
   networking = {
-    hostName = "${hostname}";
+    hostname = "${hostname}";
     localHostName = "${hostname}";
     computerName = "${hostname}";
 
@@ -46,11 +46,6 @@
       blockAllIncoming = false;
     };
 
-    knownNetworkServices = [
-      "Wi-Fi"
-      "Thunderbold Bridge"
-    ];
-
     dns = [
       "192.168.86.26"
       "8.8.8.8"
@@ -61,8 +56,8 @@
   };
 
   power = {
-    # restartAfterFreeze = false;
+    restartAfterFreeze = false;
-    # restartAfterPowerFailure = false;
+    restartAfterPowerFailure = false;
 
     sleep = {
       computer = 10; # 10 minutes until sleep
@@ -72,18 +67,13 @@
   };
 
   system = {
-    primaryUser = "${username}";
-
     # TODO:
     defaults = {
       # dock = {};
 
       trackpad = {
-        ActuateDetents = true; # Haptic feedback
+        ActuateDetents = true;
         ActuationStrength = 1;
-        Clicking = true; # Tap to click
-        Dragging = true; # Double tap to drag
-        TrackpadRightClick = true;
       };
     };