Add hyprland

2024-06-09 19:08:00 +02:00
74 changed files with 1649 additions and 676 deletions
--- a/.envrc
+++ b/.envrc
@ -0,0 +1 @@
+PATH_add .
--- a/.sops.yaml
+++ b/.sops.yaml
@ -1,2 +0,0 @@
-creation_rules:
-  - age: age189laethzry4ylnd790dmpuc4xjjuwqxruc76caj3ceqhqug4g9qs0upuvw
--- a/README.md
+++ b/README.md
@ -1,26 +1,22 @@
 # nixos-laptop

-NixOS configuration for my personal laptop.
-
-Currently contains config for three systems:
- **sue**: My current laptop, a Dell XPS 9315
- **x260**: My previous laptop, a Lenovo Thinkpad x260 which is broken
- **x201**: A Lenovo Thinkpad x201 which I have as a backup system
+NixOS configuration for my laptop.
+My configuration is simple: I have one personal laptop with one user.

 ## Features

- Nixpkgs 24.05
+- Nixpkgs 23.11
+- Flakes!
 - [Nix User Repository (NUR)](https://github.com/nix-community/NUR)
    - Currently only used for Firefox Plugins
 - [Home Manager](https://github.com/nix-community/home-manager)
-    - For managing the configuration for my user
- [sops-nix](https://github.com/Mic92/sops-nix)
-    - For secret management
+    - For managing my configuration for my user
+- [Agenix](https://github.com/ryantm/agenix)
+    - To deploy global system secrets, like:
+        - Wireguard private key and shared secret
+- [Homeage](https://github.com/jordanisaacs/homeage)
+    - To deploy secrets in my home directory, like:
+        - SSH keys
+        - Syncthing private key
 - [nixos-hardware](https://github.com/NixOS/nixos-hardware)
-    - To add hardware-specific tweaks to NixOS for my laptop
- [stylix](https://stylix.danth.me/)
-    - Apply theming and styling to many programs
- [lanzaboote](https://github.com/nix-community/lanzaboote)
-    - Secure boot for NixOS
- [disko](https://github.com/nix-community/disko)
-    - Declarative disk partitioning and formatting; currently only used for my x201
+    - To add hardware-specific tweaks to NixOS for my laptop (currently a Levono ThinkPad x260)
--- a/configuration.nix
+++ b/configuration.nix
@ -1,23 +1,10 @@
-{ pkgs, config, lib, inputs, flake, system, ... }: {
-  imports = [
-    inputs.stylix.nixosModules.stylix
-    inputs.home-manager.nixosModules.home-manager
-    inputs.sops-nix.nixosModules.sops
-    "${flake}/modules/nixos/lanzaboote.nix"
-  ];
-
+{ pkgs, config, lib, ... }: {
  time.timeZone = "Europe/Amsterdam";
  i18n.defaultLocale = "en_US.UTF-8";
-  programs.ssh.startAgent = true;

  services = {
    gnome.gnome-keyring.enable = lib.mkForce false;

-    tailscale = {
-      enable = true;
-      useRoutingFeatures = "client";
-    };
-
    xserver = {
      enable = true;
      displayManager.gdm = { enable = true; };
@ -35,7 +22,6 @@
      alsa.enable = true;
      alsa.support32Bit = true;
      pulse.enable = true;
-      jack.enable = true;
    };
  };

@ -47,62 +33,26 @@
  };

  environment = {
-    # https://nix-community.github.io/home-manager/options.xhtml#opt-programs.zsh.enableCompletion
-    pathsToLink = [ "/share/zsh" ];
-
-    systemPackages = (with pkgs; [
-      age
-      borgbackup
-      btop
-      btrfs-progs
-      curl
-      dig
-      exfat
-      f3
-      fastfetch
-      file
-      git
-      gnome.gnome-shell-extensions
-      jq
-      kubectl
-      nmap
-      poppler_utils # For pdfunite
-      ripgrep
-      sbctl
-      silicon
-      sops
-      tree
-      units
-      vim
+    systemPackages = with pkgs; [
      wget
-      yq
-      ncdu
-      lshw
-    ]) ++ (with pkgs.gnomeExtensions; [
-      pop-shell
-      window-is-ready-remover
-      random-wallpaper
-    ]);
-
-    gnome.excludePackages = (with pkgs; [
-      epiphany
-      gnome-connections
-      gnome-console
-      gnome-tour
-    ]) ++ (with pkgs.gnome; [
-      geary
-      gnome-calendar
-      gnome-clocks
-      gnome-contacts
-      gnome-font-viewer
-      gnome-logs
-      gnome-maps
-      gnome-music
-      seahorse
+      curl
+      git
+      btop
+      ripgrep
+      vim
+      dogdns
+      tree
+      dig
+    ];
+    gnome.excludePackages = with pkgs; with pkgs.gnome; [
      totem
-      yelp
-      gnome-weather
-    ]);
+      gnome-tour
+      epiphany
+      geary
+      gnome-console
+      gnome-music
+      gnome-calendar
+    ];
  };

  system = {
@ -115,6 +65,8 @@
    '';
  };

+  programs.ssh.startAgent = true;
+
  security = {
    rtkit.enable = true;

@ -139,36 +91,45 @@
    };
  };

+  age = {
+    identityPaths = [ "/home/pim/.ssh/age_ed25519" ];
+
+    secrets = {
+      wg-quick-home-privkey.file = ./secrets/wg-quick-home-privkey.age;
+      wg-quick-home-preshared-key.file =
+        ./secrets/wg-quick-home-preshared-key.age;
+    };
+  };
+
  networking = {
    useDHCP = lib.mkDefault true;
-    networkmanager.unmanaged = [ "tailscale0" ];

    wg-quick.interfaces = {
      home = {
-        privateKeyFile = config.sops.secrets."wireguard/home/privateKey".path;
-        address = [ "10.225.191.4/24" ];
+        privateKeyFile = config.age.secrets.wg-quick-home-privkey.path;
+        address = [ "10.225.191.4/24" "fd11:5ee:bad:c0de::4/128" ];
        dns = [ "192.168.30.131" ];
        autostart = false;
        mtu = 1412;
        peers = [{
-          presharedKeyFile = config.sops.secrets."wireguard/home/presharedKey".path;
+          presharedKeyFile = config.age.secrets.wg-quick-home-preshared-key.path;
          endpoint = "wg.kun.is:51820";
          publicKey = "fa3mQ7ximJbH7cu2ZbWidto5xBGxEEfWvCCiUDk00Hg=";
-          allowedIPs = [ "0.0.0.0/0" ];
+          allowedIPs = [ "0.0.0.0/0" "::/0" ];
        }];
      };

      home-no-pihole = {
-        privateKeyFile = config.sops.secrets."wireguard/home/privateKey".path;
-        address = [ "10.225.191.4/24" ];
+        privateKeyFile = config.age.secrets.wg-quick-home-privkey.path;
+        address = [ "10.225.191.4/24" "fd11:5ee:bad:c0de::4/128" ];
        dns = [ "192.168.10.1" ];
        autostart = false;
        mtu = 1412;
        peers = [{
-          presharedKeyFile = config.sops.secrets."wireguard/home/presharedKey".path;
+          presharedKeyFile = config.age.secrets.wg-quick-home-preshared-key.path;
          endpoint = "wg.kun.is:51820";
          publicKey = "fa3mQ7ximJbH7cu2ZbWidto5xBGxEEfWvCCiUDk00Hg=";
-          allowedIPs = [ "0.0.0.0/0" ];
+          allowedIPs = [ "0.0.0.0/0" "::/0" ];
        }];
      };
    };
@ -186,30 +147,13 @@
    hostPlatform = lib.mkDefault "x86_64-linux";

    config = {
-      allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-        "vmware-horizon-client"
-        "libfprint-2-tod1-goodix"
-        "vmware-workstation"
-        "ipu6-camera-bins-unstable"
-        "ipu6-camera-bins"
-        "ivsc-firmware-unstable"
-        "ivsc-firmware"
-      ];
+      permittedInsecurePackages = [ "electron-25.9.0" ];
+      allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "vmware-horizon-client" "libfprint-2-tod1-goodix" "vmware-workstation" ];
    };
-
-    overlays = [
-      inputs.nur.overlay
-      (final: _prev: {
-        unstable = import inputs.nixpkgs-unstable {
-          inherit system;
-          config.allowUnfree = true;
-        };
-      })
-    ];
  };

  boot = {
-    kernelModules = [ "kvm-intel" "cdrom" ];
+    kernelModules = [ "kvm-intel" ];
    extraModulePackages = [ ];

    initrd = {
@ -227,53 +171,4 @@
    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
    pulseaudio.enable = false;
  };
-
-  stylix = {
-    enable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml";
-    image = "${inputs.nixos-artwork}/wallpapers/nix-wallpaper-binary-blue.png";
-
-    cursor = {
-      package = pkgs.bibata-cursors;
-      name = "Bibata-Modern-Classic";
-      size = 28;
-    };
-
-    fonts = {
-      monospace = {
-        package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
-        name = "JetBrainsMono Nerd Font Mono";
-      };
-
-      sansSerif = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Sans";
-      };
-
-      serif = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Serif";
-      };
-    };
-  };
-
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    extraSpecialArgs = { inherit flake inputs; };
-
-    users.pim.imports = [
-      ./home.nix
-    ];
-  };
-
-  sops = {
-    age.keyFile = "/home/pim/.config/sops/age/keys.txt";
-    defaultSopsFile = ./secrets/secrets.yaml;
-
-    secrets = {
-      "wireguard/home/presharedKey" = { };
-      "wireguard/home/privateKey" = { };
-    };
-  };
 }
--- a/flake.lock
+++ b/flake.lock
@ -1,5 +1,30 @@
 {
  "nodes": {
+    "agenix": {
+      "inputs": {
+        "darwin": "darwin",
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1716561646,
+        "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryantm",
+        "repo": "agenix",
+        "type": "github"
+      }
+    },
    "base16": {
      "inputs": {
        "fromYaml": "fromYaml"
@ -147,6 +172,28 @@
        "type": "github"
      }
    },
+    "darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1700795494,
+        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "master",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
    "disko": {
      "inputs": {
        "nixpkgs": [
@ -154,11 +201,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726730453,
-        "narHash": "sha256-Kdi7liMdbr1/uyMhMDl19O5b9LESxcnYgBRZblrJi9E=",
+        "lastModified": 1717490821,
+        "narHash": "sha256-CivVhYExnMJ2afm+o1ogB231pKW/azhUghMI53MHmOM=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "a31fe5ef162f2f963308289e6e27d37e3948a983",
+        "rev": "a838e83e21502a211b83373109a260e5ef5fbcf1",
        "type": "github"
      },
      "original": {
@ -222,7 +269,7 @@
    },
    "flake-utils": {
      "inputs": {
-        "systems": "systems"
+        "systems": "systems_3"
      },
      "locked": {
        "lastModified": 1681202837,
@ -300,11 +347,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726592409,
-        "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=",
+        "lastModified": 1717527182,
+        "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594",
+        "rev": "845a5c4c073f74105022533907703441e0464bc3",
        "type": "github"
      },
      "original": {
@ -335,6 +382,157 @@
        "type": "github"
      }
    },
+    "homeage": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1669234151,
+        "narHash": "sha256-TwT87E3m2TZLgwYJESlype14HxUOrRGojPM5C2akrMg=",
+        "owner": "jordanisaacs",
+        "repo": "homeage",
+        "rev": "02bfe4ca06962d222e522fff0240c93946b20278",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jordanisaacs",
+        "repo": "homeage",
+        "type": "github"
+      }
+    },
+    "hyprcursor": {
+      "inputs": {
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1716576411,
+        "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=",
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "type": "github"
+      }
+    },
+    "hyprland": {
+      "inputs": {
+        "hyprcursor": "hyprcursor",
+        "hyprlang": "hyprlang",
+        "hyprwayland-scanner": "hyprwayland-scanner",
+        "nixpkgs": "nixpkgs",
+        "systems": "systems_2",
+        "xdph": "xdph"
+      },
+      "locked": {
+        "lastModified": 1717784649,
+        "narHash": "sha256-rU23X1kppflHachNGlwjjVNtz5haTVgFAUrrQjRE1o0=",
+        "ref": "refs/heads/main",
+        "rev": "c31d9ef4172452f6f219f91d9b87a24d91f0cf3a",
+        "revCount": 4774,
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/hyprwm/Hyprland"
+      },
+      "original": {
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/hyprwm/Hyprland"
+      }
+    },
+    "hyprland-protocols": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "xdph",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "xdph",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1691753796,
+        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
+    "hyprlang": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1716473782,
+        "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "87d5d984109c839482b88b4795db073eb9ed446f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprwayland-scanner": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1716058375,
+        "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=",
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "rev": "3afed4364790aebe0426077631af1e164a9650cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "type": "github"
+      }
+    },
    "lanzaboote": {
      "inputs": {
        "crane": "crane",
@ -362,29 +560,13 @@
        "type": "github"
      }
    },
-    "nixos-artwork": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1719676066,
-        "narHash": "sha256-78FyNyGtDZogJUWcCT6A/T2MK87nGN/muC7ANH1b1V8=",
-        "ref": "refs/heads/master",
-        "rev": "de03e887f03037e7e781a678b57fdae603c9ca20",
-        "revCount": 208,
-        "type": "git",
-        "url": "https://github.com/NixOS/nixos-artwork.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://github.com/NixOS/nixos-artwork.git"
-      }
-    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1726724509,
-        "narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=",
+        "lastModified": 1717515267,
+        "narHash": "sha256-3d/rDckP583688YqVPc6SyXTy2gHpma0HzCv3idi1OE=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94",
+        "rev": "82b2e20fbffe6a5f0555701af136ad3e734a5faa",
        "type": "github"
      },
      "original": {
@ -396,16 +578,16 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1726447378,
-        "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
-        "owner": "nixos",
+        "lastModified": 1716330097,
+        "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
+        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
+        "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.05",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
@ -426,29 +608,13 @@
        "type": "github"
      }
    },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1725762081,
-        "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1726583932,
-        "narHash": "sha256-zACxiQx8knB3F8+Ze+1BpiYrI+CbhxyWpcSID9kVhkQ=",
+        "lastModified": 1717399147,
+        "narHash": "sha256-eCWaE/q1VItpFAxxLVt171MdtDcjEnwi6QB/yuF73JU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "658e7223191d2598641d50ee4e898126768fe847",
+        "rev": "4a4ecb0ab415c9fccfb005567a215e6a9564cdf5",
        "type": "github"
      },
      "original": {
@ -459,6 +625,22 @@
      }
    },
    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1717281328,
+        "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
      "locked": {
        "lastModified": 1714912032,
        "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
@ -476,11 +658,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1726764615,
-        "narHash": "sha256-8cVUZZd9Z/bT0JIQy/hOPta2nhZjT2b6xW7xZhFMh1M=",
+        "lastModified": 1717521378,
+        "narHash": "sha256-3UMMPUmY+sqGXuz+cZg5Ul7x8awrgrXmVg9L/Tv91QM=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "4cec60b7d77b33f845c35fcd222376c0ea866a77",
+        "rev": "9a42df165c2851b40e9288564e09b0aa54dda5f5",
        "type": "github"
      },
      "original": {
@ -522,15 +704,16 @@
    },
    "root": {
      "inputs": {
+        "agenix": "agenix",
        "disko": "disko",
        "home-manager": "home-manager",
+        "homeage": "homeage",
+        "hyprland": "hyprland",
        "lanzaboote": "lanzaboote",
-        "nixos-artwork": "nixos-artwork",
        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
        "nixpkgs-unstable": "nixpkgs-unstable",
        "nur": "nur",
-        "sops-nix": "sops-nix",
        "stylix": "stylix"
      }
    },
@ -559,27 +742,6 @@
        "type": "github"
      }
    },
-    "sops-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable_2"
-      },
-      "locked": {
-        "lastModified": 1726524647,
-        "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=",
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "rev": "e2d404a7ea599a013189aa42947f66cede0645c8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "type": "github"
-      }
-    },
    "stylix": {
      "inputs": {
        "base16": "base16",
@ -592,19 +754,18 @@
        "flake-compat": "flake-compat_2",
        "gnome-shell": "gnome-shell",
        "home-manager": "home-manager_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1718122552,
-        "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=",
+        "lastModified": 1717859878,
+        "narHash": "sha256-4tVJ4y2fRykrlBozQ1t1nSDcseSzpuODabBCQZi72lQ=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7",
+        "rev": "f0ddd45fbe8d72964e4b92701fe2243da7e48937",
        "type": "github"
      },
      "original": {
        "owner": "danth",
-        "ref": "release-24.05",
        "repo": "stylix",
        "type": "github"
      }
@ -623,6 +784,66 @@
        "repo": "default",
        "type": "github"
      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "xdph": {
+      "inputs": {
+        "hyprland-protocols": "hyprland-protocols",
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1716290197,
+        "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=",
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -6,13 +6,24 @@
    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
    nur.url = "github:nix-community/NUR";
    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-    stylix.url = "github:danth/stylix/release-24.05";
+    stylix.url = "github:danth/stylix";

    home-manager = {
      url = "github:nix-community/home-manager?ref=release-24.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };

+    homeage = {
+      url = "github:jordanisaacs/homeage";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    agenix = {
+      url = "github:ryantm/agenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
+    };
+
    lanzaboote = {
      url = "github:nix-community/lanzaboote/v0.3.0";
      inputs.nixpkgs.follows = "nixpkgs";
@ -23,34 +34,51 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    nixos-artwork = {
+    hyprland = {
      type = "git";
-      url = "https://github.com/NixOS/nixos-artwork.git";
-      flake = false;
-    };
-
-    sops-nix = {
-      url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
+      url = "https://github.com/hyprwm/Hyprland";
+      submodules = true;
    };
  };

  outputs =
-    { self
-    , nixpkgs
+    { nixpkgs
+    , nixpkgs-unstable
+    , home-manager
+    , homeage
+    , agenix
+    , nur
+    , nixos-hardware
    , ...
    }@inputs:
    let
      mkNixosSystem = extraModule: nixpkgs.lib.nixosSystem rec {
        system = "x86_64-linux";
-
-        specialArgs = {
-          inherit inputs system;
-          flake = self;
-        };
+        specialArgs = { inherit inputs; };

        modules = [
+          {
+            nixpkgs.overlays = [
+              nur.overlay
+              (final: _prev: {
+                unstable = import nixpkgs-unstable {
+                  inherit system;
+                  config.allowUnfree = true;
+                };
+              })
+            ];
+          }
          ./configuration.nix
+          ./modules/nixos/lanzaboote.nix
+          agenix.nixosModules.default
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.pim = {
+              imports = [ ./home-manager homeage.homeManagerModules.homeage ];
+            };
+          }
          extraModule
        ];
      };
@ -58,7 +86,7 @@
    {
      nixosConfigurations = {
        x260 = mkNixosSystem ({ pkgs, lib, ... }: {
-          imports = [ inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x260 ];
+          imports = [ nixos-hardware.nixosModules.lenovo-thinkpad-x260 ];

          config = {
            pim.lanzaboote.enable = true;
@ -140,7 +168,7 @@
        });

        sue = mkNixosSystem ({ ... }: {
-          imports = [ inputs.nixos-hardware.nixosModules.dell-xps-13-9310 ];
+          imports = [ nixos-hardware.nixosModules.dell-xps-13-9310 ];

          config = {
            pim.lanzaboote.enable = true;
@ -164,12 +192,19 @@
            boot.initrd.luks.devices."luks-8ffd3129-4908-4209-98c4-4eb68a35c494".device = "/dev/disk/by-uuid/8ffd3129-4908-4209-98c4-4eb68a35c494";
            boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" ];

-            hardware.ipu6 = {
-              enable = true;
-              platform = "ipu6ep";
+            specialisation.hyprland = {
+              inheritParentConfig = false;
+              configuration = import ./hyprland;
            };
          };
        });
+
+        hyprland = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          specialArgs = { inherit inputs; };
+
+          modules = [ ./hyprland ];
+        };
      };
    };
 }
--- a/home-manager/bash/default.nix
+++ b/home-manager/bash/default.nix
@ -0,0 +1,20 @@
+{
+  config = {
+    programs.bash = {
+      enable = true;
+      shellAliases = {
+        htop = "btop";
+        gp = "git push";
+        gco = "git checkout";
+        gd = "git diff";
+        gc = "git commit";
+        gpl = "git pull";
+        gb = "git branch";
+        ga = "git add";
+        gl = "git log";
+        gs = "git status";
+        tf = "tofu";
+      };
+    };
+  };
+}
--- a/home-manager/bat/default.nix
+++ b/home-manager/bat/default.nix
@ -0,0 +1,8 @@
+{
+  config = {
+    programs.bat = {
+      enable = true;
+      config.theme = "gruvbox-dark";
+    };
+  };
+}
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@ -0,0 +1,183 @@
+{ pkgs, lib, config, ... }: {
+  imports = [
+    ./bash
+    ./neovim
+    ./firefox
+    ./ssh
+    ./syncthing
+    ./keepassxc
+    ./git
+    ./direnv
+    ./thunderbird
+    ./fzf
+    ./bat
+  ];
+
+  home = {
+    username = "pim";
+    homeDirectory = "/home/pim";
+    stateVersion = "23.05";
+
+    packages = with pkgs; [
+      unstable.moonlight-qt
+      unstable.vlc
+      unstable.nicotine-plus
+      unstable.logseq
+      unstable.signal-desktop
+      unstable.telegram-desktop
+      unstable.strawberry
+      unstable.gimp
+      unstable.libreoffice
+      (pkgs.nerdfonts.override { fonts = [ "Hack" ]; })
+      virt-manager
+      gnome.gnome-tweaks
+      unstable.impression
+      poppler_utils # For pdfunite
+      silicon
+      unstable.dbeaver-bin
+      unstable.wireshark
+      units
+      btrfs-progs
+      exfat
+      unstable.qFlipper
+      f3
+      unstable.insomnia
+      unstable.vorta
+      jellyfin-media-player
+      jq
+      kubectl
+      file
+      yq
+      age
+      sops
+      nmap
+      unstable.devenv
+      unstable.attic-client
+      unstable.hexchat
+      sbctl
+      borgbackup
+      unstable.krita
+      unstable.bottles-unwrapped
+    ];
+  };
+
+  programs = {
+    home-manager.enable = true;
+    chromium.enable = true;
+
+    terminator = {
+      enable = true;
+      config = {
+        profiles.default = {
+          # Gruvbox theme: https://github.com/egel/terminator-gruvbox
+          background_color = "#282828";
+          cursor_color = "#7c6f64";
+          foreground_color = "#ebdbb2";
+          palette =
+            "#181818:#cc241d:#98971a:#d79921:#458588:#b16286:#689d6a:#a89984:#928374:#fb4934:#b8bb26:#fabd2f:#83a598:#d3869b:#8ec07c:#ebdbb2";
+        };
+
+        keybindings = {
+          zoom_in = "<Ctrl>plus";
+          zoom_out = "<Ctrl>minus";
+          new_tab = "<Ctrl><Shift>T";
+          cycle_next = "<Ctrl>Tab";
+          cycle_prev = "<Ctrl><Shift>Tab";
+          split_horiz = "<Alt>C";
+          split_vert = "<Alt>V";
+
+          go_left = "<Alt>H";
+          go_right = "<Alt>L";
+          go_up = "<Alt>K";
+          go_down = "<Alt>J";
+
+          copy = "<Ctrl><Shift>C";
+          paste = "<Ctrl><Shift>V";
+
+          layout_launcher = ""; # Default <Alt>L
+        };
+      };
+    };
+
+    # Currently, it is not possible to have Home Manager manage Liberwolf extensions.
+    # There is a draft PR which addresses this:
+    # https://github.com/nix-community/home-manager/pull/3339
+    # The extensions I currently use are:
+    # - ublock-origin (already installed by librewolf)
+    # - cookie-autodelete
+    # - clearurls
+    # - istilldontcareaboutcookies
+    # - keepassxc-browser
+    # - redirector
+    # - violentmonkey
+    # - boring-rss
+    # - kagi-search
+    # - refined-github
+    librewolf = {
+      enable = true;
+      settings = {
+        "identity.fxaccounts.enabled" = true;
+        "privacy.clearOnShutdown.history" = false;
+        "privacy.clearOnShutdown.downloads" = false;
+        "browser.translations.automaticallyPopup" = false;
+        "browser.aboutConfig.showWarning" = false;
+        "privacy.clearOnShutdown.cookies" = false;
+      };
+    };
+  };
+
+  # Let home-manager manage the X session
+  xsession = { enable = true; };
+
+  xdg = {
+    userDirs.enable = true;
+    configFile."home/postgresql_server.crt".source = ./postgresql_server.crt;
+    configFile."home/postgresql_client.crt".source = ./postgresql_client.crt;
+  };
+
+  homeage = {
+    identityPaths = [ "/home/pim/.ssh/age_ed25519" ];
+    installationType = "systemd";
+
+    file."common-pg-tfbackend" = {
+      source = ../secrets/common-pg-tfbackend.age;
+      symlinks = [ "${config.xdg.configHome}/home/common.pg.tfbackend" ];
+    };
+
+    file."ansible-vault-secret" = {
+      source = ../secrets/ansible-vault-secret.age;
+      symlinks = [ "${config.xdg.configHome}/home/ansible-vault-secret" ];
+    };
+
+    file."powerdns-api-key" = {
+      source = ../secrets/powerdns-api-key.json.age;
+      symlinks = [ "${config.xdg.configHome}/home/powerdns-api-key.json" ];
+    };
+
+    file."postgresql_client.key" = {
+      source = ../secrets/postgresql_client.key.age;
+      symlinks = [ "${config.xdg.configHome}/home/postgresql_client.key" ];
+    };
+  };
+
+  fonts.fontconfig.enable = true;
+
+  dconf.settings = with lib.hm.gvariant; {
+    "org/gnome/desktop/input-sources" = {
+      sources = [ (mkTuple [ "xkb" "us" ]) ];
+      xkb-options = [ "terminate:ctrl_alt_bksp" "caps:escape" ];
+    };
+
+    "org/gnome/desktop/interface" = {
+      monospace-font-name = "Hack Nerd Font Mono 10";
+    };
+
+    "org/gnome/desktop/sound" = {
+      allow-volume-above-100-percent = true;
+    };
+
+    "org.gnome.desktop.wm.preferences" = {
+      auto-raise = true;
+    };
+  };
+}
--- a/home-manager/direnv/default.nix
+++ b/home-manager/direnv/default.nix
@ -0,0 +1,9 @@
+{
+  config = {
+    programs.direnv = {
+      enable = true;
+      enableBashIntegration = true;
+      nix-direnv.enable = true;
+    };
+  };
+}
--- a/modules/home-manager/firefox/addons.json
+++ b/modules/home-manager/firefox/addons.json
--- a/modules/home-manager/firefox/addons.nix
+++ b/modules/home-manager/firefox/addons.nix
--- a/modules/home-manager/firefox/custom-addons.nix
+++ b/modules/home-manager/firefox/custom-addons.nix
--- a/modules/home-manager/firefox/default.nix
+++ b/modules/home-manager/firefox/default.nix
--- a/home-manager/fzf/default.nix
+++ b/home-manager/fzf/default.nix
@ -0,0 +1,8 @@
+{
+  config = {
+    programs.fzf = {
+      enable = true;
+      enableBashIntegration = true;
+    };
+  };
+}
--- a/home-manager/git/default.nix
+++ b/home-manager/git/default.nix
@ -0,0 +1,18 @@
+{
+  config = {
+    programs.git = {
+      enable = true;
+      userName = "Pim Kunis";
+      userEmail = "pim@kunis.nl";
+      extraConfig = {
+        push.autoSetupRemote = true;
+        commit.verbose = true;
+        pull.rebase = true;
+      };
+      includes = [{
+        path = "~/git/suecode/.gitconfig";
+        condition = "gitdir:~/git/suecode/**";
+      }];
+    };
+  };
+}
--- a/home-manager/keepassxc/default.nix
+++ b/home-manager/keepassxc/default.nix
@ -0,0 +1,9 @@
+{ pkgs, config, ... }: {
+  config = {
+    home.packages = [ pkgs.unstable.keepassxc ];
+    homeage.file."keepassxc.ini" = {
+      source = ../../secrets/keepassxc.ini.age;
+      symlinks = [ "${config.xdg.configHome}/keepassxc/keepassxc.ini" ];
+    };
+  };
+}
--- a/modules/home-manager/neovim/bufferline.lua
+++ b/modules/home-manager/neovim/bufferline.lua
--- a/modules/home-manager/neovim/cmp.lua
+++ b/modules/home-manager/neovim/cmp.lua
--- a/modules/home-manager/neovim/commentary.lua
+++ b/modules/home-manager/neovim/commentary.lua
--- a/modules/home-manager/neovim/core.lua
+++ b/modules/home-manager/neovim/core.lua
--- a/modules/home-manager/neovim/default.nix
+++ b/modules/home-manager/neovim/default.nix
@ -11,6 +11,7 @@
      extraPackages = with pkgs; [
        nil
        nodePackages.pyright
+        neofetch
        gopls
        terraform-ls
        nixfmt-classic
--- a/modules/home-manager/neovim/leap.lua
+++ b/modules/home-manager/neovim/leap.lua
--- a/modules/home-manager/neovim/lspconfig.lua
+++ b/modules/home-manager/neovim/lspconfig.lua
--- a/modules/home-manager/neovim/none-ls.lua
+++ b/modules/home-manager/neovim/none-ls.lua
--- a/modules/home-manager/neovim/telescope.lua
+++ b/modules/home-manager/neovim/telescope.lua
--- a/modules/home-manager/neovim/treesitter.lua
+++ b/modules/home-manager/neovim/treesitter.lua
--- a/home-manager/postgresql_client.crt
+++ b/home-manager/postgresql_client.crt
@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICrzCCAZcCFApupXAa2tPytpi3av47+az0Ggb4MA0GCSqGSIb3DQEBCwUAMBQx
+EjAQBgNVBAMMCWplZmtlLmh5cDAeFw0yMzExMjQyMjAzMjhaFw0yNDExMjMyMjAz
+MjhaMBQxEjAQBgNVBAMMCXRlcnJhZm9ybTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALeJ/fYUCmwislUw4XcCxivCUuWuUWI+t/nke9/hWEWTmDG4Z7/a
+IAKqsGk0zNATQViAXmYZwdYK70AKQhxat3OJcuZarsurOXVjVJdT4Wr5SxHGHjd0
+bwd8JzFZPIfgYCILCISFjCIfpD58kBq2bkvI4rpn4tb2iPunXp0+S8iHDMB5wAOb
+FgT0muuz9ua4R76nq79O9wLbAVf38CDR9bMGcPcKknz0sl37jr7A/pDvQzpFWO33
+eJb64b7Qe4CHslWFj1tdEkXaMpMNWHhc2TmtLtlt6a+RY1R9KdX5x0lQTyJnEwJZ
+8YTKnlMoNvkfBznuARFmNNmUYPoHE6WgonMCAwEAATANBgkqhkiG9w0BAQsFAAOC
+AQEAaH1HVPThhAkrXE4Zmh49D1zvq5uy6moV326/ovnPQfco2jYBYO5mYxBF32mx
+ShEanbJJKkFjWkQHmsWt7nrkeloz6q8sD19nLyyWmMj0Pd6wcLv017Zdo902fh27
+Rl8qZS44vEc+N/5gc2eINMfXm/JOdXYntOVpFO/I+6b9Q2iWFX3YUAXiIDiEYBvS
+BBqyXC2nVg6Lp1KVg+EaYW27sj8b5HHXnpEGdXduVmOWttdaQVjYslqmH7mUKi9f
+2U9FicMvw6KvkRki+SLKeZr2yIP1QQOnWg0BPbeCpMfdMSu/AtLkAtugZeT8p1Ko
+3hMMyKKzyyhiwpzvk21QFNZ5LA==
+-----END CERTIFICATE-----
--- a/home-manager/postgresql_server.crt
+++ b/home-manager/postgresql_server.crt
@ -0,0 +1,67 @@
+Certificate:
+    Data:
+        Version: 1 (0x0)
+        Serial Number:
+            ef:2f:4d:d4:26:7e:33:1b
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=jefke.hyp
+        Validity
+            Not Before: Nov 22 19:12:03 2023 GMT
+            Not After : Oct 29 19:12:03 2123 GMT
+        Subject: CN=jefke.hyp
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:c7:ab:eb:9c:d0:7f:4f:f1:ba:65:0a:8b:07:7b:
+                    2e:5b:f0:26:82:33:c9:73:e6:91:cc:11:94:05:1c:
+                    8d:67:29:cb:5e:67:35:02:80:54:af:99:4b:aa:ce:
+                    e8:56:62:be:63:cb:b2:4a:b0:a9:28:12:e2:77:50:
+                    7d:d5:d2:3b:48:d8:32:59:25:26:ff:a6:5c:f6:eb:
+                    ae:5b:3d:7a:14:10:ba:90:9c:6f:1f:b9:d8:99:0e:
+                    b7:09:5e:62:69:c4:c0:c6:27:b0:d3:60:0d:47:4c:
+                    a5:11:53:f2:f1:4a:f9:a6:bc:d6:a3:35:a2:e8:e5:
+                    a9:d1:60:e8:e5:18:ce:d2:60:80:4e:dc:48:ae:7f:
+                    b7:ea:76:51:28:39:a4:b0:95:82:95:93:98:b2:9f:
+                    23:c9:81:69:59:a3:e4:f7:5a:1c:01:31:96:c1:4b:
+                    59:21:f8:a2:e6:9e:21:78:0e:6b:c1:68:c7:5c:16:
+                    9a:06:54:df:b6:77:1d:2d:89:d0:c8:9e:db:b5:d4:
+                    8c:fb:b9:4f:b7:6e:39:5f:39:8e:48:73:76:7d:46:
+                    6e:1f:8d:14:cb:40:b5:ff:c6:f0:c0:44:3c:ed:52:
+                    3f:4f:7b:69:63:93:c6:41:e6:5e:ed:33:50:20:46:
+                    db:93:bf:e8:52:51:95:f1:81:73:58:da:67:21:7b:
+                    12:bd
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha256WithRSAEncryption
+         aa:5c:89:41:a6:b7:3d:65:87:ca:50:c4:f3:58:aa:d3:b4:55:
+         b1:a7:8d:18:26:17:e5:8a:21:24:a1:49:53:77:31:5b:55:63:
+         be:01:d8:fe:b7:06:7c:da:07:1f:94:6a:de:96:ad:ca:3b:20:
+         2a:e1:35:90:19:83:6d:37:d1:15:12:de:3c:0e:46:be:66:a1:
+         6a:1d:ec:72:dc:46:79:69:e4:af:77:c8:ff:cd:d6:7d:16:88:
+         ab:44:fd:70:fc:40:47:ff:43:95:11:5a:9a:56:0c:d2:dd:7c:
+         3b:87:aa:10:26:fa:25:a3:a0:43:8a:1b:ec:54:11:7e:65:67:
+         d2:06:e1:3e:3b:e1:0e:b0:80:ef:4b:35:3f:fc:34:1d:95:2e:
+         ee:c1:67:38:da:b3:74:86:4b:95:8c:0c:1d:51:28:c1:42:e9:
+         77:68:d7:ec:3b:66:30:c6:e5:2a:62:ea:15:fb:24:56:cf:02:
+         d0:25:54:a7:58:15:b5:2a:71:93:56:c0:69:7a:36:18:6c:31:
+         b1:8e:3c:77:d7:77:ac:fc:e1:94:c5:08:bb:35:ac:48:5f:6b:
+         8b:c8:c8:78:f4:a9:ca:4f:9d:51:54:89:97:c9:af:a1:fa:71:
+         df:58:f6:ff:04:7c:c8:1c:95:6b:1a:e3:a7:f6:43:1c:27:94:
+         10:03:ce:ec
+-----BEGIN CERTIFICATE-----
+MIICpjCCAY4CCQDvL03UJn4zGzANBgkqhkiG9w0BAQsFADAUMRIwEAYDVQQDDAlq
+ZWZrZS5oeXAwIBcNMjMxMTIyMTkxMjAzWhgPMjEyMzEwMjkxOTEyMDNaMBQxEjAQ
+BgNVBAMMCWplZmtlLmh5cDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AMer65zQf0/xumUKiwd7LlvwJoIzyXPmkcwRlAUcjWcpy15nNQKAVK+ZS6rO6FZi
+vmPLskqwqSgS4ndQfdXSO0jYMlklJv+mXPbrrls9ehQQupCcbx+52JkOtwleYmnE
+wMYnsNNgDUdMpRFT8vFK+aa81qM1oujlqdFg6OUYztJggE7cSK5/t+p2USg5pLCV
+gpWTmLKfI8mBaVmj5PdaHAExlsFLWSH4ouaeIXgOa8Fox1wWmgZU37Z3HS2J0Mie
+27XUjPu5T7duOV85jkhzdn1Gbh+NFMtAtf/G8MBEPO1SP097aWOTxkHmXu0zUCBG
+25O/6FJRlfGBc1jaZyF7Er0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAqlyJQaa3
+PWWHylDE81iq07RVsaeNGCYX5YohJKFJU3cxW1VjvgHY/rcGfNoHH5Rq3patyjsg
+KuE1kBmDbTfRFRLePA5Gvmahah3sctxGeWnkr3fI/83WfRaIq0T9cPxAR/9DlRFa
+mlYM0t18O4eqECb6JaOgQ4ob7FQRfmVn0gbhPjvhDrCA70s1P/w0HZUu7sFnONqz
+dIZLlYwMHVEowULpd2jX7DtmMMblKmLqFfskVs8C0CVUp1gVtSpxk1bAaXo2GGwx
+sY48d9d3rPzhlMUIuzWsSF9ri8jIePSpyk+dUVSJl8mvofpx31j2/wR8yByVaxrj
+p/ZDHCeUEAPO7A==
+-----END CERTIFICATE-----
--- a/home-manager/ssh/default.nix
+++ b/home-manager/ssh/default.nix
@ -0,0 +1,30 @@
+{ config, lib, ... }: {
+  config = {
+    programs.ssh = {
+      enable = true;
+      extraConfig = "User root";
+
+      matchBlocks = {
+        github = lib.hm.dag.entryBefore [ "*" ] {
+          hostname = "github.com";
+          user = "pizzapim";
+          identitiesOnly = true;
+        };
+        lewis = lib.hm.dag.entryBefore [ "*" ] { hostname = "lewis.dmz"; };
+        atlas = lib.hm.dag.entryBefore [ "*" ] { hostname = "atlas.dmz"; };
+        jefke = lib.hm.dag.entryBefore [ "*" ] { hostname = "jefke.dmz"; };
+        warwick = lib.hm.dag.entryBefore [ "*" ] { hostname = "warwick.dmz"; };
+      };
+    };
+
+    homeage.file."sue_ed25519" = {
+      source = ../../secrets/sue_ed25519.age;
+      symlinks = [ "${config.home.homeDirectory}/.ssh/sue_ed25519" ];
+    };
+
+    homeage.file."sue_azure_rsa" = {
+      source = ../../secrets/sue_azure_rsa.age;
+      symlinks = [ "${config.home.homeDirectory}/.ssh/sue_azure_rsa" ];
+    };
+  };
+}
--- a/home-manager/syncthing/default.nix
+++ b/home-manager/syncthing/default.nix
@ -0,0 +1,15 @@
+{ config, ... }: {
+  config = {
+    services.syncthing.enable = true;
+
+    homeage.file."syncthing-key.pem" = {
+      source = ../../secrets/syncthing-key.pem.age;
+      symlinks = [ "${config.xdg.configHome}/syncthing/key.pem" ];
+    };
+
+    homeage.file."syncthing-cert.pem" = {
+      source = ../../secrets/syncthing-cert.pem.age;
+      symlinks = [ "${config.xdg.configHome}/syncthing/cert.pem" ];
+    };
+  };
+}
--- a/home-manager/thunderbird/default.nix
+++ b/home-manager/thunderbird/default.nix
@ -0,0 +1,8 @@
+{
+  config = {
+    programs.thunderbird = {
+      enable = true;
+      profiles.default = { isDefault = true; };
+    };
+  };
+}
--- a/home.nix
+++ b/home.nix
@ -1,357 +0,0 @@
-{ pkgs, lib, config, flake, inputs, ... }: {
-  imports = [
-    ./modules/home-manager/neovim
-    ./modules/home-manager/firefox
-    inputs.sops-nix.homeManagerModules.sops
-  ];
-
-  xsession.enable = true;
-  services.syncthing.enable = true;
-
-  xdg = {
-    userDirs.enable = true;
-
-    mimeApps = {
-      enable = true;
-
-      defaultApplications =
-        let
-          applications = {
-            telegram = {
-              mimeApp = "org.telegram.desktop.desktop";
-              mimeTypes = [ "x-scheme-handler/tg" ];
-            };
-
-            librewolf = {
-              mimeApp = "librewolf.desktop";
-
-              mimeTypes = [
-                "x-scheme-handler/http"
-                "text/html"
-                "application/xhtml+xml"
-                "x-scheme-handler/https"
-                "application/pdf"
-              ];
-            };
-
-            gnomeTextEditor = {
-              mimeApp = "org.gnome.TextEditor.desktop";
-              mimeTypes = [ "text/plain" ];
-            };
-
-            thunderbird = {
-              mimeApp = "thunderbird.desktop";
-              mimeTypes = [ "x-scheme-handler/mailto" ];
-            };
-
-            loupe = {
-              mimeApp = "org.gnome.Loupe.desktop";
-              mimeTypes = [
-                "image/jpeg"
-                "image/png"
-                "image/gif"
-                "image/webp"
-                "image/tiff"
-                "image/x-tga"
-                "image/vnd-ms.dds"
-                "image/x-dds"
-                "image/bmp"
-                "image/vnd.microsoft.icon"
-                "image/vnd.radiance"
-                "image/x-exr"
-                "image/x-portable-bitmap"
-                "image/x-portable-graymap"
-                "image/x-portable-pixmap"
-                "image/x-portable-anymap"
-                "image/x-qoi"
-                "image/svg+xml"
-                "image/svg+xml-compressed"
-                "image/avif"
-                "image/heic"
-                "image/jxl"
-              ];
-            };
-          };
-
-          mimeTypesForApp = { mimeApp, mimeTypes }: map
-            (
-              mimeType: { "${mimeType}" = mimeApp; }
-            )
-            mimeTypes;
-        in
-        lib.zipAttrs (lib.flatten (map mimeTypesForApp (builtins.attrValues applications)));
-    };
-  };
-
-  home = {
-    username = "pim";
-    homeDirectory = "/home/pim";
-    stateVersion = "23.05";
-
-    packages = (with pkgs; [
-      gnome.gnome-tweaks
-      jellyfin-media-player
-      virt-manager
-    ]) ++ (with pkgs.unstable; [
-      attic-client
-      dbeaver-bin
-      devenv
-      bottles-unwrapped
-      gimp
-      hexchat
-      impression
-      insomnia
-      keepassxc
-      krita
-      libreoffice
-      # logseq # Has insecure electron dependency
-      moonlight-qt
-      nicotine-plus
-      qFlipper
-      signal-desktop
-      strawberry
-      telegram-desktop
-      vlc
-      vorta
-      wireshark
-      # nheko # Has insecure olm dependency
-      handbrake
-      feishin
-    ]);
-  };
-
-  programs = {
-    home-manager.enable = true;
-    chromium.enable = true;
-    bat.enable = true;
-
-    fzf = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-
-    alacritty = {
-      enable = true;
-      settings.shell = {
-        program = lib.getExe config.programs.tmux.package;
-        args = [ "attach" ];
-      };
-    };
-
-    thunderbird = {
-      enable = true;
-      profiles.default.isDefault = true;
-    };
-
-    direnv = {
-      enable = true;
-      enableBashIntegration = true;
-      nix-direnv.enable = true;
-    };
-
-    atuin = {
-      enable = true;
-      flags = [ "--disable-up-arrow" ];
-
-      settings = {
-        auto_sync = true;
-        sync_frequency = "5m";
-        sync_address = "https://atuin.kun.is";
-      };
-    };
-
-    zsh = {
-      enable = true;
-      autocd = true;
-      autosuggestion.enable = true;
-
-      prezto = {
-        enable = true;
-        utility.safeOps = false;
-      };
-
-      shellAliases =
-        let
-          gitExe = lib.getExe config.programs.git.package;
-        in
-        {
-          htop = lib.getExe pkgs.btop;
-          gp = "${gitExe} push";
-          gco = "${gitExe} checkout";
-          gd = "${gitExe} diff";
-          gc = "${gitExe} commit";
-          gpl = "${gitExe} pull";
-          gb = "${gitExe} branch";
-          ga = "${gitExe} add";
-          gl = "${gitExe} log";
-          gs = "${gitExe} status";
-          tf = lib.getExe pkgs.opentofu;
-        };
-    };
-
-    tmux = {
-      enable = true;
-      shell = lib.getExe config.programs.zsh.package;
-      shortcut = "a";
-      clock24 = true;
-      newSession = true;
-      mouse = true;
-      escapeTime = 10;
-      terminal = "screen-256color";
-
-      extraConfig = ''
-        unbind _
-        bind _ split-window -h
-        unbind -
-        bind - split-window -v
-        unbind h
-        bind h select-pane -L
-        unbind j
-        bind j select-pane -D
-        unbind k
-        bind k select-pane -U
-        unbind l
-        bind l select-pane -R
-      '';
-    };
-
-    ssh = {
-      enable = true;
-      extraConfig = "User root";
-
-      matchBlocks.github = lib.hm.dag.entryBefore [ "*" ] {
-        hostname = "github.com";
-        user = "pizzapim";
-        identitiesOnly = true;
-      };
-    };
-
-    git = {
-      enable = true;
-      userName = "Pim Kunis";
-      userEmail = "pim@kunis.nl";
-
-      extraConfig = {
-        push.autoSetupRemote = true;
-        commit.verbose = true;
-        pull.rebase = true;
-        init.defaultBranch = "master";
-      };
-    };
-
-    # Currently, it is not possible to have Home Manager manage Liberwolf extensions.
-    # There is a draft PR which addresses this:
-    # https://github.com/nix-community/home-manager/pull/3339
-    # The extensions I currently use are:
-    # - ublock-origin (already installed by librewolf)
-    # - cookie-autodelete
-    # - clearurls
-    # - istilldontcareaboutcookies
-    # - keepassxc-browser
-    # - redirector
-    # - violentmonkey
-    # - boring-rss
-    # - kagi-search
-    # - refined-github
-    librewolf = {
-      enable = true;
-
-      settings = {
-        "identity.fxaccounts.enabled" = true;
-        "privacy.clearOnShutdown.history" = false;
-        "privacy.clearOnShutdown.downloads" = false;
-        "browser.translations.automaticallyPopup" = false;
-        "browser.aboutConfig.showWarning" = false;
-        "privacy.clearOnShutdown.cookies" = false;
-      };
-    };
-  };
-
-  dconf.settings = with lib.hm.gvariant; {
-    "org/gnome/desktop/sound".allow-volume-above-100-percent = true;
-    "org/gnome/desktop/wm.preferences".num-workspaces = 4;
-    "org/gnome/mutter".edge-tiling = true;
-
-    "org/gnome/shell" = {
-      disable-extension-version-validation = true;
-
-      enabled-extensions = [
-        "workspace-indicator@gnome-shell-extensions.gcampax.github.com"
-        "pop-shell@system76.com"
-        "windowIsReady_Remover@nunofarruca@gmail.com"
-        "randomwallpaper@iflow.space"
-      ];
-    };
-
-    "org/gnome/desktop/input-sources" = {
-      sources = [ (mkTuple [ "xkb" "us" ]) ];
-      xkb-options = [ "terminate:ctrl_alt_bksp" "caps:escape" ];
-    };
-
-    "org/gnome/shell/extensions/pop-shell" = {
-      active-hint = true;
-      fullscreen-launcher = false;
-      mouse-cursor-focus-location = mkUint32 4;
-      mouse-cursor-follows-active-window = true;
-      show-skip-taskbar = false;
-      show-title = true;
-      smart-gaps = false;
-      snap-to-grid = false;
-      stacking-with-mouse = true;
-      tile-by-default = true;
-    };
-
-    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
-      binding = "<Super>t";
-      command = lib.getExe config.programs.alacritty.package;
-      name = "Terminal";
-    };
-
-    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
-      binding = "<Super>e";
-      command = "${lib.getExe config.programs.librewolf.package} --browser";
-      name = "Browser";
-    };
-
-    "org/gnome/desktop/wm/keybindings" = {
-      close = [ "<Shift><Super>q" ];
-      minimize = mkEmptyArray type.string;
-      move-to-workspace-1 = [ "<Shift><Super>1" ];
-      move-to-workspace-2 = [ "<Shift><Super>2" ];
-      move-to-workspace-3 = [ "<Shift><Super>3" ];
-      move-to-workspace-4 = [ "<Shift><Super>4" ];
-      switch-applications = mkEmptyArray type.string;
-      switch-applications-backward = mkEmptyArray type.string;
-      switch-to-workspace-1 = [ "<Super>1" ];
-      switch-to-workspace-2 = [ "<Super>2" ];
-      switch-to-workspace-3 = [ "<Super>3" ];
-      switch-to-workspace-4 = [ "<Super>4" ];
-      toggle-fullscreen = [ "<Super>f" ];
-    };
-
-    "org/gnome/shell/extensions/space-iflow-randomwallpaper" = {
-      auto-fetch = true;
-      change-type = 2;
-      hide-panel-icon = true;
-      history-length = 1;
-      hours = 0;
-      minutes = 30;
-      sources = [ "42" ];
-      fetch-on-startup = true;
-    };
-
-    "org/gnome/shell/extensions/space-iflow-randomwallpaper/sources/general/42".type = 4;
-    "org/gnome/shell/extensions/space-iflow-randomwallpaper/sources/localFolder/42".folder = "${flake}/wallpapers";
-  };
-
-  sops = {
-    age.keyFile = "${config.xdg.configHome}/sops/age/keys.txt";
-    defaultSopsFile = ./secrets/pim.yaml;
-
-    secrets = {
-      "keepassxc".path = "${config.xdg.configHome}/keepassxc/keepassxc.ini";
-      "syncthing/key".path = "${config.xdg.configHome}/syncthing/key.pem";
-      "syncthing/cert".path = "${config.xdg.configHome}/syncthing/cert.pem";
-    };
-  };
-}
--- a/hyprland/default.nix
+++ b/hyprland/default.nix
@ -0,0 +1,183 @@
+{ pkgs, config, lib, inputs, ... }: {
+  imports = [
+    inputs.stylix.nixosModules.stylix
+    ../modules/nixos/lanzaboote.nix
+    inputs.nixos-hardware.nixosModules.dell-xps-13-9310
+    inputs.home-manager.nixosModules.home-manager
+  ];
+
+  time.timeZone = "Europe/Amsterdam";
+  i18n.defaultLocale = "en_US.UTF-8";
+  sound.enable = true;
+
+  programs = {
+    hyprland = {
+      enable = true;
+      package = inputs.hyprland.packages."${pkgs.system}".hyprland;
+    };
+    dconf.enable = true;
+    file-roller.enable = true;
+  };
+
+  services = {
+    xserver = {
+      displayManager.gdm = {
+        enable = true;
+        wayland = true;
+      };
+      enable = true;
+      excludePackages = [ pkgs.xterm ];
+    };
+
+    printing.enable = true;
+
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      jack.enable = true;
+    };
+
+    dbus = {
+      enable = true;
+      packages = [ pkgs.gnome3.gnome-keyring pkgs.gcr ];
+    };
+    gnome = {
+      gnome-keyring.enable = true;
+      sushi.enable = true;
+    };
+  };
+
+  users = {
+    users.pim = {
+      isNormalUser = true;
+      extraGroups = [ "wheel" "input" "wireshark" "dialout" ];
+    };
+  };
+
+  environment = {
+    variables.NIXOS_OZONE_WL = "1";
+    systemPackages = with pkgs; [
+      wget
+      curl
+      git
+      btop
+      ripgrep
+      vim
+      tree
+      dig
+      jq
+      file
+      sbctl
+    ];
+
+    etc."greetd/environments".text = "hyprland";
+  };
+
+  system.stateVersion = "24.05";
+
+  security = {
+    rtkit.enable = true;
+
+    sudo.extraConfig = ''
+      Defaults        timestamp_timeout=30
+    '';
+  };
+
+  nix = {
+    package = pkgs.nixFlakes;
+    settings.trusted-users = [ "root" "pim" ];
+
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+  };
+
+  nixpkgs.hostPlatform = "x86_64-linux";
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "libfprint-2-tod1-goodix" ];
+
+  boot = {
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+
+    initrd = {
+      kernelModules = [ ];
+    };
+
+    kernel.sysctl = {
+      "net.core.default_qdisc" = "fq";
+      "net.ipv4.tcp_congestion_control" = "bbr";
+    };
+  };
+
+  hardware = {
+    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    pulseaudio.enable = false;
+
+    opengl = {
+      enable = true;
+      driSupport = true;
+      driSupport32Bit = true;
+      extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ];
+    };
+  };
+
+  pim.lanzaboote.enable = true;
+  networking.hostName = "xps-9315";
+  swapDevices = [{ device = "/dev/disk/by-uuid/96a43c35-0174-4e92-81f0-168a5f601f0b"; }];
+  fileSystems = {
+    "/" =
+      {
+        device = "/dev/disk/by-uuid/31638735-5cc4-4013-8037-17e30edcbb0a";
+        fsType = "ext4";
+      };
+
+    "/boot" =
+      {
+        device = "/dev/disk/by-uuid/560E-F8A2";
+        fsType = "vfat";
+        options = [ "fmask=0022" "dmask=0022" ];
+      };
+  };
+
+  boot.initrd.luks.devices."luks-8ffd3129-4908-4209-98c4-4eb68a35c494".device = "/dev/disk/by-uuid/8ffd3129-4908-4209-98c4-4eb68a35c494";
+  boot.initrd.availableKernelModules = [ "sd_mod" "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" ];
+
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = { inherit inputs; };
+
+    users.pim = {
+      imports = [ ./home.nix ];
+    };
+  };
+
+  stylix = {
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml";
+    image = "${inputs.hyprland}/assets/wall2.png";
+
+    cursor = {
+      package = pkgs.bibata-cursors;
+      name = "Bibata-Modern-Ice";
+    };
+
+    fonts = {
+      monospace = {
+        package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
+        name = "JetBrainsMono Nerd Font Mono";
+      };
+
+      sansSerif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Sans";
+      };
+
+      serif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Serif";
+      };
+    };
+  };
+}
--- a/hyprland/home.nix
+++ b/hyprland/home.nix
@ -0,0 +1,191 @@
+{ pkgs, lib, config, inputs, ... }: {
+  imports = [
+    ../home-manager/neovim
+    ./waybar/style.css.nix
+    ./waybar/config.jsonc.nix
+  ];
+  home = {
+    username = "pim";
+    homeDirectory = "/home/pim";
+    stateVersion = "23.05";
+
+    packages = with pkgs; [
+      hyprland
+      telegram-desktop
+      signal-desktop
+    ];
+  };
+
+  programs = {
+    home-manager.enable = true;
+    alacritty.enable = true;
+
+    librewolf = {
+      enable = true;
+      settings = {
+        "identity.fxaccounts.enabled" = true;
+        "privacy.clearOnShutdown.history" = false;
+        "privacy.clearOnShutdown.downloads" = false;
+        "browser.translations.automaticallyPopup" = false;
+        "browser.aboutConfig.showWarning" = false;
+        "privacy.clearOnShutdown.cookies" = false;
+      };
+    };
+
+    waybar = {
+      enable = true;
+
+      systemd = {
+        enable = true;
+        target = "hyprland-session.target";
+      };
+    };
+  };
+
+  fonts.fontconfig.enable = true;
+
+  wayland.windowManager.hyprland =
+    let
+      mainMod = "SUPER";
+      terminalEmulator = lib.getExe config.programs.alacritty.package;
+      fileManager = lib.getExe pkgs.gnome.nautilus;
+      webBrowser = lib.getExe config.programs.librewolf.package;
+      launcherCommand = "${lib.getExe pkgs.wofi} --show drun --allow-images --insensitive --matching fuzzy";
+      # startupScript = pkgs.writeShellScriptBin "hyprlandStart.sh" ''
+      #   ${lib.getExe pkgs.waybar} &
+      # '';
+    in
+    {
+      enable = true;
+      settings = {
+        # exec-once = "${lib.getExe startupScript}";
+        monitor = ",preferred,auto,auto";
+        env = [
+          "XCURSOR_SIZE,24"
+          "HYPRCURSOR_SIZE,24"
+        ];
+        general = {
+          gaps_in = 5;
+          gaps_out = 20;
+          border_size = 2;
+          resize_on_border = false;
+          layout = "dwindle";
+        };
+
+        decoration = {
+          rounding = 10;
+          active_opacity = "1.0";
+          inactive_opacity = "1.0";
+          drop_shadow = true;
+          shadow_range = 4;
+          shadow_render_power = 3;
+
+          blur = {
+            enabled = true;
+            size = 3;
+            passes = 1;
+            vibrancy = "0.1696";
+          };
+        };
+
+        animations = {
+          enabled = true;
+          bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
+          animation = [
+            "windows, 1, 7, myBezier"
+            "windowsOut, 1, 7, default, popin 80%"
+            "border, 1, 10, default"
+            "borderangle, 1, 8, default"
+            "fade, 1, 7, default"
+            "workspaces, 1, 6, default"
+          ];
+        };
+
+        dwindle = {
+          pseudotile = true;
+          preserve_split = true;
+        };
+
+        master.new_is_master = true;
+
+        misc = {
+          force_default_wallpaper = -1;
+          disable_hyprland_logo = false;
+        };
+
+        input = {
+          follow_mouse = 1;
+          sensitivity = 0;
+          touchpad.natural_scroll = true;
+        };
+
+        gestures.workspace_swipe = false;
+
+        bind = [
+          "${mainMod}, T, exec, ${terminalEmulator}"
+          "${mainMod}, D, exec, ${fileManager}"
+          "${mainMod}, E, exec, ${webBrowser}"
+          "${mainMod}, W, exec, ${launcherCommand}"
+
+          "${mainMod} SHIFT, Q, killactive"
+          "${mainMod}, M, exit"
+          "${mainMod}, V, togglefloating"
+          "${mainMod}, P, pseudo,"
+          "${mainMod}, C, togglesplit,"
+          "${mainMod}, F, fullscreen, 0"
+
+          "${mainMod}, left, movefocus, l"
+          "${mainMod}, right, movefocus, r"
+          "${mainMod}, up, movefocus, u"
+          "${mainMod}, down, movefocus, d"
+
+          "${mainMod}, H, movefocus, l"
+          "${mainMod}, L, movefocus, r"
+          "${mainMod}, K, movefocus, u"
+          "${mainMod}, J, movefocus, d"
+
+          "${mainMod} SHIFT, H, movewindow, l"
+          "${mainMod} SHIFT, L, movewindow, r"
+          "${mainMod} SHIFT, K, movewindow, u"
+          "${mainMod} SHIFT, J, movewindow, d"
+
+          "${mainMod} Control&SHIFT, H, resizeactive, exact -10% 0"
+          "${mainMod} Control&SHIFT, L, resizeactive, exact 10% 0"
+          "${mainMod} Control&SHIFT, K, resizeactive, exact 0 -10%"
+          "${mainMod} Control&SHIFT, J, resizeactive, exact 0 10%"
+
+          "${mainMod}, 1, workspace, 1"
+          "${mainMod}, 2, workspace, 2"
+          "${mainMod}, 3, workspace, 3"
+          "${mainMod}, 4, workspace, 4"
+          "${mainMod}, 5, workspace, 5"
+          "${mainMod}, 6, workspace, 6"
+          "${mainMod}, 7, workspace, 7"
+          "${mainMod}, 8, workspace, 8"
+          "${mainMod}, 9, workspace, 9"
+          "${mainMod}, 0, workspace, 10"
+
+          "${mainMod} SHIFT, 1, movetoworkspace, 1"
+          "${mainMod} SHIFT, 2, movetoworkspace, 2"
+          "${mainMod} SHIFT, 3, movetoworkspace, 3"
+          "${mainMod} SHIFT, 4, movetoworkspace, 4"
+          "${mainMod} SHIFT, 5, movetoworkspace, 5"
+          "${mainMod} SHIFT, 6, movetoworkspace, 6"
+          "${mainMod} SHIFT, 7, movetoworkspace, 7"
+          "${mainMod} SHIFT, 8, movetoworkspace, 8"
+          "${mainMod} SHIFT, 9, movetoworkspace, 9"
+          "${mainMod} SHIFT, 0, movetoworkspace, 10"
+
+          "${mainMod}, mouse_down, workspace, e+1"
+          "${mainMod}, mouse_up, workspace, e-1"
+        ];
+
+        bindm = [
+          "${mainMod}, mouse:272, movewindow"
+          "${mainMod}, mouse:273, resizewindow"
+        ];
+
+        windowrulev2 = "suppressevent maximize, class:.*";
+      };
+    };
+}
--- a/hyprland/waybar/config.jsonc.nix
+++ b/hyprland/waybar/config.jsonc.nix
@ -0,0 +1,183 @@
+{ pkgs, config, lib, ... }: {
+  xdg.configFile."waybar/config" = {
+    onChange = ''
+      ${pkgs.procps}/bin/pkill -u $USER -USR2 waybar || true
+    '';
+
+    text =
+      let
+        palette = config.stylix.generated.palette;
+      in
+      ''
+        {
+          "layer": "top",
+          // "output": [],
+          "position": "top",
+          "height": 36,
+          // "width": 900,
+          // "margin": "",
+          "margin-top": 10,
+          "margin-bottom": 0,
+          "margin-left": 10,
+          "margin-right": 10,
+          "spacing": 10,
+          "gtk-layer-shell": true,
+          "border-radius": 10,
+
+          "clock": {
+            "interval": 1,
+            "format": " {:%I:%M} ",
+            "format-alt": " {:%A, %d %B} ",
+            // "on-click": "gnome-calendar",
+            "tooltip": true,
+            "tooltip-format": "{calendar}",
+            "calendar": {
+              "mode": "year",
+              "mode-mon-col": 3,
+              "format": {
+                "today": "<span color='#${palette.base0F}'>{}</span>"
+              }
+            }
+          },
+          "modules-left": [
+            "clock",
+            "hyprland/workspaces",
+            "custom/notification"
+          ],
+          "modules-center": [
+            "hyprland/submap",
+            "hyprland/window"
+          ],
+          "modules-right": [
+
+            // "cpu",
+            // "memory",
+            "network#wlp2s0",
+            "bluetooth",
+            "backlight",
+            // "pulseaudio#microphone",
+            "pulseaudio#audio",
+            "battery",
+
+            "tray"
+          ],
+
+          "hyprland/workspaces": {
+            "format": " {icon} ",
+            "format-icons": {
+              "default": "󰄰",
+              "active": ""
+            },
+            "on-click": "activate"
+          },
+
+          "hyprland/submap": {
+            "format": "{}",
+            "tooltip": false
+          },
+
+          "hyprland/window": {
+            "format": " {} ",
+            "separate-outputs": false
+          },
+
+          "tray": {
+            "icon-size": 15,
+            "spacing": 10
+          },
+
+          "cpu": {
+            "format": " {usage}%",
+            "on-click": "",
+            "tooltip": false
+          },
+
+          "memory": {
+            "format": "󰍛 {used:0.1f}GB ({percentage}%) / {total:0.1f}GB",
+            "on-click": "",
+            "tooltip": false
+          },
+
+          "backlight": {
+            "format": " {icon} {percent} ",
+            "format-icons": [
+              "󰃟"
+            ],
+            "on-scroll-up": "${lib.getExe pkgs.brightnessctl} set +5%",
+            "on-scroll-down": "${lib.getExe pkgs.brightnessctl} set 5%-",
+            "on-click": "${lib.getExe pkgs.brightnessctl} set 1",
+            "tooltip": false
+          },
+
+        	"pulseaudio#audio": {
+        		"format": " {icon} {volume:2} ",
+        		"format-bluetooth": " {icon} {volume}%  ",
+        		"format-muted": " {icon} Muted ",
+        		"format-icons": {
+        			"headphones": "",
+        			"default": [
+        				"",
+        				""
+        			]
+        		},
+        		"scroll-step": 5,
+        		"on-click": "pavucontrol",
+        		"on-click-right": "pamixer -t"
+        	},
+
+          "network#wlp2s0": {
+            "interval": 1,
+            "interface": "wlan0",
+            "format-icons": [
+              "󰤯",
+              "󰤟",
+              "󰤢",
+              "󰤥",
+              "󰤨"
+            ],
+            "format-wifi": " {icon}  ", // added multiple spaces to the right, was not aligning center correctly, still is not :(
+            "format-disconnected": "󰤮",
+            "on-click": "iwgtk",
+            "tooltip": true,
+            "tooltip-format": "󰢮 {ifname}\n󰩟 {ipaddr}/{cidr}\n{icon} {essid}\n󱑽 {signalStrength}% {signaldBm} dBm {frequency} MHz\n󰞒 {bandwidthDownBytes}\n󰞕 {bandwidthUpBytes}"
+          },
+
+          "bluetooth": {
+            "format-disabled": " 󰂲 ",
+            "format-off": " 󰂲 ",
+            "format-on": " 󰂯 ",
+            "format-connected": " 󰂯 ",
+            "format-connected-battery": " 󰂯 ",
+            "tooltip-format-connected": " {device_alias} 󰂄{device_battery_percentage} ",
+            "on-click": "blueberry",
+            "tooltip": true
+          },
+
+          "battery": {
+            "states": {
+              "warning": 20,
+              "critical": 10
+            },
+
+            "format": " {icon} {capacity} ",
+            "format-charging": " 󰂄 {capacity} ",
+            "format-plugged": " 󱘖 {capacity} ",
+            "format-icons": [
+              "󰁺",
+              "󰁻",
+              "󰁼",
+              "󰁽",
+              "󰁾",
+              "󰁿",
+              "󰂀",
+              "󰂁",
+              "󰂂",
+              "󰁹"
+            ],
+            "on-click": "",
+            "tooltip": false
+          }
+        }
+      '';
+  };
+}
--- a/hyprland/waybar/style.css.nix
+++ b/hyprland/waybar/style.css.nix
@ -0,0 +1,204 @@
+{ config, ... }: {
+  programs.waybar.style =
+    let
+      palette = config.stylix.generated.palette;
+    in
+    ''
+      * {
+          font-size: 14px;
+          font-family: "Hack Nerd Font";
+          border-radius: 10;
+      }
+
+      window#waybar {
+        background-color: transparent;
+        color: #${palette.base05};
+        /* border-radius: 20px; */
+        /* border: 1px solid #${palette.base00}; */
+      }
+
+      tooltip {
+        background: #${palette.base00};
+        border: 1px solid #${palette.base05};
+        border-radius: 10px;
+      }
+      tooltip label {
+        color: #${palette.base05};
+      }
+
+      #workspaces {
+        background-color: transparent;
+        margin-top: 0;
+        margin-bottom: 0;
+      }
+
+      #workspaces button {
+        background-color: #${palette.base00};
+        color: #${palette.base05};
+        border-radius: 10px;
+        transition: all 0.3s ease;
+        margin-right: 10;
+      }
+
+      #workspaces button:hover {
+        box-shadow: inherit;
+        text-shadow: inherit;
+        background-color: #${palette.base04};
+        color: #${palette.base09};
+        min-width: 30px;
+        transition: all 0.3s ease;
+      }
+
+      #workspaces button.focused,
+      #workspaces button.active {
+        background-color: #${palette.base02};
+        color: #${palette.base09};
+        min-width: 30px;
+        transition: all 0.3s ease;
+        animation: colored-gradient 10s ease infinite;
+      }
+
+      /* #workspaces button.focused:hover,
+      #workspaces button.active:hover {
+        background-color: #${palette.base09};
+        transition: all 1s ease;
+      } */
+
+      #workspaces button.urgent {
+        background-color: #${palette.base0F};
+        color: #${palette.base00};
+        transition: all 0.3s ease;
+      }
+
+      /* #workspaces button.hidden {} */
+
+      #taskbar {
+        border-radius: 8px;
+        margin-top: 4px;
+        margin-bottom: 4px;
+        margin-left: 1px;
+        margin-right: 1px;
+      }
+
+      #taskbar button {
+        color: #${palette.base05};
+        padding: 1px 8px;
+        margin-left: 1px;
+        margin-right: 1px;
+      }
+
+      #taskbar button:hover {
+        background: transparent;
+        border: 1px solid #${palette.base02};
+        border-radius: 8px;
+        transition: all 0.3s ease;
+        animation: colored-gradient 10s ease infinite;
+      }
+
+      /* #taskbar button.maximized {} */
+
+      /* #taskbar button.minimized {} */
+
+      #taskbar button.active {
+        border: 1px solid #${palette.base02};
+        border-radius: 8px;
+        transition: all 0.3s ease;
+        animation: colored-gradient 10s ease infinite;
+      }
+
+      /* #taskbar button.fullscreen {} */
+
+      /* -------------------------------------------------------------------------------- */
+
+      #custom-launcher,
+      /* #window, */
+      #submap
+      #mode,
+      /* #tray, */
+      #cpu,
+      #memory,
+      #backlight,
+      #window  { background-color: #${palette.base02}; }
+      #pulseaudio.audio { background-color: #${palette.base02}; }
+      #pulseaudio.microphone,
+      #network { background-color: #${palette.base02}; }
+      #bluetooth  { background-color: #${palette.base02}; }
+      #battery  { background-color: #${palette.base02}; }
+      #clock { background-color: #${palette.base02}; }
+      #custom-powermenu,
+
+      #custom-notification {
+        background-color: transparent;
+        color: #${palette.base05};
+        padding: 1px 8px;
+        margin-top: 5px;
+        margin-bottom: 5px;
+        margin-left: 2px;
+        margin-right: 2px;
+        border-radius: 20px;
+        transition: all 0.3s ease;
+      }
+
+      #submap {
+        background-color: #${palette.base00};
+        border: 0;
+      }
+
+      /* If workspaces is the leftmost module, omit left margin */
+      /* .modules-left > widget:first-child > #workspaces, */
+      .modules-left > widget:first-child > #workspaces button,
+      .modules-left > widget:first-child > #taskbar button,
+      .modules-left > widget:first-child > #custom-launcher,
+      .modules-left > widget:first-child > #window,
+      .modules-left > widget:first-child > #tray,
+      .modules-left > widget:first-child > #cpu,
+      .modules-left > widget:first-child > #memory,
+      .modules-left > widget:first-child > #backlight,
+      .modules-left > widget:first-child > #pulseaudio.audio,
+      .modules-left > widget:first-child > #pulseaudio.microphone,
+      .modules-left > widget:first-child > #network,
+      .modules-left > widget:first-child > #bluetooth,
+      .modules-left > widget:first-child > #battery,
+      .modules-left > widget:first-child > #clock,
+      .modules-left > widget:first-child > #custom-powermenu,
+      .modules-left > widget:first-child > #custom-notification {
+        margin-left: 5px;
+      }
+
+      /* If workspaces is the rightmost module, omit right margin */
+      /* .modules-right > widget:last-child > #workspaces, */
+      /* .modules-right > widget:last-child > #workspaces, */
+      .modules-right > widget:last-child > #workspaces button,
+      .modules-right > widget:last-child > #taskbar button,
+      .modules-right > widget:last-child > #custom-launcher,
+      .modules-right > widget:last-child > #window,
+      .modules-right > widget:last-child > #tray,
+      .modules-right > widget:last-child > #cpu,
+      .modules-right > widget:last-child > #memory,
+      .modules-right > widget:last-child > #backlight,
+      .modules-right > widget:last-child > #pulseaudio.audio,
+      .modules-right > widget:last-child > #pulseaudio.microphone,
+      .modules-right > widget:last-child > #network,
+      .modules-right > widget:last-child > #bluetooth,
+      .modules-right > widget:last-child > #battery,
+      .modules-right > widget:last-child > #clock,
+      .modules-right > widget:last-child > #custom-powermenu,
+      .modules-right > widget:last-child > #custom-notification {
+        margin-right: 5px;
+      }
+
+      /* -------------------------------------------------------------------------------- */
+
+      #tray {
+        background-color: #${palette.base00};
+        padding: 1px 8px;
+      }
+      #tray > .passive {
+        -gtk-icon-effect: dim;
+      }
+      #tray > .needs-attention {
+        -gtk-icon-effect: highlight;
+        background-color: #${palette.base0F};
+      }
+    '';
+}
--- a/secrets/README.md
+++ b/secrets/README.md
@ -0,0 +1,3 @@
+```bash
+nix run github:ryantm/agenix# -- -e secret1.age
+```
--- a/secrets/ansible-vault-secret.age
+++ b/secrets/ansible-vault-secret.age
--- a/secrets/common-pg-tfbackend.age
+++ b/secrets/common-pg-tfbackend.age
@ -0,0 +1,12 @@
+age-encryption.org/v1
+-> ssh-ed25519 LAPUww i6BkkMy9gSSVZ+L+EMYSLakp1qA4yOGbEkLrO4Ddbxs
+FsoRnCiPsJEKQj+2iJaqn+BbU+bFMAkReRotiV+0WCs
+-> ssh-ed25519 vBZj5g +6YFp3yYXSEzRMXu7WyURkJk/cA87irnW5FpKRYnGSA
+dJkMmnxyVEv/S9FmCrRkrYDCh+OwXK+UYno3ncr5nOk
+-> 6gQa-grease Yt+ucm#U |<d\`t
+SxpuSh2ee/jDNu7mXcn82fTt6/wy7ksA+W1xHQHiShJGvyyr6dTIPEk0qY1oqIPt
+HkQNvNYLpMwpAqSTvmcmybps4CoWt0x6GJ0aBPOlYEIuwHnJ5Pkvnf4U9wPuwr6Y
+zQ
+--- hHweNMiKEIEw/TwSGhElfRiQYqLtmhwylkMWvfthyGY
+?×%Ö¿H¹§G¤/Pì#’
+ÚŠÐÛäF±QÙç„lRÊDcNÖÐ‰
ç$Hs©ŠTæžø<C5BE>C¹ÊÁÏqVf¤àˆÝkëã•ø<E280A2>ï¡×OŒÞÛµæE•êgißžXŒ§sá”)gO¢.·]·æÐCJcè<63>E^EŸq:<3A>qß&™E™#¾ArÄªÉ™€ñì
--- a/secrets/keepassxc.ini.age
+++ b/secrets/keepassxc.ini.age
--- a/secrets/pim.yaml
+++ b/secrets/pim.yaml
--- a/secrets/postgresql_client.key.age
+++ b/secrets/postgresql_client.key.age
--- a/secrets/powerdns-api-key.json.age
+++ b/secrets/powerdns-api-key.json.age
@ -0,0 +1,11 @@
+age-encryption.org/v1
+-> ssh-ed25519 LAPUww NnvaPUzk3WjwC3nu7T47DXtNqDuysbgAccdF1kWO5yQ
+XYX2GfZSHrnhoKutbqVxB9zghbl1kZDyOTphUXvt8oQ
+-> ssh-ed25519 vBZj5g mpi+OE3ST+mP05IKimQrwOZxOaDgeUUoKujOOSXEljQ
+kwHkJu14Xpqgd4POeuLLcbech+Kh2XSfBed3M1Cu8DA
+-> =6-grease C`Yq5 Y2 4
+8sgSLLYCXkFRy0SFfNH0fhb14HonKVpVfkc1rc7sC7bXVXi8FGri/d/AW42G2J9m
+W/FfhKnGBAOj1cA/wPw4cqCcQKbux78C7BdN6EfrF+ddzF+n98EwtBJ/cjzRky+A
+FJJY
+--- sytjLDBFLb2VqtF3LSiSS1Nxb56oNtx2AGzhYCPItW8
+.ÚËr-Ò†±–åØè/BD$Õ¬F³Ðó¡FÜÐ™ó‰SÅÙ/MœÎËâò ª¸òi/<2F>#	‹šÙqžï%u7ÍŸ6ƒör…W ¸öe?…ƒÉ…i,·ÐÑä[ÁY¤9ÙÿÀÁ
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@ -0,0 +1,22 @@
+let
+  pkgs = import <nixpkgs> { };
+  publicKeysURL =
+    "https://git.kun.is/pim.keys"; # https://github.com/pizzapim.keys
+  publicKeysFile = builtins.fetchurl { url = publicKeysURL; };
+  publicKeys = pkgs.lib.strings.splitString "\n"
+    (pkgs.lib.strings.fileContents publicKeysFile);
+in
+{
+  "wg-quick-home-privkey.age".publicKeys = publicKeys;
+  "wg-quick-home-preshared-key.age".publicKeys = publicKeys;
+  "sue_ed25519.age".publicKeys = publicKeys;
+  "sue_azure_rsa.age".publicKeys = publicKeys;
+  "syncthing-key.pem.age".publicKeys = publicKeys;
+  "syncthing-cert.pem.age".publicKeys = publicKeys;
+  "common-pg-tfbackend.age".publicKeys = publicKeys;
+  "ansible-vault-secret.age".publicKeys = publicKeys;
+  "powerdns-api-key.json.age".publicKeys = publicKeys;
+  "keepassxc.ini.age".publicKeys =
+    publicKeys; # Secret agent causes private keys in config file.
+  "postgresql_client.key.age".publicKeys = publicKeys;
+}
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@ -1,25 +0,0 @@
-testje: ENC[AES256_GCM,data:kMnaocttth1O6g==,iv:mV9gEMdomVhmOTBUWIFz3o23TBb7DLM2rXI/Tb81bSg=,tag:qj6TlvW5sY6Ek9M0GIqB3A==,type:str]
-wireguard:
-    home:
-        presharedKey: ENC[AES256_GCM,data:H+oCRsg2ikN9KyVacEFasYmx5XE1zrnjBthkL5OitOXHTr4Ls0zwoF5StXs=,iv:N63wO4TKagbweStqf7wL3YZ0njxDNvrISErPao5wf7o=,tag:67kZcNaCzv3RI41XmA+UFQ==,type:str]
-        privateKey: ENC[AES256_GCM,data:WcPVrLiy2JJvzIh7sUpHMnt1MNx5rw5bI+xGmkitC9nEiNytMG71wmlC4d0=,iv:sl8gZgCzaW10UH0GLycvQVHqBlDVq7BUgoIEl41lc20=,tag:7oLlVjulxuEsW+pS8sZ+Ew==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age189laethzry4ylnd790dmpuc4xjjuwqxruc76caj3ceqhqug4g9qs0upuvw
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWL1dlTjFNTXRPd0ppbE1i
-            THlsMzB1K041eUdTemRseGk5dkVwUDk2TFIwCnR1WE9iYXhHWHprZCtlSFExakhs
-            R0FtcEc0VTJ4WFBORFluYTdBTFh1NzAKLS0tIGtrYkVPSEVXV1dnb1J4V1pkQktW
-            VjNXUkpmVmxyNDNsT0ZjQjhOYklEbW8KV86AD+8QE14BZxWb7TVolwlcy1eFKxks
-            rOpqcXBqtUPaBC10IhVV434DGFIZMtRuYEQ4G/sdCsc3qiNxO3Cl4A==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-06-15T14:04:18Z"
-    mac: ENC[AES256_GCM,data:6YKdfUk4ltXQ6U7FHs9ehGDUVzfZo1cKnSJMp+zYBEBnhmz7LdCBZycBpJ9syJn4WW1jZ8Bz7+lIxDsXm35AhjI+Mia20BqcWotcCaoHUslK+QV/YRIw8wxP7pvOKNeTa9UMhrcpXBVJxdQvKEBZPWziD4Xk3RGomvGEjB3xXKY=,iv:Tvgo/tlxnNk31C/cqCAKIGRdYEug9DdqeIUdJgQj4yE=,tag:z/tWTyiYmUmc2zVc3mQq0Q==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1
--- a/secrets/sue_azure_rsa.age
+++ b/secrets/sue_azure_rsa.age
--- a/secrets/sue_ed25519.age
+++ b/secrets/sue_ed25519.age
--- a/secrets/syncthing-cert.pem.age
+++ b/secrets/syncthing-cert.pem.age
--- a/secrets/syncthing-key.pem.age
+++ b/secrets/syncthing-key.pem.age
@ -0,0 +1,12 @@
+age-encryption.org/v1
+-> ssh-ed25519 LAPUww 0YS+10yTGhQwLKj5SZkyHLAOMHScnEXuW8H1LJSJJl8
+fYIEukt41D5s417B6EcCj5DP0JCcqDKIzdUqGeNLguQ
+-> ssh-ed25519 vBZj5g ufNv/vQfhTj203S9NhLoTs3AK3v1MQC73oPLhj7TJQ8
+/ExO1bN02B6uJoWiVQDqRQ6yMd4o3qR3sUpN9OHEW50
+-> 9f-grease p
+6eUQ4dl855OIlCfN61wQ/7n8
+--- WTuEDM+CWDqaep0MlbCL1QXXzDumVR4WCXhyA3b7zm8
+Û,”ùQÎófç¥w—‹>Óœ×ÿ¿g7QÂå×Ú¤2*ð<>„ù0.Ž3zy‹•DØ#ö1ö<31>4™¹ÀE$Nw7îqAÊp¹&g;„®
+¢VÊ\oø_^èW¼<>-WÞ‚(k\¬ÝRµb£{h<*ìèÒçØ¸¤11gKÏâk<C3A2>U,Ñ$>p®zoÑlÏ5\dSÌ4OOû\¯+yÿúà(–Ä×Çå+»ñëÿçbãj¼Eº)}ì$ÒŽ¬T?»
+ÿ%;Ž¿QFiçº4ŽJH®Ÿå<C2AD>™6‹AúSâÑÜÐ‰ãˆ<C3A3>k˜Z²?Ü¸”MY26ËhÊ]e”µ(¤a¤&[‘Í³°0‡juSóXKúNd>,Ûçv®ÔŠ¬
+Ñ³F¾/BnùšgæO©m}~¦‡z™‚i‰Üx£GàÈöb
--- a/secrets/wg-quick-home-preshared-key.age
+++ b/secrets/wg-quick-home-preshared-key.age
@ -0,0 +1,9 @@
+age-encryption.org/v1
+-> ssh-ed25519 LAPUww Wlatyvlg6jc+ISAQu1QEA62IUeWnriQJg+ChseMcyFI
+tRhEc/mkG7FFZO2G5A+0NNCj693Q3dbDhMOBxKmCBjw
+-> ssh-ed25519 vBZj5g HdeqB71NJkEFgXb0LPefYl+kwQNUYJQAHBEDxKdPqxk
+6mUCxbBT6PpAf0BwTD6Tv7pDZzWmHxBWw+/IbgLXQZA
+-> N-grease
+OKOvPc2zAXju6FzjNzuCZiF9pN2hmmxMMRWxZwXar8MR
+--- QR9PJv7R2ASeHrsBO7SuZzAB9s5fD0jT/qEFuJx8CNg
+Š·_AéZñRIWnO†¢'j—Ì¤,ÄØÃ#†ò™ZPjJ©è&Zô˜ôÎÃ…›ÿ°ë…{ÕW…ðÚ˜,°×w›Þˆ %Ó±‰%
--- a/secrets/wg-quick-home-privkey.age
+++ b/secrets/wg-quick-home-privkey.age
@ -0,0 +1,10 @@
+age-encryption.org/v1
+-> ssh-ed25519 LAPUww ST/R4vPro6VMrJgRJqMIYkhaQJ0EV0ss/yX94BAxSWE
+VIWQpIuuf0OS4z1D1QsFRvvWrmbo6LJEdPJ7jmbhv+w
+-> ssh-ed25519 vBZj5g GAlVKDrXvlR7FqID4Rbpb64QChS8rwUCyJdxg2PXSw0
+cS8pDXkYvvFsiTt0i6s5r/7cxbf5IcjiNQWQAcgoXFg
+-> w-grease s,fAjpd YvL[bWVw $h4j|^ >JU
+EO9ZKdn19mADx6rwhpKftX/QxZ4yNlXgZttyn0rBpSZuVfX8Oj430VppAZ5RYwn9
+zHqBvBs6VEYUt4jOWOGl/idBNg
+--- OnaKsFMYoiOP1T2o4GIgME6KQqWqwIQM9WADk28E9qA
+<<16>˜±n-ã¸þ”iìÙ÷bÖRä¿·â;¢©Ö)¸“[G[Õ–„·FÔX°ä<C2B0>?Hne•®ò&’n¸m#œ$}”¸e]Õ-6áÂ¢¾x„
--- a/Capital/Decorations_for_Season-opening_Kabuki_Performances_at_Saruwakamachi_LACMA_M.2007.152.22.jpg
+++ b/Capital/Decorations_for_Season-opening_Kabuki_Performances_at_Saruwakamachi_LACMA_M.2007.152.22.jpg
--- a/Capital/Hiroshige,_A_bridge_in_the_rain.jpg
+++ b/Capital/Hiroshige,_A_bridge_in_the_rain.jpg
--- a/Capital/Hiroshige,_Evening_Cherry_Blossoms,_Yoshiwara_Nakanochô_(Yoshiwara_nakanochô_yozakura)_From_the_series_Famous_Views.jpg
+++ b/Capital/Hiroshige,_Evening_Cherry_Blossoms,_Yoshiwara_Nakanochô_(Yoshiwara_nakanochô_yozakura)_From_the_series_Famous_Views.jpg
--- a/Capital/Kameido_umeyashiki_no_zu_LCCN2008660840.jpg
+++ b/Capital/Kameido_umeyashiki_no_zu_LCCN2008660840.jpg
--- a/Capital/NDL-DC_1301973-Utagawa_Hiroshige-東都名所-crd.jpg
+++ b/Capital/NDL-DC_1301973-Utagawa_Hiroshige-東都名所-crd.jpg
--- a/Capital/NDL-DC_1303508-Utagawa_Hiroshige-東都名所_永代橋深川新地-crd.jpg
+++ b/Capital/NDL-DC_1303508-Utagawa_Hiroshige-東都名所_永代橋深川新地-crd.jpg
--- a/Capital/NDL-DC_1303509-Utagawa_Hiroshige-東都名所_王子滝の川-crd.jpg
+++ b/Capital/NDL-DC_1303509-Utagawa_Hiroshige-東都名所_王子滝の川-crd.jpg
--- a/Capital/NDL-DC_1303510-Utagawa_Hiroshige-東都名所_神田明神-crd.jpg
+++ b/Capital/NDL-DC_1303510-Utagawa_Hiroshige-東都名所_神田明神-crd.jpg
--- a/Capital/NDL-DC_1303511-Utagawa_Hiroshige-東都名所_真土山之図-crd.jpg
+++ b/Capital/NDL-DC_1303511-Utagawa_Hiroshige-東都名所_真土山之図-crd.jpg
--- a/Capital/NDL-DC_1303513-Utagawa_Hiroshige-東都名所_道潅山虫聞之図-crd.jpg
+++ b/Capital/NDL-DC_1303513-Utagawa_Hiroshige-東都名所_道潅山虫聞之図-crd.jpg
--- a/Capital/NDL-DC_1303514-Utagawa_Hiroshige-東都名所_深川三拾三間堂-crd.jpg
+++ b/Capital/NDL-DC_1303514-Utagawa_Hiroshige-東都名所_深川三拾三間堂-crd.jpg
--- a/Capital/NDL-DC_1303515-Utagawa_Hiroshige-東都名所_五百羅漢さゞゐ堂-crd.jpg
+++ b/Capital/NDL-DC_1303515-Utagawa_Hiroshige-東都名所_五百羅漢さゞゐ堂-crd.jpg
--- a/Capital/NDL-DC_1303516-Utagawa_Hiroshige-東都名所_芝増上寺山内図-crd.jpg
+++ b/Capital/NDL-DC_1303516-Utagawa_Hiroshige-東都名所_芝増上寺山内図-crd.jpg
--- a/Capital/NDL-DC_1308372-Utagawa_Hiroshige-東都名所_日暮里-crd.jpg
+++ b/Capital/NDL-DC_1308372-Utagawa_Hiroshige-東都名所_日暮里-crd.jpg
--- a/Capital/NDL-DC_1308374-Utagawa_Hiroshige-東都名所_芝赤羽橋之図-crd.jpg
+++ b/Capital/NDL-DC_1308374-Utagawa_Hiroshige-東都名所_芝赤羽橋之図-crd.jpg
--- a/Capital/NDL-DC_1308375-Utagawa_Hiroshige-東都名所_芝増上寺-crd.jpg
+++ b/Capital/NDL-DC_1308375-Utagawa_Hiroshige-東都名所_芝増上寺-crd.jpg
--- a/Capital/NDL-DC_1308376-Utagawa_Hiroshige-東都名所_芝愛宕山之図-crd.jpg
+++ b/Capital/NDL-DC_1308376-Utagawa_Hiroshige-東都名所_芝愛宕山之図-crd.jpg
--- a/Capital/NDL-DC_1308381-Utagawa_Hiroshige-東都名所_駿河町之図-crd.jpg
+++ b/Capital/NDL-DC_1308381-Utagawa_Hiroshige-東都名所_駿河町之図-crd.jpg
--- a/Capital/NDL-DC_1308382-Utagawa_Hiroshige-東都名所_浅草金竜山年之市群集-crd.jpg
+++ b/Capital/NDL-DC_1308382-Utagawa_Hiroshige-東都名所_浅草金竜山年之市群集-crd.jpg
--- a/Capital/東都名所_二丁町芝居の図-View_of_the_Kabuki_Theaters_at_Sakai-cho_on_Opening_Day_of_the_New_Season_(Sakai-cho_Shibai_no_Zu),_from_the_series,_
+++ b/Capital/東都名所_二丁町芝居の図-View_of_the_Kabuki_Theaters_at_Sakai-cho_on_Opening_Day_of_the_New_Season_(Sakai-cho_Shibai_no_Zu),_from_the_series,_
--- a/Capital/東都名所_真崎雪晴ノ図-Clearing_Weather_after_Snow_at_Massaki_MET_DP123291.jpg
+++ b/Capital/東都名所_真崎雪晴ノ図-Clearing_Weather_after_Snow_at_Massaki_MET_DP123291.jpg
--- a/Capital/東都名所_芝愛宕山上の図-Shiba_Atago_Sanjo_no_Zu_MET_DP123284.jpg
+++ b/Capital/東都名所_芝愛宕山上の図-Shiba_Atago_Sanjo_no_Zu_MET_DP123284.jpg