Reducing common

flake.nix

@@ -112,7 +112,11 @@
               }
             ];
         };
+
+      base = mkNixosSystem "x86_64-linux" [./nixos/base] [outputs.homeManagerModules.base];
     in {
+      base = base;
+      nixos = base; # alias
       dragon = mkNixosSystem "x86_64-linux" [./nixos/dragon] (with outputs.homeManagerModules; [
         dragon
       ]);

modules/home-manager/base.nix

@@ -0,0 +1,5 @@
+{outputs, ...}: {
+  imports = with outputs.homeManagerModules; [
+    sway
+  ];
+}

modules/home-manager/common.nix

@@ -62,14 +62,15 @@
     ];
   };
 
-  programs.password-store = {
+  # TODO: not common?
-    enable = true;
+  # programs.password-store = {
-    package = pkgs.pass.withExtensions (exts: [exts.pass-otp]);
+  #   enable = true;
-  };
+  #   package = pkgs.pass.withExtensions (exts: [exts.pass-otp]);
+  # };
 
-  programs.gitui = {
+  # programs.gitui = {
-    enable = true;
+  #   enable = true;
-  };
+  # };
 
   programs.direnv = {
     enable = true;
@@ -97,6 +98,7 @@
     # fileWidgetOptions = ["--preview 'head {}'"];
   };
 
+  # TODO: regular cron or something?
   programs.nix-index = {
     enable = true;
     enableFishIntegration = true;

modules/home-manager/default.nix

@@ -32,6 +32,7 @@
   htop = import ./htop.nix;
   senpai = import ./senpai.nix;
 
+  base = import ./base.nix;
   dragon = import ./dragon.nix;
   thinker = import ./thinker.nix;
   foxtrot = import ./foxtrot.nix;

modules/home-manager/dragon.nix

@@ -31,7 +31,7 @@
       output = {
         "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307" = {
           mode = "3840x2160@120Hz";
-          position = "0,0";
+          position = "${toString (builtins.ceil (2160 / 1.5))},0";
         };
 
         "Dell Inc. DELL U2720Q D3TM623" = {
@@ -39,7 +39,7 @@
           mode = "3840x2160@60Hz";
           transform = "90";
           scale = "1.5";
-          position = "3840,0";
+          position = "0,0";
         };
       };
 

modules/nixos/common.nix

@@ -8,6 +8,8 @@
   pkgs,
   ...
 }: {
+  networking.hostName = lib.mkDefault "nixoslyte";
+
   imports = [
     inputs.home-manager.nixosModules.home-manager
   ];
@@ -26,51 +28,51 @@
 
     systemPackages = with pkgs;
       [
-        age
+        # age
-        bat
+        # bat
-        bc
+        # bc
-        bind
+        # bind
-        bottom
+        # bottom
-        btrfs-progs
+        # btrfs-progs
-        cue
+        # cue
         curl
-        dogdns
+        # dogdns
         dua
         eza
         fd
         file
         fzf
         gnumake
-        gron
+        # gron
-        hexyl
+        # hexyl
         iputils
-        jq
+        # jq
         killall
         less
         mosh
-        nmap
+        # nmap
         nettools
         openssl
-        pciutils
+        # pciutils
-        pv
+        # pv
-        rclone
+        # rclone
-        restic
+        # restic
         ripgrep
         rsync
-        rtx
+        # rtx
         sd
-        sops
+        # sops
         smartmontools
-        sqlite
+        # sqlite
-        skim
+        # skim
-        sysstat
+        # sysstat
         unzip
-        usbutils
+        # usbutils
-        watchexec
+        # watchexec
         wget
-        xh
+        # xh
         zellij
-        zstd
+        # zstd
       ]
       ++ (with inputs.home-manager.packages.${system}; [
         home-manager
@@ -168,6 +170,7 @@
       allowedUDPPorts = lib.mkDefault [];
     };
 
+    # TODO: podman equivalent?
     extraHosts = ''
       ::1 host.docker.internal
       127.0.0.1 host.docker.internal
@@ -245,9 +248,10 @@
     defaultUserShell = pkgs.fish;
   };
 
-  services.udev.extraRules = ''
+  # TODO: should not be in common?
-    # https://betaflight.com/docs/wiki/archive/Installing-Betaflight#step-1
+  # services.udev.extraRules = ''
-    # ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="2e3c", ATTRS{idProduct}=="df11", MODE="0664", GROUP="uucp"
+  #   # https://betaflight.com/docs/wiki/archive/Installing-Betaflight#step-1
-    # ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE="0664", GROUP="uucp"'
+  #   # ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="2e3c", ATTRS{idProduct}=="df11", MODE="0664", GROUP="uucp"
-  '';
+  #   # ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE="0664", GROUP="uucp"'
+  # '';
 }

nixos/base/default.nix

@@ -0,0 +1,55 @@
+{
+  flake,
+  inputs,
+  outputs,
+  lib,
+  config,
+  modulesPath,
+  ...
+}: {
+  imports =
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
+      inputs.disko.nixosModules.disko
+      flake.diskoConfigurations.standard
+    ]
+    ++ (with outputs.nixosModules; [
+      desktop-usage
+      wifi
+    ]);
+
+  nixpkgs = {
+    overlays = [
+      outputs.overlays.additions
+      outputs.overlays.modifications
+      outputs.overlays.unstable-packages
+    ];
+    config = {
+      allowUnfree = true;
+    };
+  };
+
+  nix = {
+    registry = lib.mapAttrs (_: value: {flake = value;}) inputs;
+    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
+
+    settings = {
+      experimental-features = "nix-command flakes";
+      auto-optimise-store = true;
+    };
+  };
+
+  # not necessarily "base", but all my machines are UEFI so...
+  boot.loader.systemd-boot.enable = true;
+
+  networking = {
+    firewall = {
+      enable = true;
+      allowPing = true;
+      allowedTCPPorts = [22];
+      allowedUDPPorts = [];
+    };
+  };
+
+  system.stateVersion = "23.11";
+}