Restructure

.github/workflows/ci.yml

@@ -15,3 +15,16 @@ jobs:
 
       - name: treefmt
         run: nix develop --command treefmt --fail-on-change
+
+  check:
+    name: Check
+    needs:
+      - formatting
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v20
+
+      - name: check
+        run: nix flake check --debug

.sops.yaml

@@ -7,7 +7,7 @@ keys:
     - &maya age1w908m223s5xg3xmsm3zxwxcudryc4hcp8xk5kveq09kgupjtpqhqq4nqsd
 
 creation_rules:
-  - path_regex: home-manager/common/email/secrets.nix
+  - path_regex: modules/home-manager/email/secrets.nix
     key_groups:
       - pgp:
           - *dan

configurations/akane/home-manager/default.nix

@@ -0,0 +1,76 @@
+{
+  inputs,
+  outputs,
+}:
+inputs.home-manager.lib.homeManagerConfiguration {
+  pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
+  extraSpecialArgs = {inherit inputs outputs;};
+
+  modules = [
+    ../../../modules/home-manager/terminal_environment
+    ../../../modules/home-manager/borgmatic.nix
+    ../../../modules/home-manager/media.nix
+    ../../../modules/home-manager/development.nix
+    ../../../modules/home-manager/desktop_environment
+
+    ({pkgs, ...}: {
+      programs.borgmatic.backups."main" = {
+        location = {
+          sourceDirectories = [
+            "/home/dan/docs"
+            "/home/dan/phone"
+            "/home/dan/tombs"
+          ];
+          repositories = ["ssh://[email protected]/./repo"];
+        };
+        storage.encryptionPasscommand = "pass borg/akane/passphrase";
+      };
+
+      wayland.windowManager.sway.config = {
+        input."2:7:SynPS/2_Synaptics_TouchPad" = {
+          events = "disabled";
+        };
+
+        output = {
+          LVDS-1 = {
+            enable = "";
+            bg = "~/.local/share/wallpaper.png fill";
+          };
+        };
+      };
+
+      home.file.wallpaper = {
+        source = ./wallpaper.png;
+        target = ".local/share/wallpaper.png";
+      };
+
+      programs.i3status-rust.bars.main.blocks = [
+        {
+          block = "sound";
+          driver = "pulseaudio";
+          device_kind = "sink";
+        }
+        {
+          block = "sound";
+          driver = "pulseaudio";
+          device_kind = "source";
+        }
+        {
+          block = "battery";
+        }
+        {
+          block = "time";
+          interval = 1;
+          format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M:%S') ";
+        }
+      ];
+
+      services.mpd.enable = true;
+
+      home.packages = with pkgs; [
+        scrcpy
+        inputs.satori.packages.${system}.satorictl
+      ];
+    })
+  ];
+}

configurations/akane/nixos/default.nix

@@ -0,0 +1,43 @@
+{
+  inputs,
+  outputs,
+}:
+inputs.nixpkgs.lib.nixosSystem {
+  specialArgs = {inherit inputs outputs;};
+
+  modules = [
+    ./hardware-configuration.nix
+    inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x230
+    inputs.nixos-hardware.nixosModules.common-pc-ssd
+
+    inputs.sops-nix.nixosModules.sops
+    ../../../modules/nixos/adb.nix
+    ../../../modules/nixos/base.nix
+    ../../../modules/nixos/dan
+    ../../../modules/nixos/dan/secrets
+    ../../../modules/nixos/desktop-environment.nix
+    ../../../modules/nixos/encrypted-dns.nix
+    ../../../modules/nixos/locale.nix
+    ../../../modules/nixos/networkmanager.nix
+    ../../../modules/nixos/scanner.nix
+    ../../../modules/nixos/sound.nix
+    ../../../modules/nixos/ssh.nix
+    ../../../modules/nixos/syncthing.nix
+
+    {
+      boot = {
+        loader.systemd-boot.enable = true;
+        loader.efi.canTouchEfiVariables = true;
+        initrd.secrets."/crypto_keyfile.bin" = null;
+      };
+
+      networking.hostName = "akane";
+
+      users.users.dan.extraGroups = ["dialout"];
+
+      virtualisation.podman.enable = true;
+      services.upower.enable = true;
+      services.tailscale.enable = true;
+    }
+  ];
+}

configurations/generic/home-manager/default.nix

@@ -0,0 +1,20 @@
+{
+  inputs,
+  outputs,
+}:
+inputs.home-manager.lib.homeManagerConfiguration {
+  pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
+  extraSpecialArgs = {inherit inputs outputs;};
+
+  modules = [
+    ../../../modules/home-manager/terminal_environment
+    ../../../modules/home-manager/development.nix
+
+    {
+      # home = {
+      #   username = "dan";
+      #   homeDirectory = "/home/dan";
+      # };
+    }
+  ];
+}

configurations/kawashiro/home-manager/default.nix

@@ -0,0 +1,49 @@
+{
+  inputs,
+  outputs,
+}:
+inputs.home-manager.lib.homeManagerConfiguration {
+  pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
+  extraSpecialArgs = {inherit inputs outputs;};
+
+  modules = [
+    ../../../modules/home-manager/terminal_environment
+    ../../../modules/home-manager/media.nix
+    ../../../modules/home-manager/development.nix
+    ../../../modules/home-manager/desktop_environment
+
+    ({pkgs, ...}: {
+      wayland.windowManager.sway.config.output = {
+        eDP-1 = {
+          enable = "";
+          bg = "#006070 solid_color";
+        };
+      };
+
+      programs.i3status-rust.bars.main.blocks = [
+        {
+          block = "sound";
+          driver = "pulseaudio";
+          device_kind = "sink";
+        }
+        {
+          block = "sound";
+          driver = "pulseaudio";
+          device_kind = "source";
+        }
+        {
+          block = "battery";
+        }
+        {
+          block = "time";
+          interval = 1;
+          format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M:%S') ";
+        }
+      ];
+
+      home.packages = with pkgs; [
+        lightburn
+      ];
+    })
+  ];
+}

configurations/kawashiro/nixos/default.nix

@@ -0,0 +1,43 @@
+{
+  inputs,
+  outputs,
+}:
+inputs.nixpkgs.lib.nixosSystem {
+  specialArgs = {inherit inputs outputs;};
+
+  modules = [
+    ./hardware-configuration.nix
+    inputs.nixos-hardware.nixosModules.common-cpu-intel
+    inputs.nixos-hardware.nixosModules.common-pc-ssd
+
+    inputs.sops-nix.nixosModules.sops
+    ../../../modules/nixos/base.nix
+    ../../../modules/nixos/dan
+    ../../../modules/nixos/dan/secrets
+    ../../../modules/nixos/desktop-environment.nix
+    ../../../modules/nixos/encrypted-dns.nix
+    ../../../modules/nixos/locale.nix
+    ../../../modules/nixos/networkmanager.nix
+    ../../../modules/nixos/sound.nix
+    ../../../modules/nixos/ssh.nix
+    ../../../modules/nixos/syncthing.nix
+
+    {
+      boot = {
+        loader.systemd-boot.enable = true;
+        loader.efi.canTouchEfiVariables = true;
+        initrd.secrets."/crypto_keyfile.bin" = null;
+      };
+
+      networking.hostName = "kawashiro";
+
+      users.users.dan.extraGroups = ["dialout" "plugdev"];
+
+      virtualisation.podman.enable = true;
+      services.upower.enable = true;
+      services.tailscale.enable = true;
+
+      hardware.rtl-sdr.enable = true;
+    }
+  ];
+}

configurations/maya/home-manager/default.nix

@@ -0,0 +1,68 @@
+{
+  inputs,
+  outputs,
+}:
+inputs.home-manager.lib.homeManagerConfiguration {
+  pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
+  extraSpecialArgs = {inherit inputs outputs;};
+
+  modules = [
+    ../../../modules/home-manager/terminal_environment
+    ../../../modules/home-manager/borgmatic.nix
+    ../../../modules/home-manager/media.nix
+    ../../../modules/home-manager/development.nix
+    ../../../modules/home-manager/email
+    ../../../modules/home-manager/desktop_environment
+
+    ({pkgs, ...}: {
+      programs.borgmatic.backups."main" = {
+        location = {
+          sourceDirectories = [
+            "/home/dan/docs"
+            "/home/dan/phone"
+            "/home/dan/tombs"
+          ];
+          repositories = ["[email protected]:repo"];
+        };
+        storage.encryptionPasscommand = "pass borg/maya/passphrase";
+      };
+
+      wayland.windowManager.sway.config.output = {
+        DP-1 = {
+          enable = "";
+          bg = "~/.local/share/wallpaper.png fill";
+          scale = "1.5";
+        };
+      };
+
+      home.file.wallpaper = {
+        source = ./wallpaper.png;
+        target = ".local/share/wallpaper.png";
+      };
+
+      programs.i3status-rust.bars.main.blocks = [
+        {
+          block = "sound";
+          driver = "pulseaudio";
+          device_kind = "sink";
+        }
+        {
+          block = "sound";
+          driver = "pulseaudio";
+          device_kind = "source";
+        }
+        {
+          block = "time";
+          interval = 1;
+          format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M:%S') ";
+        }
+      ];
+
+      services.mpd.enable = true;
+
+      home.packages = with pkgs; [
+        inputs.satori.packages.${system}.satorictl
+      ];
+    })
+  ];
+}

configurations/maya/nixos/default.nix

@@ -0,0 +1,42 @@
+{
+  inputs,
+  outputs,
+}:
+inputs.nixpkgs.lib.nixosSystem {
+  specialArgs = {inherit inputs outputs;};
+
+  modules = [
+    ./hardware-configuration.nix
+    inputs.nixos-hardware.nixosModules.common-pc-ssd
+
+    inputs.sops-nix.nixosModules.sops
+    ../../../modules/nixos/base.nix
+    ../../../modules/nixos/dan
+    ../../../modules/nixos/dan/secrets
+    ../../../modules/nixos/desktop-environment.nix
+    ../../../modules/nixos/encrypted-dns.nix
+    ../../../modules/nixos/locale.nix
+    ../../../modules/nixos/networkmanager.nix
+    ../../../modules/nixos/sound.nix
+    ../../../modules/nixos/ssh.nix
+    ../../../modules/nixos/syncthing.nix
+
+    {
+      boot = {
+        loader.systemd-boot.enable = true;
+        loader.efi.canTouchEfiVariables = true;
+        initrd.secrets."/crypto_keyfile.bin" = null;
+      };
+
+      networking.hostName = "maya";
+
+      virtualisation.podman.enable = true;
+      services.upower.enable = true;
+      services.tailscale.enable = true;
+
+      # i2c required for monitor control via ddcutil
+      hardware.i2c.enable = true;
+      users.users.dan.extraGroups = ["i2c" "dialout" "plugdev"];
+    }
+  ];
+}