treewide: format files

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

conf/colors.nix

@@ -1,6 +1,6 @@
 #Catpuccin Mocha
 let
-  colors = rec{
+  colors = rec {
     rosewater = "#F5E0DC";
     flamingo = "#F2CDCD";
     pink = "#F5C2E7";
@@ -37,5 +37,9 @@ in
 rec {
   default = with builtins; mapAttrs (_: color: substring 1 6 color) colors; # hex without hash
   hex = colors; # hex with hash
-  argb = { a ? "ff" }: builtins.mapAttrs (_:color: a + color) default; # ARGB
+  argb =
+    {
+      a ? "ff",
+    }:
+    builtins.mapAttrs (_: color: a + color) default; # ARGB
 }

flake.nix

@@ -2,36 +2,36 @@
   description = "dotfiles";
 
   inputs = {
-    nixpkgs.url = github:nixos/nixpkgs/nixpkgs-unstable;
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
 
-    stable.url = github:nixos/nixpkgs/release-24.05;
+    stable.url = "github:nixos/nixpkgs/release-24.05";
 
-    flake-parts.url = github:hercules-ci/flake-parts;
+    flake-parts.url = "github:hercules-ci/flake-parts";
 
     home-manager = {
-      url = github:nix-community/home-manager;
+      url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     mailserver = {
-      url = gitlab:simple-nixos-mailserver/nixos-mailserver;
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     filehost = {
-      url = github:natto1784/simpler-filehost;
+      url = "github:natto1784/simpler-filehost";
     };
 
-    nix-gaming.url = github:fufexan/nix-gaming;
+    nix-gaming.url = "github:fufexan/nix-gaming";
 
     nbfc = {
-      url = github:nbfc-linux/nbfc-linux;
+      url = "github:nbfc-linux/nbfc-linux";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    emacs-overlay.url = github:nix-community/emacs-overlay;
+    emacs-overlay.url = "github:nix-community/emacs-overlay";
 
-    nvim-overlay.url = github:nix-community/neovim-nightly-overlay;
+    nvim-overlay.url = "github:nix-community/neovim-nightly-overlay";
 
     hyprland = {
       type = "git";
@@ -40,17 +40,21 @@
     };
 
     hyprland-contrib = {
-      url = github:hyprwm/contrib;
+      url = "github:hyprwm/contrib";
     };
 
-    agenix.url = github:ryantm/agenix;
+    agenix.url = "github:ryantm/agenix";
 
-    ags.url = github:Aylur/ags/v1;
+    ags.url = "github:Aylur/ags/v1";
   };
 
-  outputs = inputs@{ self, ... }:
+  outputs =
+    inputs@{ self, ... }:
     inputs.flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = [ "x86_64-linux" "aarch64-linux" ];
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+      ];
 
       imports = [
         ./hosts
@@ -59,15 +63,18 @@
         ./conf
       ];
 
-      perSystem = { system, pkgs, ... }:
+      perSystem =
+        { system, pkgs, ... }:
         rec {
           formatter = pkgs.nixfmt-rfc-style;
-          devShells.default = with pkgs; mkShell {
+          devShells.default =
-            packages = [
+            with pkgs;
-              nixd
+            mkShell {
-              formatter
+              packages = [
-            ];
+                nixd
-          };
+                formatter
+              ];
+            };
           _module.args.pkgs = import inputs.nixpkgs {
             inherit system;
           };

home/amneesh.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, inputs, ... }:
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
 {
   home = {
     homeDirectory = "/home/amneesh";
@@ -14,7 +19,7 @@
   };
 
   imports = [
-     ./programs/emacs
+    ./programs/emacs
   ];
 
   xdg.mime.enable = true;

home/common/emacs/default.nix

@@ -24,10 +24,11 @@ in
       alwaysEnsure = true;
       alwaysTangle = true;
       defaultInitFile = true;
-      extraEmacsPackages = epkgs: with epkgs; [
+      extraEmacsPackages =
-        use-package
+        epkgs: with epkgs; [
-        (tree-sitter-langs.withPlugins (_: tree-sitter-langs.plugins))
+          use-package
-      ];
+          (tree-sitter-langs.withPlugins (_: tree-sitter-langs.plugins))
+        ];
     };
   };
   services.emacs = {

home/default.nix

@@ -1,4 +1,9 @@
-{ self, inputs, globalArgs, ... }:
+{
+  self,
+  inputs,
+  globalArgs,
+  ...
+}:
 let
   common = [
     { programs.home-manager.enable = true; }
@@ -6,15 +11,17 @@ let
     ./common/direnv
   ];
 
-  mkPkgs = system: import inputs.nixpkgs {
+  mkPkgs =
-    inherit system;
+    system:
-    config = {
+    import inputs.nixpkgs {
-      allowUnfree = true;
+      inherit system;
-      allowBroken = true;
+      config = {
-      allowInsecure = true;
+        allowUnfree = true;
+        allowBroken = true;
+        allowInsecure = true;
+      };
+      overlays = [ self.overlays.default ];
     };
-    overlays = [ self.overlays.default ];
-  };
 
   extraSpecialArgs = globalArgs;
 in
@@ -50,49 +57,57 @@ in
     // {
       spark = inputs.home-manager.lib.homeManagerConfiguration {
         inherit extraSpecialArgs;
-        modules = [{
+        modules = [
-          home = {
+          {
-            homeDirectory = "/home/spark";
+            home = {
-            username = "spark";
+              homeDirectory = "/home/spark";
-            stateVersion = "23.05";
+              username = "spark";
-          };
+              stateVersion = "23.05";
-        }] ++ common;
+            };
+          }
+        ] ++ common;
         pkgs = mkPkgs "aarch64-linux";
       };
 
       bat = inputs.home-manager.lib.homeManagerConfiguration {
         inherit extraSpecialArgs;
-        modules = [{
+        modules = [
-          home = {
+          {
-            homeDirectory = "/home/bat";
+            home = {
-            username = "bat";
+              homeDirectory = "/home/bat";
-            stateVersion = "23.05";
+              username = "bat";
-          };
+              stateVersion = "23.05";
-        }] ++ common;
+            };
+          }
+        ] ++ common;
         pkgs = mkPkgs "x86_64-linux";
       };
 
       spin = inputs.home-manager.lib.homeManagerConfiguration {
         inherit extraSpecialArgs;
-        modules = [{
+        modules = [
-          home = {
+          {
-            homeDirectory = "/home/spin";
+            home = {
-            username = "spin";
+              homeDirectory = "/home/spin";
-            stateVersion = "23.05";
+              username = "spin";
-          };
+              stateVersion = "23.05";
-        }] ++ common;
+            };
+          }
+        ] ++ common;
         pkgs = mkPkgs "x86_64-linux";
       };
 
       kero = inputs.home-manager.lib.homeManagerConfiguration {
         inherit extraSpecialArgs;
-        modules = [{
+        modules = [
-          home = {
+          {
-            homeDirectory = "/home/kero";
+            home = {
-            username = "kero";
+              homeDirectory = "/home/kero";
-            stateVersion = "24.05";
+              username = "kero";
-          };
+              stateVersion = "24.05";
-        }] ++ common;
+            };
+          }
+        ] ++ common;
         pkgs = mkPkgs "aarch64-linux";
       };
 

home/natto/ags/default.nix

@@ -1,26 +1,35 @@
-{ pkgs, lib, config, inputs, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  inputs,
+  ...
+}:
 let
   cfg = config.programs.ags;
 
-  deps = with pkgs; [
+  deps =
-    sass
+    with pkgs;
-    gawk
+    [
-    bash
+      sass
-    procps
+      gawk
-    coreutils
+      bash
-    imagemagick
+      procps
-    systemd
+      coreutils
-    config.wayland.windowManager.hyprland.package
+      imagemagick
-  ] ++ lib.optional config.isLaptop brightnessctl;
+      systemd
-
+      config.wayland.windowManager.hyprland.package
+    ]
+    ++ lib.optional config.isLaptop brightnessctl;
 
   configDir = lib.cleanSourceWith {
     src = ./.;
-    filter = name: _:
+    filter =
+      name: _:
       let
         baseName = baseNameOf (toString name);
       in
-        !(lib.hasSuffix ".nix" baseName);
+      !(lib.hasSuffix ".nix" baseName);
   };
 in
 {
@@ -28,7 +37,10 @@ in
     inputs.ags.homeManagerModules.default
   ];
 
-  programs.ags.enable = true;
+  programs.ags = {
+    enable = true;
+    #   package = pkgs.ags_1;
+  };
 
   xdg.configFile."ags" = {
     source = configDir;

home/natto/default.nix

@@ -21,10 +21,10 @@
     ./zsh.nix
     ./games.nix
 
-    /* when xserver */
+    # when xserver
     # ./xsession.nix
 
-    /* when wayland */
+    # when wayland
     ./wayland.nix
     ./hyprland.nix
     ./foot.nix

home/natto/dunst.nix

@@ -3,7 +3,9 @@
   services = {
     dunst = {
       enable = true;
-      iconTheme = with config.gtk.iconTheme; { inherit name package; };
+      iconTheme = with config.gtk.iconTheme; {
+        inherit name package;
+      };
       settings = with conf.colors.hex; {
         global = {
           mouse_left_click = "close_current";

home/natto/email.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   key = "53EC089EF230E47A83BA8F8195949BD4B853F559";
   host = "mail.weirdnatto.in";
@@ -51,18 +56,17 @@ in
       enable = true;
       package = pkgs.neomutt;
       sort = "reverse-date";
-      extraConfig =
+      extraConfig = lib.concatMapStringsSep "\n" builtins.readFile [
-        lib.concatMapStringsSep
+        ./config/neomutt/neomuttrc
-          "\n"
+        ./config/neomutt/theme
-          builtins.readFile
+      ];
-          [
-            ./config/neomutt/neomuttrc
-            ./config/neomutt/theme
-          ];
     };
   };
   home = {
-    packages = with pkgs; [ mailcap w3m ];
+    packages = with pkgs; [
+      mailcap
+      w3m
+    ];
     file = {
       mailcap = {
         source = ./config/mailcap;

home/natto/eww/default.nix

@@ -1,15 +1,21 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 {
   programs.eww = {
     enable = true;
     package = pkgs.eww;
     configDir = lib.cleanSourceWith {
       src = ./.;
-      filter = name: _:
+      filter =
+        name: _:
         let
           baseName = baseNameOf (toString name);
         in
-          !(lib.hasSuffix ".nix" baseName);
+        !(lib.hasSuffix ".nix" baseName);
     };
   };
 
@@ -20,24 +26,24 @@
     };
     Service =
       let
-        deps = [
+        deps =
-          config.programs.eww.package
+          [
-        ] ++ lib.optional
+            config.programs.eww.package
-          config.wayland.windowManager.hyprland.enable
+          ]
-          config.wayland.windowManager.hyprland.package
+          ++ lib.optional config.wayland.windowManager.hyprland.enable config.wayland.windowManager.hyprland.package
-        ++ (with pkgs; [
+          ++ (with pkgs; [
-          coreutils
+            coreutils
-          bash
+            bash
-          jq
+            jq
-          less
+            less
-          gawk
+            gawk
-          socat
+            socat
-          playerctl
+            playerctl
-          networkmanager
+            networkmanager
-          iwgtk
+            iwgtk
-          wireplumber
+            wireplumber
-        ])
+          ])
-        ++ lib.optional config.laptop pkgs.light;
+          ++ lib.optional config.laptop pkgs.light;
       in
       {
         Type = "simple";
@@ -48,4 +54,3 @@
     Install.WantedBy = [ "graphical-session.target" ];
   };
 }
-

home/natto/games.nix

@@ -11,4 +11,3 @@
 
   programs.mangohud.enable = true;
 }
-

home/natto/hyprland.nix

@@ -1,4 +1,11 @@
-{ pkgs, inputs, config, conf, ... }: {
+{
+  pkgs,
+  inputs,
+  config,
+  conf,
+  ...
+}:
+{
   wayland = {
     windowManager = {
       hyprland = {
@@ -8,16 +15,17 @@
         xwayland = {
           enable = true;
         };
-        extraConfig = (builtins.readFile ./config/hypr/hyprland.conf)
+        extraConfig =
+          (builtins.readFile ./config/hypr/hyprland.conf)
           + (with config.home.pointerCursor; ''
-          exec-once=hyprctl setcursor ${name} ${toString size}
+            exec-once=hyprctl setcursor ${name} ${toString size}
-        '')
+          '')
-          + (with conf.colors.argb { a = "ee"; };''
+          + (with conf.colors.argb { a = "ee"; }; ''
-          general {
+            general {
-            col.active_border = 0x${mauve} 0x${flamingo} 135deg
+              col.active_border = 0x${mauve} 0x${flamingo} 135deg
-            col.inactive_border = 0x${surface0}
+              col.inactive_border = 0x${surface0}
-          }
+            }
-        '');
+          '');
       };
     };
   };

home/natto/music.nix

@@ -84,7 +84,6 @@ in
     };
   };
 
-
   age.secrets.mpdasrc = {
     file = ./secrets/mpdasrc.age;
     path = "${home}/.config/mpdasrc";

home/natto/pdf.nix

@@ -16,4 +16,3 @@
     };
   };
 }
-

home/natto/pkgs.nix

@@ -1,46 +1,54 @@
-{ flake, pkgs, config, ... }:
 {
-  home.packages = with pkgs; [
+  flake,
-    # A/V, codec and media stuff
+  pkgs,
-    ffmpeg-full
+  config,
-    wireplumber
+  ...
-    pulseaudio
+}:
-    pavucontrol
+{
-    imagemagick
+  home.packages =
+    with pkgs;
+    [
+      # A/V, codec and media stuff
+      ffmpeg-full
+      wireplumber
+      pulseaudio
+      pavucontrol
+      imagemagick
 
-    # Utils
+      # Utils
-    neofetch
+      neofetch
-    rage
+      rage
-    curl
+      curl
-    yt-dlp
+      yt-dlp
-    p7zip
+      p7zip
-    unrar
+      unrar
-    vim
+      vim
-    (flake.packages.${system}.customscripts)
+      (flake.packages.${system}.customscripts)
-    cachix
+      cachix
-    steam-run
+      steam-run
 
-    # GUI
+      # GUI
-    vesktop
+      vesktop
-    (xfce.thunar.override {
+      (xfce.thunar.override {
-      thunarPlugins = with xfce; [
+        thunarPlugins = with xfce; [
-        thunar-media-tags-plugin
+          thunar-media-tags-plugin
-        thunar-volman
+          thunar-volman
-        thunar-archive-plugin
+          thunar-archive-plugin
-      ];
+        ];
-    })
+      })
-    xfce.xfconf
+      xfce.xfconf
-    xfce.tumbler
+      xfce.tumbler
-    qbittorrent
+      qbittorrent
-    hexchat
+      hexchat
-    dunst
+      dunst
-    zenity
+      zenity
 
-    # Misc
+      # Misc
-    mailcap
+      mailcap
-    libsForQt5.qtstyleplugins
+      libsForQt5.qtstyleplugins
-  ] ++ lib.optionals config.isLaptop [
+    ]
-    powertop
+    ++ lib.optionals config.isLaptop [
-    undervolt
+      powertop
-  ];
+      undervolt
+    ];
 }

home/natto/stuff.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   xdg = {
     enable = true;
     userDirs.enable = true;
@@ -29,7 +35,10 @@
     inputMethod = {
       enable = true;
       type = "fcitx5";
-      fcitx5.addons = with pkgs; [ fcitx5-m17n fcitx5-mozc ];
+      fcitx5.addons = with pkgs; [
+        fcitx5-m17n
+        fcitx5-mozc
+      ];
     };
   };
 }

home/natto/xsession.nix

@@ -1,4 +1,9 @@
-{ pkgs, config, flake, ... }:
+{
+  pkgs,
+  config,
+  flake,
+  ...
+}:
 {
   xsession = {
     enable = true;

hosts/default.nix

@@ -26,21 +26,23 @@ in
     # Desktop
     okina = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      modules = [
+      modules =
-        ./okina
+        [
-      ]
+          ./okina
-      ++ desktopModules
+        ]
-      ++ commonModules;
+        ++ desktopModules
+        ++ commonModules;
     };
 
     #Home laptop
     satori = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      modules = [
+      modules =
-        ./satori
+        [
-      ]
+          ./satori
-      ++ desktopModules
+        ]
-      ++ commonModules;
+        ++ desktopModules
+        ++ commonModules;
     };
 
     #Home server (RPi4)
@@ -48,8 +50,7 @@ in
       system = "aarch64-linux";
       modules = [
         ./marisa
-      ]
+      ] ++ commonModules;
-      ++ commonModules;
     };
 
     #Oracle Cloud VM
@@ -59,8 +60,7 @@ in
         ./remilia
         ./x86builder.nix
         inputs.mailserver.nixosModules.mailserver
-      ]
+      ] ++ commonModules;
-      ++ commonModules;
     };
 
     #Oracle Cloud VM
@@ -69,8 +69,7 @@ in
       modules = [
         ./hina
         ./x86builder.nix
-      ]
+      ] ++ commonModules;
-      ++ commonModules;
     };
 
     #Oracle Cloud VM
@@ -78,8 +77,7 @@ in
       system = "aarch64-linux";
       modules = [
         ./suwako
-      ]
+      ] ++ commonModules;
-      ++ commonModules;
     };
   };
 }

hosts/hina/boot.nix

@@ -3,9 +3,19 @@
   boot = {
     kernel.sysctl."net.ipv4.ip_forward" = 1;
     initrd.kernelModules = [ "bochs" ];
-    initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" ];
+    initrd.availableKernelModules = [
+      "ata_piix"
+      "uhci_hcd"
+      "virtio_pci"
+      "virtio_scsi"
+    ];
     kernelModules = [ "kvm-amd" ];
-    kernelParams = [ "console=ttyS0" "console=tty1" "nvme.shutdown_timeout=10" "libiscsi.debug_libiscsi_eh=1" ];
+    kernelParams = [
+      "console=ttyS0"
+      "console=tty1"
+      "nvme.shutdown_timeout=10"
+      "libiscsi.debug_libiscsi_eh=1"
+    ];
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;

hosts/hina/default.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, conf, ... }:
+{
+  config,
+  pkgs,
+  conf,
+  ...
+}:
 {
   imports = [
     ./networking.nix

hosts/hina/hardware.nix

@@ -1,16 +1,20 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
+  imports = [
-    [
+    (modulesPath + "/profiles/qemu-guest.nix")
-      (modulesPath + "/profiles/qemu-guest.nix")
+  ];
-    ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    {
+    device = "/dev/disk/by-uuid/d91adce2-9059-4a8a-86e7-dee6ecc85b2b";
-      device = "/dev/disk/by-uuid/d91adce2-9059-4a8a-86e7-dee6ecc85b2b";
+    fsType = "ext4";
-      fsType = "ext4";
+  };
-    };
 
   swapDevices = [
     {

hosts/hina/networking.nix

@@ -1,16 +1,25 @@
-{ lib, config, conf, pkgs, ... }:
+{
+  lib,
+  config,
+  conf,
+  pkgs,
+  ...
+}:
 {
   networking = {
     useDHCP = false;
     hostName = "hina";
-    firewall =
+    firewall = {
-      {
+      interfaces = {
-        interfaces = {
+        ens3 = {
-          ens3 = {
+          allowedTCPPorts = [
-            allowedTCPPorts = [ 9898 80 443 ];
+            9898
-          };
+            80
+            443
+          ];
         };
       };
+    };
     interfaces = {
       ens3 = {
         useDHCP = true;

hosts/hina/services.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, conf, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  conf,
+  ...
+}:
 let
   domain = conf.network.addresses.domain.natto;
 in
@@ -32,4 +38,3 @@ in
     };
   };
 }
-

hosts/marisa/boot.nix

@@ -2,19 +2,33 @@
 {
   boot = {
     consoleLogLevel = 7;
-    kernelParams = [ "console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0" ];
+    kernelParams = [
+      "console=ttyS0,115200n8"
+      "console=ttyAMA0,115200n8"
+      "console=tty0"
+    ];
     kernelPackages = pkgs.linuxPackages_5_10;
-    initrd.availableKernelModules = [ "xhci_pci" "usb_storage" "usbhid" "uas" "pcie-brcmstb" "vc4" ];
+    initrd.availableKernelModules = [
+      "xhci_pci"
+      "usb_storage"
+      "usbhid"
+      "uas"
+      "pcie-brcmstb"
+      "vc4"
+    ];
     loader = {
       grub.enable = false;
       generic-extlinux-compatible.enable = true;
-      /* raspberryPi= {
+      /*
+        raspberryPi= {
         version = 4;
         firmwareConfig = "dtparam=sd_poll_once=on";
         enable = true;
-        }; */
+        };
+      */
     };
-    /* kernelPatches = [
+    /*
+      kernelPatches = [
       {
       name = "change-pgtable";
       patch = null;
@@ -22,6 +36,7 @@
       CONFIG_PGTABLE_LEVELS 4
       '';
       }
-      ];*/
+      ];
+    */
   };
 }

hosts/marisa/default.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, conf, ... }:
+{
+  config,
+  pkgs,
+  conf,
+  ...
+}:
 {
   imports = [
     ./networking.nix

hosts/marisa/hardware.nix

@@ -1,21 +1,24 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
-  fileSystems."/" =
+  fileSystems."/" = {
-    {
+    device = "/dev/disk/by-label/NIXOS_SD";
-      device = "/dev/disk/by-label/NIXOS_SD";
+    fsType = "ext4";
-      fsType = "ext4";
+  };
-    };
 
-  fileSystems."/nix/store" =
+  fileSystems."/nix/store" = {
-    {
+    device = "/nix/store";
-      device = "/nix/store";
+    fsType = "none";
-      fsType = "none";
+    options = [ "bind" ];
-      options = [ "bind" ];
+  };
-    };
 
   swapDevices = [
     {

hosts/marisa/networking.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, conf, ... }:
+{
+  config,
+  pkgs,
+  conf,
+  ...
+}:
 {
   networking = {
     hostName = "marisa";
@@ -7,10 +12,10 @@
         22 # ssh
         80 # http
         #  5454
-        5001 #gitea
+        5001 # gitea
-        4646 #nomad
+        4646 # nomad
         #  8500 #vault nomad consul
-        8000 #simpler-filehost
+        8000 # simpler-filehost
         #  6666 #concourse
         #  202 #gitea-ssh
       ];
@@ -25,16 +30,20 @@
 
     interfaces = {
       eth0 = {
-        ipv4.addresses = [{
+        ipv4.addresses = [
-          prefixLength = 24;
+          {
-          address = "192.168.1.159";
+            prefixLength = 24;
-        }];
+            address = "192.168.1.159";
+          }
+        ];
       };
       wlan0 = {
-        ipv4.addresses = [{
+        ipv4.addresses = [
-          prefixLength = 24;
+          {
-          address = "192.168.1.159";
+            prefixLength = 24;
-        }];
+            address = "192.168.1.159";
+          }
+        ];
       };
     };
     wireguard.interfaces.wg0 = with conf.network.addresses.wireguard.ips; {
@@ -52,6 +61,9 @@
       ];
     };
     defaultGateway = "192.168.1.1";
-    nameservers = [ "1.1.1.1" "8.8.8.8" ];
+    nameservers = [
+      "1.1.1.1"
+      "8.8.8.8"
+    ];
   };
 }

hosts/marisa/services/default.nix

@@ -17,19 +17,20 @@
   services = {
     openssh = {
       enable = true;
-      ports = [ 22 22001 ];
+      ports = [
+        22
+        22001
+      ];
     };
     postgresql = {
       enable = true;
       authentication = ''
         local gitea all ident map=gitea-map
       '';
-      identMap =
+      identMap = ''
-        ''
+        gitea-map gitea gitea
-          gitea-map gitea gitea
+      '';
-        '';
     };
 
   };
 }
-

hosts/marisa/services/filehost.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, inputs, conf, ... }:
+{
+  config,
+  pkgs,
+  inputs,
+  conf,
+  ...
+}:
 {
   systemd.services.filehost = {
     enable = true;

hosts/marisa/services/gitea.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, conf, ... }:
+{
+  config,
+  pkgs,
+  conf,
+  ...
+}:
 {
   services = {
     gitea = rec {
@@ -38,4 +43,3 @@
     };
   };
 }
-

hosts/marisa/services/hashicorp.nix

@@ -6,7 +6,10 @@
       enable = true;
       enableDocker = true;
       dropPrivileges = false;
-      extraPackages = with pkgs; [ consul cni-plugins ];
+      extraPackages = with pkgs; [
+        consul
+        cni-plugins
+      ];
       extraSettingsPaths = [ "/run/nomad/nomad.json" ];
     };
     vault = {
@@ -27,4 +30,3 @@
     };
   };
 }
-

hosts/okina/boot.nix

@@ -1,20 +1,38 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 
 {
   boot = {
     kernelPackages = pkgs.linuxPackages;
     initrd = {
-      availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+      availableKernelModules = [
+        "xhci_pci"
+        "ahci"
+        "nvme"
+        "usbhid"
+        "usb_storage"
+        "sd_mod"
+      ];
       kernelModules = [ ];
     };
     kernelParams = [ "i915.force_probe=56a1" ];
 
     #   kernelModules = [ "kvm-intel" "i2c-dev" "ddcci_backlight" ];
-    kernelModules = [ "kvm-intel" "i2c-dev" ];
+    kernelModules = [
+      "kvm-intel"
+      "i2c-dev"
+    ];
     #   extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback r8125 ddcci-driver ];
-    extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback r8125 ];
+    extraModulePackages = with config.boot.kernelPackages; [
+      v4l2loopback
+      r8125
+    ];
     blacklistedKernelModules = [ "r8169" ];
-    extraModprobeConfig = '' options snd-intel-dspcfg dsp_driver=1 '';
+    extraModprobeConfig = ''options snd-intel-dspcfg dsp_driver=1 '';
 
     resumeDevice = "/dev/disk/by-uuid/3770e3bd-a200-4e36-b3a5-4963d13865f9";
 

hosts/okina/default.nix

@@ -1,12 +1,11 @@
 { lib, config, ... }:
 {
-  imports =
+  imports = [
-    [
+    ./hardware.nix
-      ./hardware.nix
+    ./stuff.nix
-      ./stuff.nix
+    ./networking.nix
-      ./networking.nix
+    ./boot.nix
-      ./boot.nix
+    ./services.nix
-      ./services.nix
+  ];
-    ];
   system.stateVersion = "23.05";
 }

hosts/okina/hardware.nix

@@ -1,42 +1,45 @@
-{ config, lib, modulesPath, pkgs, ... }:
+{
+  config,
+  lib,
+  modulesPath,
+  pkgs,
+  ...
+}:
 
 {
-  imports =
+  imports = [
-    [
+    (modulesPath + "/installer/scan/not-detected.nix")
-      (modulesPath + "/installer/scan/not-detected.nix")
+  ];
-    ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    {
+    device = "/dev/disk/by-uuid/5679b901-3a70-4422-81f5-af91f287500b";
-      device = "/dev/disk/by-uuid/5679b901-3a70-4422-81f5-af91f287500b";
+    fsType = "btrfs";
-      fsType = "btrfs";
+    options = [ "compress-force=zstd:3" ];
-      options = [ "compress-force=zstd:3" ];
+  };
-    };
 
-  fileSystems."/boot/efi" =
+  fileSystems."/boot/efi" = {
-    {
+    device = "/dev/disk/by-uuid/A2E5-006F";
-      device = "/dev/disk/by-uuid/A2E5-006F";
+    fsType = "vfat";
-      fsType = "vfat";
+  };
-    };
 
-  fileSystems."/media/omghi" =
+  fileSystems."/media/omghi" = {
-    {
+    device = "/dev/disk/by-uuid/0e862bdb-168a-42cc-8a28-0ae9e9a0753c";
-      device = "/dev/disk/by-uuid/0e862bdb-168a-42cc-8a28-0ae9e9a0753c";
+    fsType = "ext4";
-      fsType = "ext4";
+  };
-    };
 
-  fileSystems."/media/real" =
+  fileSystems."/media/real" = {
-    {
+    device = "/dev/disk/by-uuid/8086be20-c770-46be-bd8f-5bd2d7735c7d";
-      device = "/dev/disk/by-uuid/8086be20-c770-46be-bd8f-5bd2d7735c7d";
+    fsType = "btrfs";
-      fsType = "btrfs";
+    options = [ "compress-force=zstd:3" ];
-      options = [ "compress-force=zstd:3" ];
+  };
-    };
 
-  /* fileSystems."/media/ntfs" =
+  /*
+    fileSystems."/media/ntfs" =
     {
       device = "/dev/disk/by-uuid/54034ca6-d3cd-11ee-9e0c-f020ff87c985";
       fsType = "ntfs";
-    };*/
+    };
+  */
 
   zramSwap = {
     enable = true;

hosts/okina/networking.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, conf, lib, ... }:
+{
+  config,
+  pkgs,
+  conf,
+  lib,
+  ...
+}:
 
 {
   networking = {
@@ -10,35 +16,54 @@
     };
 
     firewall = {
-      allowedTCPPorts = [ 22 18172 6600 8001 7590 25565 9092 8096 ];
+      allowedTCPPorts = [
-      allowedUDPPorts = [ 22 17840 18172 ];
+        22
+        18172
+        6600
+        8001
+        7590
+        25565
+        9092
+        8096
+      ];
+      allowedUDPPorts = [
+        22
+        17840
+        18172
+      ];
       trustedInterfaces = [ "docker0" ];
     };
 
     interfaces = {
-      enp7s0 = {
+      /*
-        ipv4.addresses = [{
+        enp7s0 = {
-          prefixLength = 24;
+          ipv4.addresses = [{
-          address = "192.168.1.106";
+            prefixLength = 24;
-        }];
+            address = "192.168.1.106";
-      };
+          }];
+        };
+      */
     };
 
     wireguard.interfaces.wg0 = with conf.network.addresses.wireguard.ips; {
       ips = [ okina ];
       listenPort = 17840;
       privateKeyFile = "/var/secrets/wg.key";
-      peers = [{
+      peers = [
-        #Oracle VM1
+        {
-        publicKey = "z0Y2VNEWcyVQVSqRHiwmiJ5/0MgSPM+HZfEcwIccSxM=";
+          #Oracle VM1
-        allowedIPs = [ remilia ];
+          publicKey = "z0Y2VNEWcyVQVSqRHiwmiJ5/0MgSPM+HZfEcwIccSxM=";
-        endpoint = "${conf.network.addresses.domain.natto}:17840";
+          allowedIPs = [ remilia ];
-        persistentKeepalive = 25;
+          endpoint = "${conf.network.addresses.domain.natto}:17840";
-      }];
+          persistentKeepalive = 25;
+        }
+      ];
     };
 
-
     defaultGateway = "192.168.1.1";
-    nameservers = [ "1.1.1.1" "8.8.8.8" ];
+    nameservers = [
+      "1.1.1.1"
+      "8.8.8.8"
+    ];
   };
 }

hosts/okina/services.nix

@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 {
   services = {
     openssh = {

hosts/okina/stuff.nix

@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 {
   time.timeZone = "Asia/Kolkata";
 
@@ -9,13 +14,23 @@
     polkit.enable = true;
     sudo.enable = true;
   };
+
   console.useXkbConfig = true;
 
   users.users.natto = {
     isNormalUser = true;
     shell = pkgs.zsh;
     home = "/home/natto";
-    extraGroups = [ "wheel" "adbusers" "video" "libvirtd" "docker" "networkmanager" "dialout" "pipewire" ];
+    extraGroups = [
+      "wheel"
+      "adbusers"
+      "video"
+      "libvirtd"
+      "docker"
+      "networkmanager"
+      "dialout"
+      "pipewire"
+    ];
   };
 
   virtualisation = {

hosts/programs/nix/default.nix

@@ -16,7 +16,10 @@
     '';
     settings = {
       auto-optimise-store = true;
-      trusted-users = [ "root" "@wheel" ];
+      trusted-users = [
+        "root"
+        "@wheel"
+      ];
       substituters = [
         "https://nix-community.cachix.org"
         "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"

hosts/remilia/boot.nix

@@ -3,9 +3,19 @@
   boot = {
     kernel.sysctl."net.ipv4.ip_forward" = 1;
     initrd.kernelModules = [ "bochs" ];
-    initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" ];
+    initrd.availableKernelModules = [
+      "ata_piix"
+      "uhci_hcd"
+      "virtio_pci"
+      "virtio_scsi"
+    ];
     kernelModules = [ "kvm-amd" ];
-    kernelParams = [ "console=ttyS0" "console=tty1" "nvme.shutdown_timeout=10" "libiscsi.debug_libiscsi_eh=1" ];
+    kernelParams = [
+      "console=ttyS0"
+      "console=tty1"
+      "nvme.shutdown_timeout=10"
+      "libiscsi.debug_libiscsi_eh=1"
+    ];
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;

hosts/remilia/default.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, conf, ... }:
+{
+  config,
+  pkgs,
+  conf,
+  ...
+}:
 {
   imports = [
     ./networking.nix

hosts/remilia/hardware.nix

@@ -1,16 +1,20 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
+  imports = [
-    [
+    (modulesPath + "/profiles/qemu-guest.nix")
-      (modulesPath + "/profiles/qemu-guest.nix")
+  ];
-    ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    {
+    device = "/dev/disk/by-uuid/d91adce2-9059-4a8a-86e7-dee6ecc85b2b";
-      device = "/dev/disk/by-uuid/d91adce2-9059-4a8a-86e7-dee6ecc85b2b";
+    fsType = "ext4";
-      fsType = "ext4";
+  };
-    };
 
   swapDevices = [
     {

hosts/remilia/mailserver.nix

@@ -1,7 +1,15 @@
-{ config, pkgs, conf, network, ... }:
+{
+  config,
+  pkgs,
+  conf,
+  network,
+  ...
+}:
 {
   mailserver =
-    let domain = conf.network.addresses.domain.natto; in
+    let
+      domain = conf.network.addresses.domain.natto;
+    in
     rec {
       enable = true;
       fqdn = "mail.${domain}";

hosts/remilia/networking.nix

@@ -1,27 +1,43 @@
-{ lib, config, conf, pkgs, ... }:
+{
+  lib,
+  config,
+  conf,
+  pkgs,
+  ...
+}:
 {
   networking = {
     useDHCP = false;
     hostName = "remilia";
-    firewall =
+    firewall = {
-      {
+      interfaces = {
-        interfaces = {
+        ens3 = {
-          ens3 = {
+          allowedTCPPorts = [
-            allowedTCPPorts = [ 80 81 443 444 993 465 143 25 22 22001 22002 4444 ]
+            80
-              ++ (map (x: x.sourcePort) config.networking.nat.forwardPorts);
+            81
-            allowedUDPPorts = [ 17840 ];
+            443
-          };
+            444
+            993
+            465
+            143
+            25
+            22
+            22001
+            22002
+            4444
+          ] ++ (map (x: x.sourcePort) config.networking.nat.forwardPorts);
+          allowedUDPPorts = [ 17840 ];
         };
-        extraCommands = lib.concatMapStringsSep "\n"
-          (x:
-            let
-              t = lib.splitString ":" x.destination;
-            in
-            with lib;
-            "iptables -t nat -A POSTROUTING -d ${head t} -p tcp -m tcp --dport ${last t} -j MASQUERADE"
-          )
-          config.networking.nat.forwardPorts;
       };
+      extraCommands = lib.concatMapStringsSep "\n" (
+        x:
+        let
+          t = lib.splitString ":" x.destination;
+        in
+        with lib;
+        "iptables -t nat -A POSTROUTING -d ${head t} -p tcp -m tcp --dport ${last t} -j MASQUERADE"
+      ) config.networking.nat.forwardPorts;
+    };
     interfaces = {
       ens3 = {
         useDHCP = true;

hosts/remilia/services.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, conf, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  conf,
+  ...
+}:
 let
   domain = conf.network.addresses.domain.natto;
 in
@@ -8,7 +14,10 @@ in
     openssh = {
       enable = true;
       settings.PermitRootLogin = "yes";
-      ports = [ 22 22002 ];
+      ports = [
+        22
+        22002
+      ];
     };
     nginx = {
       enable = true;
@@ -24,20 +33,29 @@ in
       '';
       virtualHosts =
         let
-          genericHttpRProxy = { addr, ssl ? true, conf ? "" }: {
+          genericHttpRProxy =
-            enableACME = ssl;
+            {
-            # addSSL = ssl;
+              addr,
-            forceSSL = ssl;
+              ssl ? true,
-            locations."/" = {
+              conf ? "",
-              proxyPass = toString addr;
+            }:
-              extraConfig = ''
+            {
-                expires $expires;
+              enableACME = ssl;
-                proxy_set_header Host $host;
+              # addSSL = ssl;
-              '' + conf;
+              forceSSL = ssl;
+              locations."/" = {
+                proxyPass = toString addr;
+                extraConfig =
+                  ''
+                    expires $expires;
+                    proxy_set_header Host $host;
+                  ''
+                  + conf;
+              };
             };
-          };
         in
-        with conf.network.addresses.wireguard.ips; {
+        with conf.network.addresses.wireguard.ips;
+        {
           "${domain}" = {
             addSSL = true;
             enableACME = true;
@@ -51,7 +69,8 @@ in
           # "consul.${domain}" = genericHttpRProxy { addr = "http://${marisa}:8500"; };
           "f.${domain}" = genericHttpRProxy { addr = "http://${marisa}:8000"; };
           "radio.${domain}" = genericHttpRProxy { addr = "http://${satori}:8001"; };
-          /* "radio.${domain}" = {
+          /*
+            "radio.${domain}" = {
             addSSL = true;
             enableACME = true;
             locations."/" = {
@@ -62,13 +81,15 @@ in
             '';
             };
             locations."= /".return = "301 /radio";
-            };*/
+            };
+          */
 
           "git.${domain}" = genericHttpRProxy {
             addr = "http://${marisa}:5001";
             conf = "client_max_body_size 64M;";
           };
-          /*"nomad.${domain}" = genericHttpRProxy {
+          /*
+            "nomad.${domain}" = genericHttpRProxy {
             addr = "http://${marisa}:4646";
             conf = ''
             proxy_buffering off;
@@ -80,4 +101,3 @@ in
     };
   };
 }
-

hosts/satori/boot.nix

@@ -1,22 +1,49 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 
 {
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
     initrd = {
-      availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "vfio-pci" ];
+      availableKernelModules = [
-      /*     preDeviceCommands = ''
+        "xhci_pci"
+        "ahci"
+        "nvme"
+        "usb_storage"
+        "sd_mod"
+        "vfio-pci"
+      ];
+      /*
+        preDeviceCommands = ''
         DEVS="0000:01:00.0 0000:01:00.1 0000:01:00.2 0000:01:00.3"
         for DEV in $DEVS; do
         echo "vfio-pci" > /sys/bus/pci/devices/$DEV/driver_override
         done
         modprobe -i vfio-pci
-        '';*/
+        '';
+      */
       kernelModules = [ ];
     };
-    kernelParams = [ "intel_pstate=active" "intel_iommu=on" "nvidia_drm.modeset=1" "clearcpuid=512" ];
+    kernelParams = [
-    kernelModules = [ "kvm-intel" "snd-seq" "snd-rawmidi" "joydev" ];
+      "intel_pstate=active"
-    extraModulePackages = with config.boot.kernelPackages; [ nvidia_x11 v4l2loopback ];
+      "intel_iommu=on"
+      "nvidia_drm.modeset=1"
+      "clearcpuid=512"
+    ];
+    kernelModules = [
+      "kvm-intel"
+      "snd-seq"
+      "snd-rawmidi"
+      "joydev"
+    ];
+    extraModulePackages = with config.boot.kernelPackages; [
+      nvidia_x11
+      v4l2loopback
+    ];
     loader = {
       efi = {
         canTouchEfiVariables = true;

hosts/satori/default.nix

@@ -1,13 +1,12 @@
 { lib, config, ... }:
 {
-  imports =
+  imports = [
-    [
+    ./hardware.nix
-      ./hardware.nix
+    ./stuff.nix
-      ./stuff.nix
+    ./networking.nix
-      ./networking.nix
+    ./boot.nix
-      ./boot.nix
+    ./services.nix
-      ./services.nix
+    ./graphics.nix
-      ./graphics.nix
+  ];
-    ];
   system.stateVersion = "23.05";
 }

hosts/satori/graphics.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   nvidia-offload = pkgs.writeShellScriptBin "nvi" ''
     export __NV_PRIME_RENDER_OFFLOAD=1
@@ -23,11 +28,15 @@ in
       package = config.boot.kernelPackages.nvidia_x11;
       prime = {
         #      sync.enable = true;
-        offload = { enable = true; };
+        offload = {
+          enable = true;
+        };
         intelBusId = "PCI:0:2:0";
         nvidiaBusId = "PCI:1:0:0";
       };
-      modesetting = { enable = true; };
+      modesetting = {
+        enable = true;
+      };
       powerManagement = {
         enable = true;
         finegrained = true;

hosts/satori/hardware.nix

@@ -1,29 +1,30 @@
-{ config, lib, modulesPath, ... }:
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
+  imports = [
-    [
+    (modulesPath + "/installer/scan/not-detected.nix")
-      (modulesPath + "/installer/scan/not-detected.nix")
+  ];
-    ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    {
+    device = "/dev/disk/by-uuid/59af143c-1a87-4654-9b31-7594ac8ba530";
-      device = "/dev/disk/by-uuid/59af143c-1a87-4654-9b31-7594ac8ba530";
+    fsType = "ext4";
-      fsType = "ext4";
+  };
-    };
 
-  fileSystems."/media/real" =
+  fileSystems."/media/real" = {
-    {
+    device = "/dev/disk/by-uuid/8086be20-c770-46be-bd8f-5bd2d7735c7d";
-      device = "/dev/disk/by-uuid/8086be20-c770-46be-bd8f-5bd2d7735c7d";
+    fsType = "btrfs";
-      fsType = "btrfs";
+    options = [ "compress-force=zstd:3" ];
-      options = [ "compress-force=zstd:3" ];
+  };
-    };
 
-  fileSystems."/boot/efi" =
+  fileSystems."/boot/efi" = {
-    {
+    device = "/dev/disk/by-uuid/2424-5639";
-      device = "/dev/disk/by-uuid/2424-5639";
+    fsType = "vfat";
-      fsType = "vfat";
+  };
-    };
 
   zramSwap = {
     enable = true;
@@ -33,7 +34,10 @@
   };
 
   swapDevices = [
-    { device = "/var/swap"; size = 4096; }
+    {
+      device = "/var/swap";
+      size = 4096;
+    }
   ];
 
   powerManagement = {

hosts/satori/networking.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, conf, ... }:
+{
+  config,
+  pkgs,
+  conf,
+  ...
+}:
 
 {
   networking = {
@@ -10,8 +15,20 @@
     };
 
     firewall = {
-      allowedTCPPorts = [ 22 18172 6600 8001 7590 25565 9092 ];
+      allowedTCPPorts = [
-      allowedUDPPorts = [ 22 17840 18172 ];
+        22
+        18172
+        6600
+        8001
+        7590
+        25565
+        9092
+      ];
+      allowedUDPPorts = [
+        22
+        17840
+        18172
+      ];
       trustedInterfaces = [ "docker0" ];
     };
 
@@ -19,16 +36,21 @@
       ips = [ satori ];
       listenPort = 17840;
       privateKeyFile = "/var/secrets/wg.key";
-      peers = [{
+      peers = [
-        #Oracle VM1
+        {
-        publicKey = "z0Y2VNEWcyVQVSqRHiwmiJ5/0MgSPM+HZfEcwIccSxM=";
+          #Oracle VM1
-        allowedIPs = [ remilia ];
+          publicKey = "z0Y2VNEWcyVQVSqRHiwmiJ5/0MgSPM+HZfEcwIccSxM=";
-        endpoint = "${conf.network.addresses.domain.natto}:17840";
+          allowedIPs = [ remilia ];
-        persistentKeepalive = 25;
+          endpoint = "${conf.network.addresses.domain.natto}:17840";
-      }];
+          persistentKeepalive = 25;
+        }
+      ];
     };
 
     defaultGateway = "192.168.1.1";
-    nameservers = [ "1.1.1.1" "8.8.8.8" ];
+    nameservers = [
+      "1.1.1.1"
+      "8.8.8.8"
+    ];
   };
 }

hosts/satori/services.nix

@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 {
   services = {
     openssh = {

hosts/satori/stuff.nix

@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 {
   time.timeZone = "Asia/Kolkata";
 
@@ -11,12 +16,19 @@
   };
   console.useXkbConfig = true;
 
-
   users.users.natto = {
     isNormalUser = true;
     shell = pkgs.zsh;
     home = "/home/natto";
-    extraGroups = [ "wheel" "adbusers" "video" "libvirtd" "docker" "networkmanager" "dialout" ];
+    extraGroups = [
+      "wheel"
+      "adbusers"
+      "video"
+      "libvirtd"
+      "docker"
+      "networkmanager"
+      "dialout"
+    ];
   };
 
   virtualisation = {

hosts/suwako/boot.nix

@@ -3,9 +3,19 @@
   boot = {
     kernel.sysctl."net.ipv4.ip_forward" = 1;
     initrd.kernelModules = [ "bochs" ];
-    initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" ];
+    initrd.availableKernelModules = [
+      "ata_piix"
+      "uhci_hcd"
+      "virtio_pci"
+      "virtio_scsi"
+    ];
     kernelModules = [ "kvm-amd" ];
-    kernelParams = [ "console=ttyS0" "console=tty1" "nvme.shutdown_timeout=10" "libiscsi.debug_libiscsi_eh=1" ];
+    kernelParams = [
+      "console=ttyS0"
+      "console=tty1"
+      "nvme.shutdown_timeout=10"
+      "libiscsi.debug_libiscsi_eh=1"
+    ];
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;

hosts/suwako/default.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, conf, ... }:
+{
+  config,
+  pkgs,
+  conf,
+  ...
+}:
 {
   imports = [
     ./networking.nix

hosts/suwako/hardware.nix

@@ -1,16 +1,20 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
+  imports = [
-    [
+    (modulesPath + "/profiles/qemu-guest.nix")
-      (modulesPath + "/profiles/qemu-guest.nix")
+  ];
-    ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    {
+    device = "/dev/disk/by-uuid/e87c20b9-f451-45bf-b863-385ac9c290cf ";
-      device = "/dev/disk/by-uuid/e87c20b9-f451-45bf-b863-385ac9c290cf ";
+    fsType = "ext4";
-      fsType = "ext4";
+  };
-    };
 
   swapDevices = [
     {

hosts/suwako/networking.nix

@@ -1,16 +1,25 @@
-{ lib, config, conf, pkgs, ... }:
+{
+  lib,
+  config,
+  conf,
+  pkgs,
+  ...
+}:
 {
   networking = {
     useDHCP = false;
     hostName = "suwako";
-    firewall =
+    firewall = {
-      {
+      interfaces = {
-        interfaces = {
+        enp0s6 = {
-          enp0s6 = {
+          allowedTCPPorts = [
-            allowedTCPPorts = [ 22 443 80 ];
+            22
-          };
+            443
+            80
+          ];
         };
       };
+    };
     interfaces = {
       enp0s6 = {
         useDHCP = true;

hosts/suwako/services.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, lib, conf, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  conf,
+  ...
+}:
 let
   domain = conf.network.addresses.domain.natto;
 in
@@ -13,4 +19,3 @@ in
     };
   };
 }
-

hosts/vault-agent.nix

@@ -1,5 +1,10 @@
 #Taken from https://github.com/MagicRB/dotfiles/blob/master/nix/nixos-modules/vault-agent.nix
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 with lib;
 let
   cfg = config.services.vault-agent;
@@ -59,48 +64,49 @@ in
     };
   };
 
-  config = mkIf cfg.enable
+  config = mkIf cfg.enable ({
-    ({
+    users = {
       users = {
-        users = {
+        "${cfg.userName}" = {
-          "${cfg.userName}" = {
+          group = cfg.groupName;
-            group = cfg.groupName;
+          uid = cfg.uid;
-            uid = cfg.uid;
+          isSystemUser = true;
-            isSystemUser = true;
+          description = "Vault-Agent User";
-            description = "Vault-Agent User";
-          };
-        };
-        groups = {
-          "${cfg.groupName}" = {
-            gid = cfg.gid;
-          };
         };
       };
-      systemd.tmpfiles.rules = mkIf (cfg.secretsDir != null) [
+      groups = {
-        "d ${cfg.secretsDir} 6755 vault-agent ${cfg.groupName} 0"
+        "${cfg.groupName}" = {
-      ];
+          gid = cfg.gid;
-      systemd.services.vault-agent = {
+        };
-        description = "Vault Agent";
+      };
-        wantedBy = [ "multi-user.target" ];
+    };
-        wants = [ "network-online.target" ];
+    systemd.tmpfiles.rules = mkIf (cfg.secretsDir != null) [
-        after = [ "network-online.target" ];
+      "d ${cfg.secretsDir} 6755 vault-agent ${cfg.groupName} 0"
-        path = (with pkgs; [
+    ];
+    systemd.services.vault-agent = {
+      description = "Vault Agent";
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+      path = (
+        with pkgs;
+        [
           glibc
-        ]);
+        ]
-        serviceConfig = {
+      );
-          User = cfg.userName;
+      serviceConfig = {
-          Group = cfg.groupName;
+        User = cfg.userName;
-          ExecReload = "${pkgs.busybox}/bin/kill -HUP $MAINPID";
+        Group = cfg.groupName;
-          ExecStart = "${cfg.package}/bin/vault agent -config=${json.generate "vault.json" cfg.settings}";
+        ExecReload = "${pkgs.busybox}/bin/kill -HUP $MAINPID";
-          KillMode = "process";
+        ExecStart = "${cfg.package}/bin/vault agent -config=${json.generate "vault.json" cfg.settings}";
-          KillSignal = "SIGINT";
+        KillMode = "process";
-          Restart = "on-failure";
+        KillSignal = "SIGINT";
-          TimeoutStopSec = "30s";
+        Restart = "on-failure";
-          RestartSec = 2;
+        TimeoutStopSec = "30s";
-          ConfigurationDirectory = "vault-agent";
+        RestartSec = 2;
-          ConfigurationDirectoryMode = "0600";
+        ConfigurationDirectory = "vault-agent";
-        };
+        ConfigurationDirectoryMode = "0600";
       };
-    });
+    };
+  });
 }
-

hosts/x86builder.nix

@@ -4,13 +4,23 @@
     extraOptions = ''
       builders-use-substitutes = true
     '';
-    buildMachines = [{
+    buildMachines = [
-      hostName = "okina";
+      {
-      systems = [ "x86_64-linux" "aarch64-linux" ];
+        hostName = "okina";
-      maxJobs = 4;
+        systems = [
-      speedFactor = 2;
+          "x86_64-linux"
-      supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
+          "aarch64-linux"
-    }];
+        ];
+        maxJobs = 4;
+        speedFactor = 2;
+        supportedFeatures = [
+          "nixos-test"
+          "benchmark"
+          "big-parallel"
+          "kvm"
+        ];
+      }
+    ];
     distributedBuilds = true;
   };
 }

pkgs/customscripts/default.nix

@@ -1,4 +1,8 @@
-{ lib, stdenvNoCC, fetchFromGitHub }:
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
 
 stdenvNoCC.mkDerivation {
   name = "customscripts";

pkgs/default.nix

@@ -1,4 +1,5 @@
-{ self, ... }: {
+{ self, ... }:
+{
   flake = {
     overlays = rec {
       packages = import ./packages.nix;
@@ -6,7 +7,9 @@
     };
   };
 
-  perSystem = { pkgs, ... }: {
+  perSystem =
-    packages = self.overlays.default null pkgs;
+    { pkgs, ... }:
-  };
+    {
+      packages = self.overlays.default null pkgs;
+    };
 }

pkgs/nattovim/default.nix

@@ -1,4 +1,11 @@
-{ wrapNeovimUnstable, neovimUtils, neovim-unwrapped, nvimPackage ? neovim-unwrapped, vimPlugins, ... }:
+{
+  wrapNeovimUnstable,
+  neovimUtils,
+  neovim-unwrapped,
+  nvimPackage ? neovim-unwrapped,
+  vimPlugins,
+  ...
+}:
 let
   nvimConfig = neovimUtils.makeNeovimConfig {
     plugins = with vimPlugins; [
@@ -24,8 +31,11 @@ let
     ];
   };
 in
-wrapNeovimUnstable nvimPackage (nvimConfig // {
+wrapNeovimUnstable nvimPackage (
-  luaRcContent = ''
+  nvimConfig
-    ${builtins.readFile ./init.lua}
+  // {
-  '';
+    luaRcContent = ''
-})
+      ${builtins.readFile ./init.lua}
+    '';
+  }
+)

pkgs/simp1e/default.nix

@@ -1,4 +1,11 @@
-{ lib, stdenvNoCC, fetchFromGitLab, python3, librsvg, xcursorgen }:
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitLab,
+  python3,
+  librsvg,
+  xcursorgen,
+}:
 
 stdenvNoCC.mkDerivation rec {
   pname = "simp1e-cursors";
@@ -36,4 +43,3 @@ stdenvNoCC.mkDerivation rec {
     maintainers = with maintainers; [ natto1784 ];
   };
 }
-