nixos: system revamp

hosts/desktop/configuration.nix

@@ -7,7 +7,9 @@
 }: {
   imports = [
     inputs.sops-nix.nixosModules.sops
-    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+    ../../modules/linuxDev.nix
+    ../../modules/system.nix
   ];
 
   environment.systemPackages = with pkgs; [];

hosts/macos/darwin.nix

@@ -5,7 +5,7 @@
   ...
 }: {
   imports = [
-    ../../modules/dev.nix
+    ../../modules/macosDev.nix
     inputs.sops-nix.darwinModules.sops
   ];
   # List packages installed in system profile. To search by name, run:

modules/linuxDev.nix

@@ -0,0 +1,7 @@
+{...}: {
+  imports = [
+    ../system/dev/tools.nix
+    ../system/dev/python.nix
+    ../system/dev/linux.nix
+  ];
+}

modules/system.nix

@@ -1,4 +1,12 @@
 {...}: {
   imports = [
+    ../system/users.nix
+    ../system/hardware.nix
+    ../system/locale.nix
+    ../system/network.nix
+    ../system/programs.nix
+    ../system/services.nix
+    ../system/tty.nix
+    ../system/firewall.nix
   ];
 }

system/firewall.nix

@@ -0,0 +1,9 @@
+{...}: {
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+}

system/hardware.nix

@@ -0,0 +1,9 @@
+{myConfig, ...}: {
+  hardware = {
+    logitech.wireless.enable = myConfig.linux.logitech-hardware.enable;
+    bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+    };
+  };
+}

system/locale.nix

@@ -0,0 +1,4 @@
+{myConfig, ...}: {
+  i18n.defaultLocale = "en_US.UTF-8";
+  time.timeZone = "${myConfig.general.Timezone}";
+}

system/network.nix

@@ -0,0 +1,4 @@
+{myConfig, ...}: {
+  networking.hostName = "${myConfig.general.Hostname}";
+  networking.networkmanager.enable = true;
+}

system/programs.nix

@@ -0,0 +1,16 @@
+{pkgs, ...}: {
+  programs.bash = {
+    interactiveShellInit = ''
+      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+      then
+        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+      fi
+    '';
+  };
+
+  programs = {
+    zsh.enable = true;
+    fish.enable = true;
+  };
+}

system/services.nix

@@ -0,0 +1,8 @@
+{...}: {
+  services = {
+    openssh.enable = true;
+    libinput.enable = true;
+    blueman.enable = true;
+    printing.enable = true;
+  };
+}

system/tty.nix

@@ -0,0 +1,6 @@
+{...}: {
+  console = {
+    font = "Lat2-Terminus16";
+    useXkbConfig = true;
+  };
+}