Wallpapers

flake.lock

@@ -86,11 +86,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702814678,
-        "narHash": "sha256-zDtO0jV2QLoddUJinLlTQrQqCUW3dPiIWOSYgg98T7E=",
+        "lastModified": 1702195709,
+        "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1488651d02c1a7a15e284210f0d380a62d8d8cef",
+        "rev": "6761b8188b860f374b457eddfdb05c82eef9752f",
         "type": "github"
       },
       "original": {
@@ -100,21 +100,6 @@
         "type": "github"
       }
     },
-    "nixos-hardware": {
-      "locked": {
-        "lastModified": 1702453208,
-        "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1677676435,
@@ -133,11 +118,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1702645756,
-        "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=",
+        "lastModified": 1702233072,
+        "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0",
+        "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348",
         "type": "github"
       },
       "original": {
@@ -151,26 +136,9 @@
         "agenix": "agenix",
         "firefox-gnome-theme": "firefox-gnome-theme",
         "home-manager": "home-manager_2",
-        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
-        "secrets": "secrets",
-        "thunderbird-gnome-theme": "thunderbird-gnome-theme"
-      }
-    },
-    "secrets": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1702825129,
-        "narHash": "sha256-mWF0LW+8goPC6fAyh+RaeF0AdI4uTGGYDFjwXjUOcFY=",
-        "ref": "refs/heads/master",
-        "rev": "1374b9508620b9dcded687ff6f0110a1f916515a",
-        "revCount": 2,
-        "type": "git",
-        "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
+        "thunderbird-gnome-theme": "thunderbird-gnome-theme",
+        "wallpapers": "wallpapers"
       }
     },
     "thunderbird-gnome-theme": {
@@ -188,6 +156,23 @@
         "repo": "thunderbird-gnome-theme",
         "type": "github"
       }
+    },
+    "wallpapers": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1702336410,
+        "narHash": "sha256-DyC9Ro5tj3X0P2M24gZdpTkFGuZEy9JXrFLUav/b5H0=",
+        "ref": "refs/heads/master",
+        "rev": "dd78ed7242af54c33e8304feee322a71da575abd",
+        "shallow": true,
+        "type": "git",
+        "url": "ssh://git@git.vimium.com/jordan/wallpapers.git"
+      },
+      "original": {
+        "shallow": true,
+        "type": "git",
+        "url": "ssh://git@git.vimium.com/jordan/wallpapers.git"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -12,18 +12,17 @@
       url = "github:rafaelmardojai/firefox-gnome-theme";
       flake = false;
     };
-    nixos-hardware.url = "github:NixOS/nixos-hardware";
-    secrets = {
-      url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
-      flake = false;
-    };
     thunderbird-gnome-theme = {
       url = "github:rafaelmardojai/thunderbird-gnome-theme";
       flake = false;
     };
+    wallpapers = {
+      url = "git+ssh://git@git.vimium.com/jordan/wallpapers.git?shallow=1";
+      flake = false;
+    };
   };
 
-  outputs = inputs @ { self, nixpkgs, agenix, home-manager, nixos-hardware, secrets, ... }:
+  outputs = inputs @ { self, nixpkgs, agenix, home-manager, ... }:
     let
       nixpkgsForSystem = system: inputs.nixpkgs;
       overlays = [
@@ -35,7 +34,7 @@
         home-manager.nixosModule
         ./modules
       ];
-      nixosSystem = { system, name, extraModules ? [] }:
+      nixosSystem = system: name:
         let
           nixpkgs = nixpkgsForSystem system;
           lib = (import nixpkgs { inherit overlays system; }).lib;
@@ -57,17 +56,15 @@
                 };
               })
             ./hosts/${name}
-          ] ++ extraModules;
+          ];
+        };
+      nixosConfigurations = {
+        atlas = nixosSystem "x86_64-linux" "atlas";
+        eos = nixosSystem "x86_64-linux" "eos";
+        helios = nixosSystem "x86_64-linux" "helios";
+        odyssey = nixosSystem "x86_64-linux" "odyssey";
       };
     in
-    {
-      nixosConfigurations = {
-        atlas = nixosSystem { system = "x86_64-linux"; name = "atlas"; };
-        eos = nixosSystem { system = "x86_64-linux"; name = "eos"; };
-        helios = nixosSystem { system = "x86_64-linux"; name = "helios"; };
-        odyssey = nixosSystem { system = "x86_64-linux"; name = "odyssey"; };
-        pi = nixosSystem { system = "aarch64-linux"; name = "pi"; extraModules = [ nixos-hardware.nixosModules.raspberry-pi-4 ]; };
-      };
-    };
+    { inherit nixosConfigurations; };
 }
 

hosts/desktop.nix

@@ -44,12 +44,6 @@
     neovim
   ];
 
-  system.autoUpgrade = {
-    enable = true;
-    flake = "git+ssh://git@git.vimium.com/jordan/nix-config.git";
-    randomizedDelaySec = "10min";
-  };
-
   nix = {
     settings = {
       connect-timeout = 5;

hosts/odyssey/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   imports = [
@@ -50,21 +50,23 @@
     };
   };
 
-  age.secrets."odyssey-passphrase" = {
-    file = "${inputs.secrets}/passwords/services/borg/odyssey-passphrase.age";
+  age.secrets."odyssey_borg_passphrase" = {
+    file = ../../secrets/odyssey_borg_passphrase.age;
   };
 
   services.borgmatic = {
     enable = true;
     settings = {
+      location = {
         source_directories = [
           "/home/jordan/Documents"
         ];
         repositories = [
-        { label = "borgbase"; path = "ssh://iqwu22oq@iqwu22oq.repo.borgbase.com/./repo"; }
+          "ssh://iqwu22oq@iqwu22oq.repo.borgbase.com/./repo"
         ];
+      };
       storage = {
-        encryption_passcommand = "cat ${config.age.secrets.odyssey-passphrase.path}";
+        encryption_passcommand = "cat ${config.age.secrets.odyssey_borg_passphrase.path}";
         ssh_command = "ssh -i /etc/ssh/ssh_host_ed25519_key";
       };
       retention = {

hosts/pi/README.md

@@ -1,18 +0,0 @@
-# Pi
-
-## Overview
-Raspberry Pi 4
-
-## Specs
-* SoC - Broadcom BCM2711
-* CPU - ARM Cortex-A72 @ 1.8 GHz
-* Memory - 8 GB LPDDR4
-
-### Disks
-Device | Partitions _(filesystem, usage)_
---- | ---
-SD card | `/dev/sda1` (ext4, NixOS Root)
-
-### Networks
-- DHCP on `10.0.1.0/24` subnet.
-- Tailscale on `100.64.0.0/10` subnet. FQDN: `pi.mesh.vimium.net`.

hosts/pi/default.nix

@@ -1,79 +0,0 @@
-{ config, lib, pkgs, inputs, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-    ../server.nix
-  ];
-
-  networking.hostId = "731d1660";
-
-  hardware = {
-    raspberry-pi."4" = {
-      apply-overlays-dtmerge.enable = true;
-      audio.enable = false;
-      fkms-3d.enable = true;
-      xhci.enable = true;
-    };
-    deviceTree = {
-      enable = true;
-      overlays = [
-        { name = "hifiberry-digi-pro"; dtboFile = "${pkgs.device-tree_rpi.overlays}/hifiberry-digi-pro.dtbo"; }
-      ];
-    };
-    firmware = with pkgs; [
-      firmwareLinuxNonfree
-      wireless-regdb
-    ];
-  };
-
-  sound.enable = true;
-  console.enable = false;
-
-  age.secrets."passwords/networks.age" = {
-    file = "${inputs.secrets}/passwords/networks.age";
-  };
-
-  networking = {
-    wireless = {
-      enable = true;
-      interfaces = [ "wlan0" ];
-      environmentFile = config.age.secrets."passwords/networks.age".path;
-      networks = {
-        "Apollo 600 Mbps".psk = "@PSK_APOLLO@";
-      };
-    };
-  };
-
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    systemWide = true;
-  };
-
-  services.shairport-sync = {
-    enable = true;
-    group = "pipewire";
-    openFirewall = true;
-  };
-
-  services.zigbee2mqtt = {
-    enable = true;
-    settings = {
-      homeassistant = true;
-      frontend = true;
-      permit_join = true;
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    libraspberrypi
-    raspberrypi-eeprom
-  ];
-
-  system.stateVersion = "22.11";
-}
-

hosts/pi/hardware-configuration.nix

@@ -1,31 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports = [
-    (modulesPath + "/installer/sd-card/sd-image-aarch64.nix")
-  ];
-
-  boot = {
-    # Stop ZFS kernel being built
-    supportedFilesystems = lib.mkForce [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ];
-    tmp.cleanOnBoot = true;
-  };
-
-  # Fix missing modules
-  # https://github.com/NixOS/nixpkgs/issues/154163
-  nixpkgs.overlays = [
-    (final: super: {
-      makeModulesClosure = x:
-        super.makeModulesClosure (x // { allowMissing = true; });
-    })
-  ];
-
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-label/NIXOS_SD";
-      fsType = "ext4";
-      options = [ "noatime" ];
-    };
-  };
-}
-

hosts/server.nix

@@ -18,8 +18,6 @@
 
   console.keyMap = "uk";
 
-  documentation.enable = false;
-
   services.openssh = {
     enable = true;
     settings = {

modules/desktop/gnome.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 let cfg = config.modules.desktop.gnome;
 in {
@@ -99,8 +99,8 @@ in {
         window-gap = 8;
       };
       "org/gnome/desktop/background" = {
-        picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-l.jpg";
-        picture-uri-dark = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-d.jpg";
+        picture-uri = "file://${inputs.wallpapers}/Aqua.png";
+        picture-uri-dark = "file://${inputs.wallpapers}/Aqua.png";
       };
       "org/gtk/settings/file-chooser" = {
         show-hidden = true;

modules/options.nix

@@ -1,4 +1,4 @@
-{ config, options, lib, home-manager, inputs, ... }:
+{ config, options, lib, home-manager, ... }:
 
 with lib;
 {
@@ -29,7 +29,6 @@ with lib;
   };
 
   config = {
-    age.secrets."passwords/users/jordan".file = "${inputs.secrets}/passwords/users/jordan.age";
     user =
       let user = builtins.getEnv "USER";
           name = if elem user [ "" "root" ] then "jordan" else user;
@@ -42,7 +41,6 @@ with lib;
         openssh.authorizedKeys.keys = [
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
         ];
-        hashedPasswordFile = config.age.secrets."passwords/users/jordan".path;
         home = "/home/${name}";
         group = "users";
         uid = 1000;

secrets.nix

@@ -0,0 +1,10 @@
+let
+  jordan = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS";
+  users = [ jordan ];
+
+  odyssey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJre8/cjdoUnbTu0x4ClTITcq4lq+FjpEyJBbLbOlox7";
+  systems = [ odyssey ];
+in
+{
+  "secrets/odyssey_borg_passphrase.age".publicKeys = [ jordan odyssey ];
+}