Add a pre-commit hook

flake.lock

@@ -169,11 +169,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1656311436,
+        "lastModified": 1656656878,
-        "narHash": "sha256-rXZbZ61Zvn5rE0Srh5bpfNYRXEZHIigqcjkKh2+Cvk4=",
+        "narHash": "sha256-0rA054abuLVzv24nrk4rVWQIDl20T+570UZglPhXgzg=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "5e2708f04efe0ed2616be471d0913e303ff3a9ee",
+        "rev": "e172d625f705ca4013f93d3fe061d3ecf1fc3a34",
         "type": "github"
       },
       "original": {
@@ -334,11 +334,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1656313134,
+        "lastModified": 1656367977,
-        "narHash": "sha256-VCEXqyq/+Ffu+TlDoIt2iepERFVVvmZ2flHNyVb0dPs=",
+        "narHash": "sha256-0hV17V9Up9pnAtPJ+787FhrsPnawxoTPA/VxgjRMrjc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "be3adf9920febf26ff5221ed5c8c76a43b2d94d6",
+        "rev": "3bf16c0fd141c28312be52945d1543f9ce557bb1",
         "type": "github"
       },
       "original": {
@@ -350,11 +350,11 @@
     },
     "latest": {
       "locked": {
-        "lastModified": 1656239181,
+        "lastModified": 1656461576,
-        "narHash": "sha256-wW1xRFBn376yGloXZ4QzBE4hjipMawpV18Lshd9QSPw=",
+        "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5",
+        "rev": "cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c",
         "type": "github"
       },
       "original": {
@@ -386,11 +386,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1656265786,
+        "lastModified": 1656589841,
-        "narHash": "sha256-A9RkoGrxzsmMm0vily18p92Rasb+MbdDMaSnzmywXKw=",
+        "narHash": "sha256-Kqd6r9aNIzjYGhMFYATdKwRbXBCGLcdqAJMLr4I8LG0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cd90e773eae83ba7733d2377b6cdf84d45558780",
+        "rev": "dbb62c34bbb5cdf05f1aeab07638b24b0824d605",
         "type": "github"
       },
       "original": {
@@ -402,11 +402,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1656353817,
+        "lastModified": 1656624504,
-        "narHash": "sha256-UJEzMQcft/0Ilu4LWV7UH51mr5UCo28GL06BGO+djv4=",
+        "narHash": "sha256-EuNui6P5tHk4YkfiYjcRzfc9wxpoTl2OOOgpyF6bWfs=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "78e7c2c397b0376526e83162b58de921362e3399",
+        "rev": "a50513f8a6c470208d7c494439775e62c3f47ce1",
         "type": "github"
       },
       "original": {
@@ -417,11 +417,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1656239181,
+        "lastModified": 1656461576,
-        "narHash": "sha256-wW1xRFBn376yGloXZ4QzBE4hjipMawpV18Lshd9QSPw=",
+        "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5",
+        "rev": "cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c",
         "type": "github"
       },
       "original": {
@@ -497,11 +497,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1656240210,
+        "lastModified": 1656601302,
-        "narHash": "sha256-CeP1gNUtmYHCQylROkpunvVTR8J8w/Pm6D5rjw8v4Gw=",
+        "narHash": "sha256-8vlDMdGmccsFkDTM5O3RGRTZIGBEVIDjnXpxWGoVIQc=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "b74e96f509baf0be70281c55f14cb18fefbc6b22",
+        "rev": "ce36446943a33b01de50ca27d8d17e176af13cd5",
         "type": "github"
       },
       "original": {

flake.nix

@@ -18,7 +18,7 @@
       digga.inputs.deploy.follows = "deploy";
 
       home.url = "github:nix-community/home-manager/master";
-#      home.url = "path:/home/mae/home-manager";
+      #      home.url = "path:/home/mae/home-manager";
       home.inputs.nixpkgs.follows = "latest";
       home.inputs.utils.follows = "flake-utils";
 
@@ -40,12 +40,12 @@
       naersk.inputs.nixpkgs.follows = "nixos";
 
       peerix.url = "github:cid-chan/peerix";
-#      peerix.url = "github:MaeIsBad/peerix";
+      #      peerix.url = "github:MaeIsBad/peerix";
       peerix.inputs.nixpkgs.follows = "nixos";
 
       nixos-hardware.url = "github:nixos/nixos-hardware";
       fenix.url = "github:nix-community/fenix";
-#      fenix.inputs.nixpkgs.follows = "nixos";
+      #      fenix.inputs.nixpkgs.follows = "nixos";
     };
 
   outputs =

hosts/tesco.nix

@@ -10,7 +10,7 @@
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "21.05"; # Did you read the comment?
 
-  
+
   boot.loader.grub = {
     enable = true;
     version = 2;
@@ -52,17 +52,18 @@
   };
 
   fileSystems."/" =
-    { device = "/dev/bcache0";
+    {
+      device = "/dev/bcache0";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-label/BOOT";
+    {
+      device = "/dev/disk/by-label/BOOT";
       fsType = "vfat";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-label/ssd-swap"; }
+    [{ device = "/dev/disk/by-label/ssd-swap"; }];
-    ];
 
 }

hosts/vm.nix

@@ -0,0 +1,5 @@
+{ suites, profiles, pkgs, ... }:
+{
+  imports = suites.workstation;
+  system.stateVersion = "21.05"; # Did you read the comment?
+}

overlays/overrides.nix

@@ -1,5 +1,5 @@
-channels: final: prev: 
+channels: final: prev:
-let 
+let
   latest = channels.latest;
 in
 {
@@ -29,7 +29,7 @@ in
     rust-analyzer
     cargo-crev
     cargo-fuzz
-    tdesktop    
+    tdesktop
     vimPlugins
     neovim-unwrapped;
 

pre-commit.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env -S nix shell --quiet nixpkgs#bash nixpkgs#nixpkgs-fmt --ignore-environment --command bash
+
+# Install: ln -s ../../pre-commit.sh .git/hooks/pre-commit
+
+nixpkgs-fmt --check . 

profiles/core/default.nix

@@ -6,7 +6,7 @@ in
   # Cachix
   nix = {
     binaryCaches = [
-      "https://cache.nixos.org/" 
+      "https://cache.nixos.org/"
       "https://nix-community.cachix.org"
     ];
     binaryCachePublicKeys = [
@@ -32,7 +32,7 @@ in
   environment.variables.EDITOR = "$EDITOR";
 
   services.logind.lidSwitch = "ignore";
-   services.logind.extraConfig = ''
+  services.logind.extraConfig = ''
     # don’t shutdown when power button is short-pressed
     HandlePowerKey=ignore
   '';

profiles/game/default.nix

@@ -7,7 +7,7 @@
     minetest
     mumble
     polymc
-    (retroarch.override {cores = [libretro.snes9x]; })
+    (retroarch.override { cores = [ libretro.snes9x ]; })
     olympus
     godot
   ];

profiles/peerix/default.nix

@@ -1,9 +1,9 @@
-{config, pkgs, ...}: 
+{ config, pkgs, ... }:
-let 
+let
   peerix_user = "peerix";
 in
 {
-  users.groups.${peerix_user} = {};
+  users.groups.${peerix_user} = { };
   users.users.${peerix_user} = {
     group = peerix_user;
     isSystemUser = true;

secrets/secrets.nix

@@ -6,7 +6,7 @@ let
   tesco_sys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKqryVRMbcei0pZTOP1wgTVzn452vgsUP7MrEb0LQ17s root@tesco";
   mae_tesco = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN64wtGODBn2yygv1sOXnV8qbXImbOttMlhdTKEyQCoT mae@tesco";
 
-  systemKeys = [teapot_sys tesco_sys];
+  systemKeys = [ teapot_sys tesco_sys ];
   allKeys = [ mae_teapot mae_tesco ] ++ systemKeys;
 in
 {

suites/default.nix

@@ -1,7 +1,7 @@
 { profiles, ... }:
 with profiles; rec {
   base = [ users.root core dnscrypt ];
-  workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak peerix ];
+  workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak peerix users.mae ];
-  desktop = workstation ++ [ users.mae-desk amd three_dee ];
+  desktop = workstation ++ [ amd three_dee ];
-  lap = workstation ++ [ users.mae-lap laptop bluetooth print ];
+  lap = workstation ++ [ laptop bluetooth print ];
 }

users/mae-desk/default.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home-manager.users.mae = {
-    imports = [ ../mae/home-manager-base.nix ];
-  };
-  users = (import ../mae/user.nix { inherit pkgs; });
-}

users/mae-lap/default.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home-manager.users.mae = {
-    imports = [ ../mae/home-manager-base.nix ];
-  };
-  users = (import ../mae/user.nix { inherit pkgs; });
-}

users/mae/default.nix

@@ -0,0 +1,37 @@
+{ pkgs, ... }:
+{
+  users.users.mae = {
+    uid = 1000;
+
+    isNormalUser = true;
+    hashedPassword = "$6$vyS4lqYbl3$OXztJnAC5ZayA4eCBSIRlYtsi9u1HnafsfNL28l4CJh0BISVlSj6D48CA80cshnvYW/EEzfEj7z4zTNFpJAT/.";
+    shell = pkgs.zsh;
+    extraGroups = [ "wheel" "video" "lp" "scanner" "adbusers" "render" "libvirtd" "podman" "docker" ];
+  };
+  home-manager.users.mae = { pkgs, ... }: {
+    imports = [ ../profiles/direnv ../profiles/git ../profiles/zsh ../profiles/neovim ../profiles/syncthing ../profiles/kdeconnect ../profiles/podman ../profiles/alacritty ../profiles/tmux ../profiles/mpv ../profiles/sway ];
+
+    home.sessionVariables = {
+      XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share";
+      EDITOR = "${pkgs.neovim}/bin/nvim";
+      MOZ_ENABLE_WAYLAND = 1;
+    };
+    home.stateVersion = "18.09";
+    gtk = {
+      enable = true;
+
+      theme = {
+        name = "Arc-Dark";
+        package = pkgs.arc-theme;
+      };
+
+      gtk3.extraConfig = {
+        gtk-application-prefer-dark-theme = true;
+      };
+    };
+    programs.go = {
+      enable = true;
+      goPath = ".local/go";
+    };
+  };
+}

users/mae/home-manager-base.nix

@@ -1,27 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [ ../profiles/direnv ../profiles/git ../profiles/zsh ../profiles/neovim ../profiles/syncthing ../profiles/kdeconnect ../profiles/podman ../profiles/alacritty ../profiles/tmux ../profiles/mpv ../profiles/sway ];
-
-  home.sessionVariables = {
-    XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share";
-    EDITOR = "${pkgs.neovim}/bin/nvim";
-    MOZ_ENABLE_WAYLAND = 1;
-  };
-  home.stateVersion = "18.09";
-  gtk = {
-    enable = true;
-
-    theme = {
-      name = "Arc-Dark";
-      package = pkgs.arc-theme;
-    };
-
-    gtk3.extraConfig = {
-      gtk-application-prefer-dark-theme = true;
-    };
-  };
-  programs.go = {
-    enable = true;
-    goPath = ".local/go";
-  };
-}

users/mae/user.nix

@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-{
-  users.mae = {
-    uid = 1000;
-
-    isNormalUser = true;
-    hashedPassword = "$6$vyS4lqYbl3$OXztJnAC5ZayA4eCBSIRlYtsi9u1HnafsfNL28l4CJh0BISVlSj6D48CA80cshnvYW/EEzfEj7z4zTNFpJAT/.";
-    shell = pkgs.zsh;
-    extraGroups = [ "wheel" "video" "lp" "scanner" "adbusers" "render" "libvirtd" "podman" "docker" ];
-  };
-}

users/profiles/sway/default.nix

@@ -64,8 +64,9 @@ in
         modules-right = [ "custom/riley-gender" "disk" "battery" "backlight" "pulseaudio" "clock" "tray" ];
         "custom/riley-gender" = {
           interval = "360";
-          exec = pkgs.writeShellScript "hello-from-waybar" ''
+          exec = pkgs.writeShellScript "riley-gender" ''
             set -euo pipefail
+            until ping -c1 google.com >/dev/null 2>&1; do :; done
             gender="$(${pkgs.curl}/bin/curl 'https://rly.cx/api/gender')"
             pronouns="$(${pkgs.curl}/bin/curl 'https://rly.cx/api/pronouns')"
             echo -n "Riley: $gender ($pronouns)"