:Moved zen styling to hosts:

🐛 Fix build errors. Moved zen styling to hosts and app to shared. Start tailscale in justfile
✨ Monitor specific configs in hosts
2025-04-15 18:26:14 +02:00 · 2025-04-15 18:22:06 +02:00 · 2025-04-15 17:48:57 +02:00 · 2025-04-15 13:01:23 +02:00 · 2025-04-15 13:01:23 +02:00 · 2025-04-15 12:48:27 +02:00
134 changed files with 1324 additions and 1215 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +1 @@
-home-manager/secrets/* filter=git-crypt diff=git-crypt
+shared/secrets/* filter=git-crypt diff=git-crypt
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # NixOS Configurations

-My NixOS configurations with dotfiles for my desktop
+My NixOS configurations with dotfiles for my systems.

 ![Screenshot of desktop](./.gitea/assets/desktop.png)

--- a/configuration.nix
+++ b/configuration.nix
@ -1,70 +0,0 @@
-{
-  pkgs,
-  inputs,
-  outputs,
-  common,
-  ...
-}:
-
-{
-  imports = [ ./modules ];
-
-  nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
-
-  # Bootloader.
-  boot.loader = {
-    systemd-boot.enable = true;
-    efi.canTouchEfiVariables = true;
-  };
-
-  # Define a user account. Don't forget to set a password with 'passwd'.
-  users.users.${common.username} = {
-    isNormalUser = true;
-    description = common.username;
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-    ];
-  };
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
-  environment.sessionVariables = {
-    # Tells Electron apps to use Wayland
-    NIXOS_OZONE_WL = "1";
-  };
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    wget
-    xdg-utils
-    xdg-desktop-portal
-    xdg-desktop-portal-gtk
-    unstable.protonmail-desktop
-    stremio
-    fastfetch
-    discord
-    nix-prefetch-github # Cmd to get rev and hash from GitHub
-    gimp
-    vlc
-    vdhcoapp # TODO run "vdhcoapp install" on startup
-    onlyoffice-desktopeditors
-    inputs.grayjay.packages.${pkgs.system}.grayjay
-  ];
-
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
-  ];
-
-  programs.kdeconnect.enable = true;
-
-  services = {
-    flatpak.enable = false;
-    xserver.enable = true;
-  };
-
-  system.stateVersion = common.system.version;
-}
--- a/flake.lock
+++ b/flake.lock
@ -3,7 +3,10 @@
    "ags": {
      "inputs": {
        "astal": "astal",
-        "nixpkgs": ["hyprpanel", "nixpkgs"]
+        "nixpkgs": [
+          "hyprpanel",
+          "nixpkgs"
+        ]
      },
      "locked": {
        "lastModified": 1736090999,
@ -21,7 +24,11 @@
    },
    "astal": {
      "inputs": {
-        "nixpkgs": ["hyprpanel", "ags", "nixpkgs"]
+        "nixpkgs": [
+          "hyprpanel",
+          "ags",
+          "nixpkgs"
+        ]
      },
      "locked": {
        "lastModified": 1735172721,
@ -42,11 +49,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1743414153,
-        "narHash": "sha256-bFIXz7SvLlSNR4M3vYPYS1CpEN9vTUiH01R4iR/BDmA=",
+        "lastModified": 1744447794,
+        "narHash": "sha256-z5uK5BDmFg0L/0EW2XYLGr39FbQeXyNVnIEhkZrG8+Q=",
        "owner": "catppuccin",
        "repo": "nix",
-        "rev": "2f52f9ead26f80d7b391cedcbb3eb309bd83fff4",
+        "rev": "c44fe73ed8e5d5809eded7cc6156ca9c40044e42",
        "type": "github"
      },
      "original": {
@ -55,9 +62,47 @@
        "type": "github"
      }
    },
+    "devshell": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741473158,
+        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "locked": {
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "revCount": 69,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
+      }
+    },
    "flake-parts": {
      "inputs": {
-        "nixpkgs-lib": ["nixvim", "nixpkgs"]
+        "nixpkgs-lib": [
+          "nixvim",
+          "nixpkgs"
+        ]
      },
      "locked": {
        "lastModified": 1743550720,
@ -91,16 +136,64 @@
        "type": "github"
      }
    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "nixvim",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
    "grayjay": {
      "inputs": {
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1743563044,
-        "narHash": "sha256-UkykPaJt9Yr8YbBg34Bnh4wE+J2sksSDFdaalfnkG6k=",
+        "lastModified": 1744375210,
+        "narHash": "sha256-aMnp0e+oGmsZ+VC6mgrE6lUcKMjBPotLesCosejRhdw=",
        "owner": "rishabh5321",
        "repo": "grayjay-flake",
-        "rev": "82a651064b00480042d1b7f180ca77e04ea08689",
+        "rev": "ab754473aecde1afad07ab5a5903c9336bcb5442",
        "type": "github"
      },
      "original": {
@ -111,14 +204,16 @@
    },
    "home-manager": {
      "inputs": {
-        "nixpkgs": ["nixpkgs"]
+        "nixpkgs": [
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1743387206,
-        "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=",
+        "lastModified": 1744117652,
+        "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146",
+        "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f",
        "type": "github"
      },
      "original": {
@ -128,17 +223,60 @@
        "type": "github"
      }
    },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1743808813,
+        "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_3": {
+      "inputs": {
+        "nixpkgs": [
+          "zen-browser",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1743604125,
+        "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
    "hyprpanel": {
      "inputs": {
        "ags": "ags",
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1740863579,
-        "narHash": "sha256-U4amsszfgPUTAa9FrIlYsCCpmAyko22h/nbjhmAZvAs=",
+        "lastModified": 1744259355,
+        "narHash": "sha256-gykRJw309t5NLuYXzWw9WhJFKTc4OASmc16M9jD/Vpw=",
        "owner": "Jas-SinghFSU",
        "repo": "HyprPanel",
-        "rev": "2be9f1ef6c2df2ecf0eebe5a039e8029d8d151cd",
+        "rev": "1d4d2dcc20ebd707d5e45c7e357acc1267a498d7",
        "type": "github"
      },
      "original": {
@ -149,8 +287,16 @@
    },
    "ixx": {
      "inputs": {
-        "flake-utils": ["nixvim", "nuschtosSearch", "flake-utils"],
-        "nixpkgs": ["nixvim", "nuschtosSearch", "nixpkgs"]
+        "flake-utils": [
+          "nixvim",
+          "nuschtosSearch",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixvim",
+          "nuschtosSearch",
+          "nixpkgs"
+        ]
      },
      "locked": {
        "lastModified": 1729958008,
@ -167,13 +313,35 @@
        "type": "github"
      }
    },
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1743127615,
+        "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "nix-darwin-24.11",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1742889210,
-        "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
+        "lastModified": 1744098102,
+        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "698214a32beb4f4c8e3942372c694f40848b360d",
+        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
        "type": "github"
      },
      "original": {
@ -183,17 +351,33 @@
        "type": "github"
      }
    },
-    "nixpkgs-unstable": {
+    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1743448293,
-        "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
-        "owner": "nixos",
+        "lastModified": 1744309437,
+        "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=",
+        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
+        "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1744232761,
+        "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
@ -201,11 +385,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1743448293,
-        "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
+        "lastModified": 1744232761,
+        "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
+        "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14",
        "type": "github"
      },
      "original": {
@ -233,15 +417,15 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1743501102,
-        "narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=",
-        "owner": "nixos",
+        "lastModified": 1744309437,
+        "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=",
+        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "02f2af8c8a8c3b2c05028936a1e84daefa1171d4",
+        "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
        "ref": "nixos-24.11",
        "repo": "nixpkgs",
        "type": "github"
@ -249,11 +433,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1742288794,
-        "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
+        "lastModified": 1743448293,
+        "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
+        "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
        "type": "github"
      },
      "original": {
@ -265,20 +449,29 @@
    },
    "nixvim": {
      "inputs": {
+        "devshell": "devshell",
+        "flake-compat": "flake-compat",
        "flake-parts": "flake-parts",
-        "nixpkgs": ["nixpkgs-unstable"],
-        "nuschtosSearch": "nuschtosSearch"
+        "git-hooks": "git-hooks",
+        "home-manager": "home-manager_2",
+        "nix-darwin": "nix-darwin",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nuschtosSearch": "nuschtosSearch",
+        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1743598191,
-        "narHash": "sha256-30aI8rWjX64E9vIlE4iqgQguTjItvTnQLTqHtFppF/w=",
+        "lastModified": 1743856924,
+        "narHash": "sha256-CgCbUGd9y639PfcuzA0TrA6O5N1ICl+mB95+qTG52+E=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "a183298bf67307bdb7a25a2a3c565e76029f1b9e",
+        "rev": "d209a04d349febe85c777078ca2eeea5e8bbc8a1",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
+        "ref": "nixos-24.11",
        "repo": "nixvim",
        "type": "github"
      }
@ -287,14 +480,17 @@
      "inputs": {
        "flake-utils": "flake-utils",
        "ixx": "ixx",
-        "nixpkgs": ["nixvim", "nixpkgs"]
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1743201766,
-        "narHash": "sha256-bb/dqoIjtIWtJRzASOe8g4m8W2jUIWtuoGPXdNjM/Tk=",
+        "lastModified": 1743683223,
+        "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "2651dbfad93d6ef66c440cbbf23238938b187bde",
+        "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962",
        "type": "github"
      },
      "original": {
@ -310,6 +506,7 @@
        "home-manager": "home-manager",
        "hyprpanel": "hyprpanel",
        "nixpkgs": "nixpkgs_4",
+        "nixpkgs-stable": "nixpkgs-stable",
        "nixpkgs-unstable": "nixpkgs-unstable",
        "nixvim": "nixvim",
        "spicetify-nix": "spicetify-nix",
@ -318,15 +515,17 @@
    },
    "spicetify-nix": {
      "inputs": {
-        "nixpkgs": ["nixpkgs"],
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1743595372,
-        "narHash": "sha256-e3x1mhpPpYgyyin9j/VbrBpOT5PFpEfx2hkxVZuJZhg=",
+        "lastModified": 1744423915,
+        "narHash": "sha256-6Hd8VyrOlmjlDBgPpx9NwX4+/uO4gEDIyjqbQLyniwE=",
        "owner": "Gerg-L",
        "repo": "spicetify-nix",
-        "rev": "543f12dd14c62ddee79ab79fbfd8726f312b89ff",
+        "rev": "4c4b9611c71d586ea818fa5b8dcbd81129f62560",
        "type": "github"
      },
      "original": {
@ -365,16 +564,38 @@
        "type": "github"
      }
    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1743748085,
+        "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
    "zen-browser": {
      "inputs": {
+        "home-manager": "home-manager_3",
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1743600524,
-        "narHash": "sha256-ZJesdL2jwCwBF4SsWvxNyGuHUv8cGLHIQwJxma6JQR0=",
+        "lastModified": 1744406237,
+        "narHash": "sha256-Xbt5m3/ZNeye4b42rCZOLbD8OhCOeJfUSEJ+FvfXwpg=",
        "owner": "0xc000022070",
        "repo": "zen-browser-flake",
-        "rev": "9818e303273448dde6ada0f7bff8b98f5ce261da",
+        "rev": "4d9ee0daab52a7a205e69cfddcd441ffaa09c802",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -1,75 +1,146 @@
 {
-  description = "NixOS configuration";
+  description = "Martin's NixOS configuration - Based on EmergentMind/nix-config";

  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    #
+    # ========= Official NixOS and HM Package Sources =========
+    #
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    # The next two are for pinning to stable vs unstable regardless of what the above is set to
+    # This is particularly useful when an upcoming stable release is in beta because you can effectively
+    # keep 'nixpkgs-stable' set to stable for critical packages while setting 'nixpkgs' to the beta branch to
+    # get a jump start on deprecation changes.
+    # See also 'stable-packages' and 'unstable-packages' overlays at 'overlays/default.nix"
+    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";

-    catppuccin = {
-      url = "github:catppuccin/nix";
-    };
    home-manager = {
      url = "github:nix-community/home-manager/release-24.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    hyprpanel = {
-      url = "github:Jas-SinghFSU/HyprPanel";
+
+    #
+    # ========= Utilities =========
+    #
+    # Secrets management
+    # sops-nix = {
+    # url = "github:mic92/sops-nix";
+    # inputs.nixpkgs.follows = "nixpkgs";
+    # };
+    # Catppuccin theming
+    catppuccin = {
+      url = "github:catppuccin/nix";
    };
+    # vim
    nixvim = {
-      url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
-    };
-    spicetify-nix = {
-      url = "github:Gerg-L/spicetify-nix";
+      url = "github:nix-community/nixvim/nixos-24.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };
+    # Bar
+    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
+    # Spotify
+    spicetify-nix = {
+      url = "github:Gerg-L/spicetify-nix";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+    # Browser
    zen-browser.url = "github:0xc000022070/zen-browser-flake";
+    # Video aggregator
    grayjay.url = "github:rishabh5321/grayjay-flake";
  };

  outputs =
-    inputs@{
-      self, # Get a ref to outputs
+    {
+      self,
      nixpkgs,
-      nixpkgs-unstable,
      home-manager,
      ...
-    }:
+    }@inputs:
    let
-      system = "x86_64-linux";
-      pkgs = nixpkgs.legacyPackages.${system};
      inherit (self) outputs;
-      common = import ./common.nix;
-      theme = import ./theme.nix;
-    in
-    {
-      defaultPackage.${system} = home-manager.defaultPackage.${system};
+      common = import ./shared/common.nix;
+      theme = import ./shared/theme.nix;

-      # The minimum amount of dependencies in order to run 'just switch-now'
-      devShells.${system}.default = pkgs.mkShell {
-        packages = with pkgs; [
-          just
-          git
-          git-crypt
-          nh
+      #
+      # ========= Architectures =========
+      #
+      forAllSystems = nixpkgs.lib.genAttrs [
+        "x86_64-linux"
+        "aarch64-linux"
      ];
+
+      # ========== Extend lib with lib.custom ==========
+      # NOTE: This approach allows lib.custom to propagate into hm
+      # see: https://github.com/nix-community/home-manager/pull/3454
+      customLib = (_self: _super: { custom = import ./lib { inherit (nixpkgs) lib; }; });
+      lib = nixpkgs.lib.extend customLib;
+      libHm = home-manager.lib.extend customLib;
+
+      systems = builtins.map (config: defaultAttrs // config) [
+        {
+          hostName = "desktop";
+          system = "x86_64-linux";
+          nvidia.enable = true;
+        }
+        {
+          hostName = "thinkpad";
+          system = "x86_64-linux";
+        }
+        {
+          hostName = "pi4";
+          system = "aarch64-linux";
+          wayland.enable = false;
+        }
+        # TODO Homelab config
+      ];
+
+      defaultAttrs = {
+        user = {
+          name = common.username;
+          password = "temp";
+        };
+        version = common.system.version;
+        wayland.enable = true;
+        nvidia.enable = false;
      };

-      # Adds the nix fmt command to format nix files
-      formatter.${system} = pkgs.nixfmt-rfc-style;
+    in
+    {
+      #
+      # ========= Overlays =========
+      #
+      # Custom modifications/overrides to upstream packages
+      overlays = import ./overlays.nix { inherit inputs; };

-      nixosConfigurations.${common.hostname} = nixpkgs.lib.nixosSystem {
-        system = system;
+      #
+      # ========= Host Configurations =========
+      #
+      nixosConfigurations = builtins.listToAttrs (
+        builtins.map (
+          {
+            hostName,
+            system,
+            user,
+            ...
+          }@systemConfig:
+
+          {
+            name = hostName;
+            value = nixpkgs.lib.nixosSystem {
+              inherit system;
              specialArgs = {
                inherit
                  outputs
                  inputs
                  common
                  theme
+                  lib
+                  systemConfig
                  ;
-        }; # Pass args to modules
+                isDarwin = false;
+              };
              modules = [
-          ./configuration.nix
+                ./hosts/${hostName}
                home-manager.nixosModules.home-manager
                {
                  home-manager = {
@ -77,23 +148,44 @@
                    backupFileExtension = "bkp";
                    useGlobalPkgs = true;
                    useUserPackages = true;
-              # Passes inputs as an argument to home-manager
-              extraSpecialArgs = { inherit inputs common theme; };
-              users.${common.username} = import ./home-manager;
+                    extraSpecialArgs = {
+                      inherit
+                        inputs
+                        common
+                        theme
+                        libHm
+                        systemConfig
+                        ;
+                    };
+                    users.${user.name} = import ./hosts/${hostName}/home-manager;
                  };
                }
-          ./overlays.nix
+                {
+                  nixpkgs.overlays = with inputs; [
+                    hyprpanel.overlay
+                  ];
+                }
              ];
            };
+          }
+        ) systems
+      );

-      overlays = {
-        # Gives access to unstable packages everywhere
-        unstable-packages = final: _prev: {
-          unstable = import nixpkgs-unstable {
-            system = final.system;
-            config.allowUnfree = true;
-          };
-        };
-      };
+      #
+      # ========= Formatting =========
+      #
+      # Nix formatter available through 'nix fmt' https://github.com/NixOS/nixfmt
+      formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
+
+      #
+      # ========= DevShell =========
+      #
+      # Custom shell for bootstrapping on new hosts, modifying nix-config, and secrets management
+      devShells = forAllSystems (
+        system:
+        import ./shell.nix {
+          pkgs = nixpkgs.legacyPackages.${system};
+        }
+      );
    };
 }
--- a/home-manager/hyprland/swaync/default.nix
+++ b/home-manager/hyprland/swaync/default.nix
@ -1,461 +0,0 @@
-{ lib, theme, ... }:
-
-{
-  services.swaync = {
-    enable = false;
-    style = lib.mkDefault ''
-      * {
-        all: unset;
-        font-size: 14px;
-        font-family: "${theme.nerdFont} Nerd Font", monospace;
-        transition: 200ms;
-      }
-
-      trough highlight {
-        background: #${theme.textAlpha};
-      }
-
-      scale trough {
-        margin: 0 1rem;
-        background-color: #${theme.surface0Alpha};
-        min-height: 8px;
-        min-width: 70px;
-      }
-
-      slider {
-        background-color: #${theme.blueAlpha};
-      }
-
-      .floating-notifications.background .notification-row .notification-background {
-        box-shadow:
-          0 0 8px 0 rgba(0, 0, 0, 0.8),
-          inset 0 0 0 1px #${theme.surface0Alpha};
-        border-radius: 12.6px;
-        margin: 18px;
-        background-color: #${theme.baseAlpha};
-        color: #${theme.textAlpha};
-        padding: 0;
-      }
-
-      .floating-notifications.background
-        .notification-row
-        .notification-background
-        .notification {
-        padding: 7px;
-        border-radius: 12.6px;
-      }
-
-      .floating-notifications.background
-        .notification-row
-        .notification-background
-        .notification.critical {
-        box-shadow: inset 0 0 7px 0 #${theme.redAlpha};
-      }
-
-      .floating-notifications.background
-        .notification-row
-        .notification-background
-        .notification
-        .notification-content {
-        margin: 7px;
-      }
-
-      .floating-notifications.background
-        .notification-row
-        .notification-background
-        .notification
-        .notification-content
-        .summary {
-        color: #${theme.textAlpha};
-      }
-
-      .floating-notifications.background
-        .notification-row
-        .notification-background
-        .notification
-        .notification-content
-        .time {
-        color: #${theme.subtext0Alpha};
-      }
-
-      .floating-notifications.background
-        .notification-row
-        .notification-background
-        .notification
-        .notification-content
-        .body {
-        color: #${theme.textAlpha};
-      }
-
-      .floating-notifications.background
-        .notification-row
-        .notification-background
-        .notification
-        > *:last-child
-        > * {
-        min-height: 3.4em;
-      }
-
-      .floating-notifications.background
-        .notification-row
-        .notification-background
-        .notification
-        > *:last-child
-        > *
-        .notification-action {
-        border-radius: 7px;
-        color: #${theme.textAlpha};
-        background-color: #${theme.surface0Alpha};
-        box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
-        margin: 7px;
-      }
-
-      .floating-notifications.background
-        .notification-row
-        .notification-background
-        .notification
-        > *:last-child
-        > *
-        .notification-action:hover {
-        box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
-        background-color: #${theme.surface0Alpha};
-        color: #${theme.textAlpha};
-      }
-
-      .floating-notifications.background
-        .notification-row
-        .notification-background
-        .notification
-        > *:last-child
-        > *
-        .notification-action:active {
-        box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
-        background-color: #${theme.sapphireAlpha};
-        color: #${theme.textAlpha};
-      }
-
-      /* Close Button */
-      .floating-notifications.background
-        .notification-row
-        .notification-background
-        .close-button {
-        margin: 7px;
-        padding: 2px;
-        border-radius: 6.3px;
-        color: #${theme.baseAlpha};
-        background-color: #${theme.redAlpha};
-      }
-
-      .floating-notifications.background
-        .notification-row
-        .notification-background
-        .close-button:hover {
-        background-color: #${theme.maroonAlpha};
-        color: #${theme.baseAlpha};
-      }
-
-      .floating-notifications.background
-        .notification-row
-        .notification-background
-        .close-button:active {
-        background-color: #${theme.redAlpha};
-        color: #${theme.baseAlpha};
-      }
-
-      .control-center {
-        box-shadow:
-          0 0 8px 0 rgba(0, 0, 0, 0.8),
-          inset 0 0 0 1px #${theme.surface0Alpha};
-        border-radius: 12.6px;
-        margin: 18px;
-        background-color: #${theme.baseAlpha};
-        color: #${theme.textAlpha};
-        padding: 14px;
-      }
-
-      .control-center .widget-title > label {
-        color: #${theme.textAlpha};
-        font-size: 1.3em;
-      }
-
-      .control-center .widget-title button {
-        border-radius: 7px;
-        color: #${theme.textAlpha};
-        background-color: #${theme.surface0Alpha};
-        box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
-        padding: 8px;
-      }
-
-      .control-center .widget-title button:hover {
-        box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
-        background-color: #585b70;
-        color: #${theme.textAlpha};
-      }
-
-      .control-center .widget-title button:active {
-        box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
-        background-color: #${theme.sapphireAlpha};
-        color: #${theme.baseAlpha};
-      }
-
-      .control-center .notification-row .notification-background {
-        border-radius: 7px;
-        color: #${theme.textAlpha};
-        background-color: #${theme.surface0Alpha};
-        box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
-        margin-top: 14px;
-      }
-
-      .control-center .notification-row .notification-background .notification {
-        padding: 7px;
-        border-radius: 7px;
-      }
-
-      .control-center
-        .notification-row
-        .notification-background
-        .notification.critical {
-        box-shadow: inset 0 0 7px 0 #${theme.redAlpha};
-      }
-
-      .control-center
-        .notification-row
-        .notification-background
-        .notification
-        .notification-content {
-        margin: 7px;
-      }
-
-      .control-center
-        .notification-row
-        .notification-background
-        .notification
-        .notification-content
-        .summary {
-        color: #${theme.textAlpha};
-      }
-
-      .control-center
-        .notification-row
-        .notification-background
-        .notification
-        .notification-content
-        .time {
-        color: #a6adc8;
-      }
-
-      .control-center
-        .notification-row
-        .notification-background
-        .notification
-        .notification-content
-        .body {
-        color: #${theme.textAlpha};
-      }
-
-      .control-center
-        .notification-row
-        .notification-background
-        .notification
-        > *:last-child
-        > * {
-        min-height: 3.4em;
-      }
-
-      .control-center
-        .notification-row
-        .notification-background
-        .notification
-        > *:last-child
-        > *
-        .notification-action {
-        border-radius: 7px;
-        color: #${theme.textAlpha};
-        background-color: #${theme.crustAlpha};
-        box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
-        margin: 7px;
-      }
-
-      .control-center
-        .notification-row
-        .notification-background
-        .notification
-        > *:last-child
-        > *
-        .notification-action:hover {
-        box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
-        background-color: #${theme.surface0Alpha};
-        color: #${theme.textAlpha};
-      }
-
-      .control-center
-        .notification-row
-        .notification-background
-        .notification
-        > *:last-child
-        > *
-        .notification-action:active {
-        box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
-        background-color: #${theme.sapphireAlpha};
-        color: #${theme.textAlpha};
-      }
-
-      .control-center .notification-row .notification-background .close-button {
-        margin: 7px;
-        padding: 2px;
-        border-radius: 6.3px;
-        color: #${theme.baseAlpha};
-        background-color: #${theme.maroonAlpha};
-      }
-
-      .close-button {
-        border-radius: 6.3px;
-      }
-
-      .control-center .notification-row .notification-background .close-button:hover {
-        background-color: #${theme.redAlpha};
-        color: #${theme.baseAlpha};
-      }
-
-      .control-center
-        .notification-row
-        .notification-background
-        .close-button:active {
-        background-color: #${theme.redAlpha};
-        color: #${theme.baseAlpha};
-      }
-
-      .control-center .notification-row .notification-background:hover {
-        box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
-        background-color: #${theme.overlay1Alpha};
-        color: #${theme.textAlpha};
-      }
-
-      .control-center .notification-row .notification-background:active {
-        box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
-        background-color: #${theme.sapphireAlpha};
-        color: #${theme.textAlpha};
-      }
-
-      .notification.critical progress {
-        background-color: #${theme.redAlpha};
-      }
-
-      .notification.low progress,
-      .notification.normal progress {
-        background-color: #${theme.blueAlpha};
-      }
-
-      .control-center-dnd {
-        margin-top: 5px;
-        border-radius: 8px;
-        background: #${theme.surface0Alpha};
-        border: 1px solid #${theme.surface1Alpha};
-        box-shadow: none;
-      }
-
-      .control-center-dnd:checked {
-        background: #${theme.surface0Alpha};
-      }
-
-      .control-center-dnd slider {
-        background: #${theme.surface1Alpha};
-        border-radius: 8px;
-      }
-
-      .widget-dnd {
-        margin: 0px;
-        font-size: 1.1rem;
-      }
-
-      .widget-dnd > switch {
-        font-size: initial;
-        border-radius: 8px;
-        background: #${theme.surface0Alpha};
-        border: 1px solid #${theme.surface1Alpha};
-        box-shadow: none;
-      }
-
-      .widget-dnd > switch:checked {
-        background: #${theme.surface0Alpha};
-      }
-
-      .widget-dnd > switch slider {
-        background: #${theme.surface1Alpha};
-        border-radius: 8px;
-        border: 1px solid #${theme.overlay0Alpha};
-      }
-
-      .widget-mpris .widget-mpris-player {
-        background: #${theme.surface0Alpha};
-        padding: 7px;
-      }
-
-      .widget-mpris .widget-mpris-title {
-        font-size: 1.2rem;
-      }
-
-      .widget-mpris .widget-mpris-subtitle {
-        font-size: 0.8rem;
-      }
-
-      .widget-menubar > box > .menu-button-bar > button > label {
-        font-size: 3rem;
-        padding: 0.5rem 2rem;
-      }
-
-      .widget-menubar > box > .menu-button-bar > :last-child {
-        color: #${theme.redAlpha};
-      }
-
-      .power-buttons button:hover,
-      .powermode-buttons button:hover,
-      .screenshot-buttons button:hover {
-        background: #${theme.surface0Alpha};
-      }
-
-      .control-center .widget-label > label {
-        color: #${theme.textAlpha};
-        font-size: 2rem;
-      }
-
-      .widget-buttons-grid {
-        padding-top: 1rem;
-      }
-
-      .widget-buttons-grid > flowbox > flowboxchild > button label {
-        font-size: 2.5rem;
-      }
-
-      .widget-volume {
-        padding-top: 1rem;
-      }
-
-      .widget-volume label {
-        font-size: 1.5rem;
-        color: #${theme.sapphireAlpha};
-      }
-
-      .widget-volume trough highlight {
-        background: #${theme.sapphireAlpha};
-      }
-
-      .widget-backlight trough highlight {
-        background: #${theme.yellowAlpha};
-      }
-
-      .widget-backlight label {
-        font-size: 1.5rem;
-        color: #${theme.yellowAlpha};
-      }
-
-      .widget-backlight .KB {
-        padding-bottom: 1rem;
-      }
-
-      .image {
-        padding-right: 0.5rem;
-      }
-    '';
-  };
-}
--- a/home-manager/hyprland/waybar/config/config.jsonc
+++ b/home-manager/hyprland/waybar/config/config.jsonc
@ -1,108 +0,0 @@
-{
-  "layer": "top",
-  // Waybar at top layer
-  "position": "top",
-  // Waybar position (top|bottom|left|right)
-  // "width": 1280, // Waybar width
-  // Choose the order of the modules
-  "modules-left": ["hyprland/workspaces", "custom/music"],
-  "modules-center": ["hyprland/window"],
-  "modules-right": [
-    "hyprland/language",
-    "wireplumber",
-    "backlight",
-    "clock",
-    "custom/notification",
-    "tray",
-    "custom/lock",
-    "custom/power"
-  ],
-  "hyprland/workspaces": {
-    "disable-scroll": false,
-    "sort-by-name": true,
-    "format": " {id} "
-  },
-  "hyprland/window": {
-    "format": "{initialTitle}"
-  },
-  "tray": {
-    "icon-size": 21,
-    "spacing": 10
-  },
-  // TODO better music module
-  "custom/music": {
-    "format": "󰓃 {}",
-    "escape": true,
-    "interval": 5,
-    "tooltip": false,
-    "exec": "playerctl metadata --format='{{ title }}'",
-    "on-click": "playerctl play-pause",
-    "max-length": 50
-  },
-  "clock": {
-    "timezone": "Europe/Oslo",
-    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-    "format": " {:%H:%M   %d/%m}",
-    "calendar": {
-      "mode": "month",
-      "weeks-pos": "left",
-      "format": {
-        "months": "<span color='#ffead3'><b>{}</b></span>",
-        "days": "<span color='#ecc6d9'><b>{}</b></span>",
-        "weeks": "<span color='#99ffdd'><b>W{}</b></span>",
-        "weekdays": "<span color='#ffcc66'><b>{}</b></span>",
-        "today": "<span color='#ff6699'><b><u>{}</u></b></span>"
-      }
-    }
-  },
-  "backlight": {
-    "device": "intel_backlight",
-    "format": "{icon}",
-    "format-icons": ["", "", "", "", "", "", "", "", ""]
-  },
-  "wireplumber": {
-    // "scroll-step": 1, // %, can be a float
-    "format": "{icon} {volume}%",
-    "format-muted": " ",
-    "format-icons": {
-      "default": ["", " ", " "]
-    },
-    "on-click": "pavucontrol"
-  },
-  "hyprland/language": {
-    "format-en": "EN",
-    "format-no": "NO",
-    "keyboard-name": "logitech-logitech-g710-keyboard",
-    "on-click": "hyprctl switchxkblayout logitech-logitech-g710-keyboard next"
-  },
-  "custom/lock": {
-    "tooltip": false,
-    "on-click": "sh -c '(sleep 0.5s; hyprlock)'",
-    "format": ""
-  },
-  "custom/power": {
-    "tooltip": false,
-    "on-click": "wlogout &",
-    "format": " "
-  },
-  "custom/notification": {
-    "tooltip": false,
-    "format": "{icon}",
-    "format-icons": {
-      "notification": "<span foreground='#f38ba8'><sup></sup></span>",
-      "none": "",
-      "dnd-notification": "<span foreground='#f38ba8'><sup></sup></span>",
-      "dnd-none": "",
-      "inhibited-notification": "<span foreground='#f38ba8'><sup></sup></span>",
-      "inhibited-none": "",
-      "dnd-inhibited-notification": "<span foreground='#f38ba8'><sup></sup></span>",
-      "dnd-inhibited-none": ""
-    },
-    "return-type": "json",
-    "exec-if": "which swaync-client",
-    "exec": "swaync-client -swb",
-    "on-click": "swaync-client -t -sw",
-    "on-click-right": "swaync-client -d -sw",
-    "escape": true
-  }
-}
--- a/home-manager/hyprland/waybar/config/mocha.css
+++ b/home-manager/hyprland/waybar/config/mocha.css
@ -1,37 +0,0 @@
-/*
-*
-* Catppuccin Mocha palette
-* Maintainer: rubyowo
-*
-*/
-
-@define-color base   #1e1e2e;
-@define-color mantle #181825;
-@define-color crust  #11111b;
-
-@define-color text     #cdd6f4;
-@define-color subtext0 #a6adc8;
-@define-color subtext1 #bac2de;
-
-@define-color surface0 #313244;
-@define-color surface1 #45475a;
-@define-color surface2 #585b70;
-
-@define-color overlay0 #6c7086;
-@define-color overlay1 #7f849c;
-@define-color overlay2 #9399b2;
-
-@define-color blue      #89b4fa;
-@define-color lavender  #b4befe;
-@define-color sapphire  #74c7ec;
-@define-color sky       #89dceb;
-@define-color teal      #94e2d5;
-@define-color green     #a6e3a1;
-@define-color yellow    #f9e2af;
-@define-color peach     #fab387;
-@define-color maroon    #eba0ac;
-@define-color red       #f38ba8;
-@define-color mauve     #cba6f7;
-@define-color pink      #f5c2e7;
-@define-color flamingo  #f2cdcd;
-@define-color rosewater #f5e0dc;
--- a/home-manager/hyprland/waybar/config/style.css
+++ b/home-manager/hyprland/waybar/config/style.css
@ -1,104 +0,0 @@
-@import "mocha.css";
-
-* {
-  font-family: JetBrainsMono Nerd Font;
-  font-size: 15px;
-  min-height: 0;
-}
-
-#waybar {
-  background: transparent;
-  color: @text;
-  margin: 5px 5px;
-}
-
-#workspaces {
-  border-radius: 1rem;
-  background-color: @surface0;
-  margin: 5px 5px 5px 1rem;
-}
-
-#workspaces button {
-  color: @lavender;
-  border-radius: 1rem;
-  padding: 0.4rem;
-}
-
-#workspaces button.active {
-  color: @sky;
-  border-radius: 1rem;
-}
-
-#workspaces button:hover {
-  color: @sapphire;
-  border-radius: 1rem;
-}
-
-#language,
-#window,
-#custom-notification,
-#custom-music,
-#tray,
-#backlight,
-#clock,
-#wireplumber,
-#custom-lock,
-#custom-power {
-  background-color: @surface0;
-  padding: 0.5rem 1rem;
-  margin: 5px 0;
-}
-
-#clock {
-  color: @blue;
-}
-
-#backlight {
-  color: @yellow;
-}
-
-#backlight {
-  border-radius: 0;
-}
-
-#language {
-  color: @red;
-  border-radius: 1rem 0 0 1rem;
-  margin-left: 1rem;
-}
-
-#wireplumber {
-  color: @maroon;
-}
-
-#custom-music {
-  color: @mauve;
-  border-radius: 1rem;
-}
-
-#window {
-  color: @mauve;
-  border-radius: 1rem;
-}
-
-#custom-lock {
-  border-radius: 1rem 0 0 1rem;
-  color: @lavender;
-}
-
-#custom-power {
-  margin-right: 1rem;
-  border-radius: 0 1rem 1rem 0;
-  color: @red;
-}
-
-#custom-notification {
-  margin-right: 1rem;
-  border-radius: 0 1rem 1rem 0;
-  color: @sapphire;
-}
-
-#tray {
-  margin-right: 1rem;
-  border-radius: 1rem;
-}
--- a/home-manager/hyprland/waybar/default.nix
+++ b/home-manager/hyprland/waybar/default.nix
@ -1,6 +0,0 @@
-{
-  home.file.".config/waybar" = {
-    source = ./config;
-    recursive = true;
-  };
-}
--- a/home-manager/secrets/weather-api-key
+++ b/home-manager/secrets/weather-api-key
--- a/home-manager/wlogout/default.nix
+++ b/home-manager/wlogout/default.nix
@ -1,116 +0,0 @@
-# Log out and shutdown menu
-{
-  home.file =
-    let
-      dir = ".config/wlogout";
-    in
-    {
-      "${dir}/hibernate.svg".source = ./hibernate.svg;
-      "${dir}/lock.svg".source = ./lock.svg;
-      "${dir}/logout.svg".source = ./logout.svg;
-      "${dir}/reboot.svg".source = ./reboot.svg;
-      "${dir}/shutdown.svg".source = ./shutdown.svg;
-      "${dir}/suspend.svg".source = ./suspend.svg;
-    };
-
-  programs.wlogout = {
-    enable = false;
-    layout = [
-      {
-        label = "lock";
-        action = "sh -c '(sleep 0.5s; hyprlock)'";
-        text = "Lock";
-        keybind = "l";
-      }
-      {
-        label = "hibernate";
-        action = "systemctl hibernate";
-        text = "Hibernate";
-        keybind = "h";
-      }
-      {
-        label = "logout";
-        action = "loginctl terminate-user $USER";
-        text = "Logout";
-        keybind = "e";
-      }
-      {
-        label = "shutdown";
-        action = "systemctl poweroff";
-        text = "Shutdown";
-        keybind = "s";
-      }
-      {
-        label = "suspend";
-        action = "systemctl suspend";
-        text = "Suspend";
-        keybind = "u";
-      }
-      {
-        label = "reboot";
-        action = "systemctl reboot";
-        text = "Reboot";
-        keybind = "r";
-      }
-    ];
-    style =
-      let
-        theme = import ../../theme.nix;
-      in
-      ''
-        * {
-          background-image: none;
-          box-shadow: none;
-        }
-
-        window {
-          background-color: rgba(30, 30, 46, 0.9);
-        }
-
-        button {
-          border-radius: 0;
-          border-color: #${theme.pinkAlpha};
-          text-decoration-color: #${theme.textAlpha};
-          color: #${theme.textAlpha};
-          background-color: #${theme.mantleAlpha};
-          border-style: solid;
-          border-width: 1px;
-          background-repeat: no-repeat;
-          background-position: center;
-          background-size: 25%;
-        }
-
-        button:focus,
-        button:active,
-        button:hover {
-          /* 20% Overlay 2, 80% mantle */
-          background-color: rgb(48, 50, 66);
-          outline-style: none;
-        }
-
-        #lock {
-          background-image: url("./lock.svg");
-        }
-
-        #logout {
-          background-image: url("./logout.svg");
-        }
-
-        #suspend {
-          background-image: url("./suspend.svg");
-        }
-
-        #hibernate {
-          background-image: url("./hibernate.svg");
-        }
-
-        #shutdown {
-          background-image: url("./shutdown.svg");
-        }
-
-        #reboot {
-          background-image: url("./reboot.svg");
-        }
-      '';
-  };
-}
--- a/home-manager/wlogout/hibernate.svg
+++ b/home-manager/wlogout/hibernate.svg
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg fill="#f5c2e7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
-<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
-<g><g><path d="M500,10C229.4,10,10,229.4,10,500s219.4,490,490,490s490-219.4,490-490S770.6,10,500,10z M500,885.1c-212.7,0-385.1-172.4-385.1-385.1S287.3,114.9,500,114.9S885.1,287.3,885.1,500S712.7,885.1,500,885.1z M576.5,308.7v382.4c0,42.2-34.2,76.5-76.5,76.5c-42.3,0-76.5-34.2-76.5-76.5V308.7c0-42.2,34.2-76.5,76.5-76.5C542.2,232.3,576.5,266.5,576.5,308.7z"/></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g></g>
-</svg>
--- a/home-manager/wlogout/lock.svg
+++ b/home-manager/wlogout/lock.svg
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg fill="#f5c2e7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
-<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
-<g><g><path d="M321.8,455.5h356.4V321.8c0-49.2-17.4-91.2-52.2-126c-34.8-34.8-76.8-52.2-126-52.2c-49.2,0-91.2,17.4-126,52.2c-34.8,34.8-52.2,76.8-52.2,126L321.8,455.5L321.8,455.5z M900.9,522.3v400.9c0,18.6-6.5,34.3-19.5,47.3c-13,13-28.8,19.5-47.3,19.5H165.9c-18.6,0-34.3-6.5-47.3-19.5s-19.5-28.8-19.5-47.3V522.3c0-18.6,6.5-34.3,19.5-47.3c13-13,28.8-19.5,47.3-19.5h22.3V321.8c0-85.4,30.6-158.7,91.9-219.9C341.3,40.6,414.6,10,500,10c85.4,0,158.7,30.6,219.9,91.9c61.3,61.3,91.9,134.6,91.9,219.9v133.6h22.3c18.6,0,34.3,6.5,47.3,19.5C894.4,487.9,900.9,503.7,900.9,522.3L900.9,522.3z"/></g></g>
-</svg>
--- a/home-manager/wlogout/logout.svg
+++ b/home-manager/wlogout/logout.svg
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg fill="#f5c2e7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
-<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
-<g><path d="M622.5,990H50.8C26.3,990,10,973.7,10,949.2V50.8C10,26.3,26.3,10,50.8,10h571.7c24.5,0,40.8,16.3,40.8,40.8v285.8c0,24.5-16.3,40.8-40.8,40.8s-40.8-16.3-40.8-40.8v-245h-490v816.7h490v-245c0-24.5,16.3-40.8,40.8-40.8s40.8,16.3,40.8,40.8v285.8C663.3,973.7,647,990,622.5,990z"/><path d="M949.2,540.8H336.7c-24.5,0-40.8-16.3-40.8-40.8c0-24.5,16.3-40.8,40.8-40.8h612.5c24.5,0,40.8,16.3,40.8,40.8C990,524.5,973.7,540.8,949.2,540.8z"/><path d="M949.2,540.8c-12.3,0-20.4-4.1-28.6-12.3L757.3,365.3c-16.3-16.3-16.3-40.8,0-57.2c16.3-16.3,40.8-16.3,57.2,0l163.3,163.3c16.3,16.3,16.3,40.8,0,57.2C969.6,536.8,961.4,540.8,949.2,540.8z"/><path d="M785.8,704.2c-12.3,0-20.4-4.1-28.6-12.3c-16.3-16.3-16.3-40.8,0-57.2l163.3-163.3c16.3-16.3,40.8-16.3,57.2,0c16.3,16.3,16.3,40.8,0,57.2L814.4,691.9C806.3,700.1,798.1,704.2,785.8,704.2z"/></g>
-</svg>
--- a/home-manager/wlogout/reboot.svg
+++ b/home-manager/wlogout/reboot.svg
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg fill="#f5c2e7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
-<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
-<g><path d="M134.6,285.6C64.9,420.7,60.1,590,137.1,723.4L42,668.5l-32,55.4c93.1,52.1,133.6,75.9,184,106.2c28.5-51.5,52.8-94.4,107.4-186.1L246,612l-53.4,92.5C65.4,502.7,167.2,200.3,398.8,126.2C638,29.3,929,223.5,931.5,481.5c19.6,236.7-208.9,443.6-439.3,416.2l-29.5,51c277.7,54.4,556.5-201.7,524.7-483.1C976.1,170.8,637.1-41.2,367.1,77.5C262.8,114.2,183.1,191.5,134.6,285.6z"/></g>
-</svg>
--- a/home-manager/wlogout/shutdown.svg
+++ b/home-manager/wlogout/shutdown.svg
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg fill="#f5c2e7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
-<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
-<g><path d="M764,152.1c30.9,22,58.3,46.8,82.4,74.6c24,27.8,44.6,57.8,61.8,90.1c17.2,32.3,30.2,66.4,39.1,102.4c8.9,36,13.4,72.6,13.4,109.6c0,63.8-12.2,123.7-36.5,179.6c-24.4,55.9-57.3,104.7-98.8,146.2c-41.5,41.5-90.2,74.5-146.2,98.8C623.2,977.8,563.3,990,499.5,990c-63.1,0-122.7-12.2-178.6-36.5c-55.9-24.4-104.8-57.3-146.7-98.8c-41.9-41.5-74.8-90.2-98.8-146.2c-24-55.9-36-115.8-36-179.6c0-36.4,4.3-72.1,12.9-107.1c8.6-35,20.8-68.3,36.5-99.9c15.8-31.6,35.3-61.1,58.7-88.5c23.3-27.5,49.4-52.2,78.2-74.1c15.1-11,31.4-15.1,48.9-12.4c17.5,2.7,31.7,11.3,42.7,25.7c11,14.4,15.1,30.5,12.4,48.4c-2.7,17.8-11.3,32.3-25.7,43.2c-43.2,31.6-76.4,70.3-99.3,116.3c-23,46-34.5,95.4-34.5,148.2c0,45.3,8.6,88,25.7,128.2c17.2,40.1,40.7,75.1,70.5,105c29.9,29.9,64.9,53.5,105,71c40.1,17.5,82.9,26.3,128.2,26.3c45.3,0,88-8.7,128.2-26.3c40.1-17.5,75.1-41.2,105-71s53.5-64.9,71-105c17.5-40.1,26.3-82.9,26.3-128.2c0-53.5-12.4-104.1-37.1-151.8c-24.7-47.7-59.4-87-104-117.9c-15.1-10.3-24.2-24.4-27.3-42.2c-3.1-17.8,0.5-34.3,10.8-49.4c10.3-14.4,24.4-23.2,42.2-26.2C732.5,138.2,748.9,141.8,764,152.1L764,152.1z M499.5,531.9c-17.8,0-33.1-6.3-45.8-19c-12.7-12.7-19-28-19-45.8V75.9c0-17.8,6.3-33.3,19-46.3c12.7-13,28-19.6,45.8-19.6c18.5,0,34.1,6.5,46.8,19.6c12.7,13,19,28.5,19,46.3v391.2c0,17.8-6.3,33.1-19,45.8C533.6,525.6,518,531.9,499.5,531.9L499.5,531.9z"/></g>
-</svg>
--- a/home-manager/wlogout/style.css
+++ b/home-manager/wlogout/style.css
@ -1,53 +0,0 @@
-* {
-  background-image: none;
-  box-shadow: none;
-}
-
-window {
-  background-color: rgba(30, 30, 46, 0.9);
-}
-
-button {
-  border-radius: 0;
-  border-color: #f5c2e7;
-  text-decoration-color: #cdd6f4;
-  color: #cdd6f4;
-  background-color: #181825;
-  border-style: solid;
-  border-width: 1px;
-  background-repeat: no-repeat;
-  background-position: center;
-  background-size: 25%;
-}
-
-button:focus,
-button:active,
-button:hover {
-  /* 20% Overlay 2, 80% mantle */
-  background-color: rgb(48, 50, 66);
-  outline-style: none;
-}
-
-#lock {
-  background-image: url("./lock.svg");
-}
-
-#logout {
-  background-image: url("./logout.svg");
-}
-
-#suspend {
-  background-image: url("./suspend.svg");
-}
-
-#hibernate {
-  background-image: url("./hibernate.svg");
-}
-
-#shutdown {
-  background-image: url("./shutdown.svg");
-}
-
-#reboot {
-  background-image: url("./reboot.svg");
-}
--- a/home-manager/wlogout/suspend.svg
+++ b/home-manager/wlogout/suspend.svg
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg fill="#f5c2e7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
-<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
-<g><path d="M500,990c-66.1,0-130.3-13-190.7-38.5c-58.4-24.7-110.8-60-155.7-105s-80.3-97.4-105-155.7C23,630.3,10,566.1,10,500c0-66.1,13-130.3,38.5-190.7c24.7-58.4,60-110.8,105-155.7c45-45,97.4-80.3,155.7-105C369.7,23,433.9,10,500,10c66.1,0,130.3,13,190.7,38.5c58.4,24.7,110.8,60,155.7,105c45,45,80.3,97.4,105,155.7C977,369.7,990,433.9,990,500c0,66.1-13,130.3-38.5,190.7c-24.7,58.4-60,110.8-105,155.7s-97.4,80.3-155.7,105C630.3,977,566.1,990,500,990z M500,79.6c-112.3,0-217.9,43.7-297.3,123.1C123.3,282.1,79.6,387.7,79.6,500s43.7,217.9,123.1,297.3c79.4,79.4,185,123.1,297.3,123.1c112.3,0,217.9-43.7,297.3-123.1c79.4-79.4,123.1-185,123.1-297.3s-43.7-217.9-123.1-297.3C717.9,123.3,612.3,79.6,500,79.6z"/><path d="M322.5,290.6h108v412h-108V290.6z"/><path d="M561.6,290.6h107.9v412H561.6V290.6z"/></g>
-</svg>
--- a/home-manager/zen/default.nix
+++ b/home-manager/zen/default.nix
@ -1,12 +0,0 @@
-{ pkgs, inputs, ... }:
-
-{
-  # TODO programatically get default name
-  home = {
-    file.".zen/audtxq7n.default/chrome" = {
-      source = ./chrome;
-      recursive = true;
-    };
-    packages = with pkgs; [ inputs.zen-browser.packages.${system}.default ]; # Beta
-  };
-}
--- a/hosts/desktop/common.nix
+++ b/hosts/desktop/common.nix
@ -0,0 +1,4 @@
+{
+  monitor1 = "DP-1";
+  monitor2 = "DP-3";
+}
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@ -0,0 +1,11 @@
+{
+  lib,
+  ...
+}:
+
+{
+  imports = [
+    (lib.custom.relativeToRoot "shared/modules")
+    ./hardware-configuration.nix
+  ];
+}
--- a/modules/hardware/hardware-configuration.nix
+++ b/modules/hardware/hardware-configuration.nix
@ -1,10 +1,6 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 {
  config,
  lib,
-  pkgs,
  modulesPath,
  ...
 }:
--- a/hosts/desktop/home-manager/default.nix
+++ b/hosts/desktop/home-manager/default.nix
@ -0,0 +1,14 @@
+{
+  lib,
+  ...
+}:
+
+{
+  imports = [
+    (lib.custom.relativeToRoot "shared/home-manager")
+    ./hyprpaper.nix
+    ./settings.nix
+  ];
+
+  programs.git.signing.key = "706F53DD087A91DE";
+}
--- a/hosts/desktop/home-manager/hyprpaper.nix
+++ b/hosts/desktop/home-manager/hyprpaper.nix
@ -0,0 +1,29 @@
+# Wallpapers
+{
+  lib,
+  theme,
+  ...
+}:
+
+{
+  services.hyprpaper.settings =
+    let
+      wallpaper1 = builtins.toString theme.wallpaper.monitor1;
+      wallpaper2 = builtins.toString theme.wallpaper.monitor2;
+    in
+    {
+      preload = lib.mkDefault [
+        wallpaper1
+        wallpaper2
+      ];
+
+      wallpaper =
+        let
+          common = import ../common.nix;
+        in
+        lib.mkDefault [
+          "${common.monitor1},${wallpaper1}"
+          "${common.monitor2},${wallpaper2}"
+        ];
+    };
+}
--- a/hosts/desktop/home-manager/settings.nix
+++ b/hosts/desktop/home-manager/settings.nix
@ -0,0 +1,12 @@
+{ lib, ... }:
+
+{
+  wayland.windowManager.hyprland.settings.monitor =
+    let
+      common = import ../common.nix;
+    in
+    lib.mkForce [
+      "${common.monitor1}, 3440x1440@175, 0x0, 1"
+      "${common.monitor2}, 3840x2160@60, 3440x0, 1.5, transform, 1"
+    ];
+}
--- a/hosts/desktop/home-manager/zen/chrome/userChrome.css
+++ b/hosts/desktop/home-manager/zen/chrome/userChrome.css
--- a/hosts/desktop/home-manager/zen/chrome/userContent.css
+++ b/hosts/desktop/home-manager/zen/chrome/userContent.css
--- a/hosts/desktop/home-manager/zen/chrome/zen-logo.svg
+++ b/hosts/desktop/home-manager/zen/chrome/zen-logo.svg
--- a/hosts/desktop/home-manager/zen/default.nix
+++ b/hosts/desktop/home-manager/zen/default.nix
@ -0,0 +1,7 @@
+{
+  # TODO merge with shared
+  home.file.".zen/audtxq7n.default/chrome" = {
+    source = ./chrome;
+    recursive = true;
+  };
+}
--- a/hosts/pi4/default.nix
+++ b/hosts/pi4/default.nix
@ -0,0 +1,54 @@
+{
+  pkgs,
+  hostName,
+  user,
+  version,
+  ...
+}:
+
+{
+  boot = {
+    kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
+    initrd.availableKernelModules = [
+      "xhci_pci"
+      "usbhid"
+      "usb_storage"
+    ];
+    loader = {
+      grub.enable = false;
+      generic-extlinux-compatible.enable = true;
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    vim
+  ];
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-label/NIXOS_SD";
+      fsType = "ext4";
+      options = [ "noatime" ];
+    };
+  };
+
+  hardware.enableRedistributableFirmware = true;
+
+  networking = {
+    inherit hostName;
+    networkmanager.enable = true;
+  };
+
+  services.openssh.enable = true;
+
+  system.stateVersion = version;
+
+  users = {
+    mutableUsers = false;
+    users.${user.name} = {
+      isNormalUser = true;
+      password = user.password;
+      extraGroups = [ "wheel" ];
+    };
+  };
+}
--- a/hosts/thinkpad/battery.nix
+++ b/hosts/thinkpad/battery.nix
@ -0,0 +1,6 @@
+{
+  services = {
+    upower.enable = true;
+    power-profiles-daemon.enable = true;
+  };
+}
--- a/hosts/thinkpad/bluetooth.nix
+++ b/hosts/thinkpad/bluetooth.nix
@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = [
+    pkgs.bluez
+  ];
+
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true; # powers up the default Bluetooth controller on boot
+  };
+
+  services.blueman.enable = true;
+}
--- a/hosts/thinkpad/common.nix
+++ b/hosts/thinkpad/common.nix
@ -0,0 +1,4 @@
+{
+  # Empty matches all monitors
+  monitor1 = "";
+}
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@ -0,0 +1,23 @@
+{
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+  imports = [
+    (lib.custom.relativeToRoot "shared/modules")
+    ./battery.nix
+    ./bluetooth.nix
+    ./hardware-configuration.nix
+    ./security.nix
+  ];
+
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  environment.systemPackages = with pkgs; [
+    brightnessctl
+    hyprsunset # Blue light filter
+  ];
+
+}
--- a/hosts/thinkpad/hardware-configuration.nix
+++ b/hosts/thinkpad/hardware-configuration.nix
@ -0,0 +1,57 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "usb_storage"
+    "sd_mod"
+    "sdhci_pci"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/5ac9c425-35ae-47d5-a683-68ee0dbfc2bc";
+    fsType = "ext4";
+  };
+
+  boot.initrd.luks.devices."luks-99b73f22-3fa1-42b5-ad48-54b0ccff72cc".device =
+    "/dev/disk/by-uuid/99b73f22-3fa1-42b5-ad48-54b0ccff72cc";
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/3CFB-D12A";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp2s0f0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
--- a/hosts/thinkpad/home-manager/default.nix
+++ b/hosts/thinkpad/home-manager/default.nix
@ -0,0 +1,14 @@
+{
+  lib,
+  ...
+}:
+
+{
+  imports = [
+    (lib.custom.relativeToRoot "shared/home-manager")
+    ./hyprland
+    ./zen
+  ];
+
+  programs.git.signing.key = "848D71DE0590C199";
+}
--- a/hosts/thinkpad/home-manager/hyprland/default.nix
+++ b/hosts/thinkpad/home-manager/hyprland/default.nix
@ -0,0 +1,7 @@
+# Home configurations for Hyprland. For system configs, see ./modules/hyprland
+{
+  imports = [
+    ./hyprpanel.nix
+    ./settings.nix
+  ];
+}
--- a/hosts/thinkpad/home-manager/hyprland/hyprpanel.nix
+++ b/hosts/thinkpad/home-manager/hyprland/hyprpanel.nix
@ -0,0 +1,16 @@
+{
+  lib,
+  ...
+}:
+
+{
+  programs.hyprpanel.settings.layout."bar.layouts"."*".right = lib.mkDefault [
+    "kbinput"
+    "volume"
+    "network"
+    "systray"
+    "clock"
+    "battery"
+    "notifications"
+  ];
+}
--- a/hosts/thinkpad/home-manager/hyprland/settings.nix
+++ b/hosts/thinkpad/home-manager/hyprland/settings.nix
@ -0,0 +1,33 @@
+{
+  lib,
+  ...
+}:
+
+{
+  wayland.windowManager.hyprland.settings = {
+    monitor =
+      let
+        common = import ../../common.nix;
+      in
+      lib.mkForce [
+        "${common.monitor1}, 1920x1080@60.05, 0x0, 1"
+      ];
+
+    # Autostart
+    exec-once = [
+      "hyprsunset -t 5000" # Set blue light filter
+    ];
+
+    input = {
+      sensitivity = lib.mkDefault 0.4; # -1.0 - 1.0, 0 means no modification.
+      touchpad.natural_scroll = lib.mkDefault true;
+    };
+
+    gestures = lib.mkDefault {
+      workspace_swipe = true;
+      workspace_swipe_distance = 150;
+      workspace_swipe_min_speed_to_force = 0;
+      workspace_swipe_cancel_ratio = 0.5;
+    };
+  };
+}
--- a/hosts/thinkpad/home-manager/zen/chrome/userChrome.css
+++ b/hosts/thinkpad/home-manager/zen/chrome/userChrome.css
@ -0,0 +1,113 @@
+/* Catppuccin Mocha Blue userChrome.css*/
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --zen-colors-primary: #313244 !important;
+    --zen-primary-color: #89b4fa !important;
+    --zen-colors-secondary: #313244 !important;
+    --zen-colors-tertiary: #181825 !important;
+    --zen-colors-border: #89b4fa !important;
+    --toolbarbutton-icon-fill: #89b4fa !important;
+    --lwt-text-color: #cdd6f4 !important;
+    --toolbar-field-color: #cdd6f4 !important;
+    --tab-selected-textcolor: rgb(171, 197, 247) !important;
+    --toolbar-field-focus-color: #cdd6f4 !important;
+    --toolbar-color: #cdd6f4 !important;
+    --newtab-text-primary-color: #cdd6f4 !important;
+    --arrowpanel-color: #cdd6f4 !important;
+    --arrowpanel-background: #1e1e2e !important;
+    --sidebar-text-color: #cdd6f4 !important;
+    --lwt-sidebar-text-color: #cdd6f4 !important;
+    --lwt-sidebar-background-color: #11111b !important;
+    --toolbar-bgcolor: #313244 !important;
+    --newtab-background-color: #1e1e2e !important;
+    --zen-themed-toolbar-bg: #181825 !important;
+    --zen-main-browser-background: #181825 !important;
+  }
+
+  #permissions-granted-icon {
+    color: #181825 !important;
+  }
+
+  .sidebar-placesTree {
+    background-color: #1e1e2e !important;
+  }
+
+  #zen-workspaces-button {
+    background-color: #1e1e2e !important;
+  }
+
+  #TabsToolbar {
+    background-color: #181825 !important;
+  }
+
+  #urlbar-background {
+    background-color: #1e1e2e !important;
+  }
+
+  .content-shortcuts {
+    background-color: #1e1e2e !important;
+    border-color: #89b4fa !important;
+  }
+
+  .urlbarView-url {
+    color: #89b4fa !important;
+  }
+
+  #zenEditBookmarkPanelFaviconContainer {
+    background: #11111b !important;
+  }
+
+  toolbar .toolbarbutton-1 {
+    &:not([disabled]) {
+      &:is([open], [checked])
+        > :is(
+          .toolbarbutton-icon,
+          .toolbarbutton-text,
+          .toolbarbutton-badge-stack
+        ) {
+        fill: #11111b;
+      }
+    }
+  }
+
+  .identity-color-blue {
+    --identity-tab-color: #89b4fa !important;
+    --identity-icon-color: #89b4fa !important;
+  }
+
+  .identity-color-turquoise {
+    --identity-tab-color: #94e2d5 !important;
+    --identity-icon-color: #94e2d5 !important;
+  }
+
+  .identity-color-green {
+    --identity-tab-color: #a6e3a1 !important;
+    --identity-icon-color: #a6e3a1 !important;
+  }
+
+  .identity-color-yellow {
+    --identity-tab-color: #f9e2af !important;
+    --identity-icon-color: #f9e2af !important;
+  }
+
+  .identity-color-orange {
+    --identity-tab-color: #fab387 !important;
+    --identity-icon-color: #fab387 !important;
+  }
+
+  .identity-color-red {
+    --identity-tab-color: #f38ba8 !important;
+    --identity-icon-color: #f38ba8 !important;
+  }
+
+  .identity-color-pink {
+    --identity-tab-color: #f5c2e7 !important;
+    --identity-icon-color: #f5c2e7 !important;
+  }
+
+  .identity-color-purple {
+    --identity-tab-color: #cba6f7 !important;
+    --identity-icon-color: #cba6f7 !important;
+  }
+}
--- a/hosts/thinkpad/home-manager/zen/chrome/userContent.css
+++ b/hosts/thinkpad/home-manager/zen/chrome/userContent.css
@ -0,0 +1,158 @@
+/* Catppuccin Mocha Blue userContent.css*/
+
+@media (prefers-color-scheme: dark) {
+  /* Common variables affecting all pages */
+  @-moz-document url-prefix("about:") {
+    :root {
+      --in-content-page-color: #cdd6f4 !important;
+      --color-accent-primary: #89b4fa !important;
+      --color-accent-primary-hover: rgb(163, 197, 251) !important;
+      --color-accent-primary-active: rgb(138, 153, 250) !important;
+      background-color: #1e1e2e !important;
+      --in-content-page-background: #1e1e2e !important;
+    }
+  }
+
+  /* Variables and styles specific to about:newtab and about:home */
+  @-moz-document url("about:newtab"), url("about:home") {
+    :root {
+      --newtab-background-color: #1e1e2e !important;
+      --newtab-background-color-secondary: #313244 !important;
+      --newtab-element-hover-color: #313244 !important;
+      --newtab-text-primary-color: #cdd6f4 !important;
+      --newtab-wordmark-color: #cdd6f4 !important;
+      --newtab-primary-action-background: #89b4fa !important;
+    }
+
+    .icon {
+      color: #89b4fa !important;
+    }
+
+    .search-wrapper .logo-and-wordmark .logo {
+      background:
+        url("zen-logo-mocha.svg"),
+        url("https://raw.githubusercontent.com/IAmJafeth/zen-browser/main/themes/Mocha/Blue/zen-logo-mocha.svg")
+          no-repeat center !important;
+      display: inline-block !important;
+      height: 82px !important;
+      width: 82px !important;
+      background-size: 82px !important;
+    }
+
+    @media (max-width: 609px) {
+      .search-wrapper .logo-and-wordmark .logo {
+        background-size: 64px !important;
+        height: 64px !important;
+        width: 64px !important;
+      }
+    }
+
+    .card-outer:is(:hover, :focus, .active):not(.placeholder) .card-title {
+      color: #89b4fa !important;
+    }
+
+    .top-site-outer .search-topsite {
+      background-color: #89b4fa !important;
+    }
+
+    .compact-cards .card-outer .card-context .card-context-icon.icon-download {
+      fill: #a6e3a1 !important;
+    }
+  }
+
+  /* Variables and styles specific to about:preferences */
+  @-moz-document url-prefix("about:preferences") {
+    :root {
+      --zen-colors-tertiary: #181825 !important;
+      --in-content-text-color: #cdd6f4 !important;
+      --link-color: #89b4fa !important;
+      --link-color-hover: rgb(163, 197, 251) !important;
+      --zen-colors-primary: #313244 !important;
+      --in-content-box-background: #313244 !important;
+      --zen-primary-color: #89b4fa !important;
+    }
+
+    groupbox,
+    moz-card {
+      background: #1e1e2e !important;
+    }
+
+    button,
+    groupbox menulist {
+      background: #313244 !important;
+      color: #cdd6f4 !important;
+    }
+
+    .main-content {
+      background-color: #11111b !important;
+    }
+
+    .identity-color-blue {
+      --identity-tab-color: #8aadf4 !important;
+      --identity-icon-color: #8aadf4 !important;
+    }
+
+    .identity-color-turquoise {
+      --identity-tab-color: #8bd5ca !important;
+      --identity-icon-color: #8bd5ca !important;
+    }
+
+    .identity-color-green {
+      --identity-tab-color: #a6da95 !important;
+      --identity-icon-color: #a6da95 !important;
+    }
+
+    .identity-color-yellow {
+      --identity-tab-color: #eed49f !important;
+      --identity-icon-color: #eed49f !important;
+    }
+
+    .identity-color-orange {
+      --identity-tab-color: #f5a97f !important;
+      --identity-icon-color: #f5a97f !important;
+    }
+
+    .identity-color-red {
+      --identity-tab-color: #ed8796 !important;
+      --identity-icon-color: #ed8796 !important;
+    }
+
+    .identity-color-pink {
+      --identity-tab-color: #f5bde6 !important;
+      --identity-icon-color: #f5bde6 !important;
+    }
+
+    .identity-color-purple {
+      --identity-tab-color: #c6a0f6 !important;
+      --identity-icon-color: #c6a0f6 !important;
+    }
+  }
+
+  /* Variables and styles specific to about:addons */
+  @-moz-document url-prefix("about:addons") {
+    :root {
+      --zen-dark-color-mix-base: #181825 !important;
+      --background-color-box: #1e1e2e !important;
+    }
+  }
+
+  /* Variables and styles specific to about:protections */
+  @-moz-document url-prefix("about:protections") {
+    :root {
+      --zen-primary-color: #1e1e2e !important;
+      --social-color: #cba6f7 !important;
+      --coockie-color: #89dceb !important;
+      --fingerprinter-color: #f9e2af !important;
+      --cryptominer-color: #b4befe !important;
+      --tracker-color: #a6e3a1 !important;
+      --in-content-primary-button-background-hover: rgb(81, 83, 105) !important;
+      --in-content-primary-button-text-color-hover: #cdd6f4 !important;
+      --in-content-primary-button-background: #45475a !important;
+      --in-content-primary-button-text-color: #cdd6f4 !important;
+    }
+
+    .card {
+      background-color: #313244 !important;
+    }
+  }
+}
--- a/hosts/thinkpad/home-manager/zen/chrome/zen-logo.svg
+++ b/hosts/thinkpad/home-manager/zen/chrome/zen-logo.svg
@ -0,0 +1,13 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g clip-path="url(#clip0_15_9)">
+    <rect width="1024" height="1024" rx="225" fill="#11111b"/>
+    <circle cx="512" cy="512" r="340" stroke="#cdd6f4" stroke-width="70"/>
+    <circle cx="512" cy="512" r="224.915" stroke="#cdd6f4" stroke-width="51"/>
+    <circle cx="512" cy="512" r="129.018" stroke="#cdd6f4" stroke-width="31"/>
+  </g>
+  <defs>
+    <clipPath id="clip0_15_9">
+      <rect width="1024" height="1024" fill="white"/>
+    </clipPath>
+  </defs>
+</svg>
--- a/hosts/thinkpad/home-manager/zen/default.nix
+++ b/hosts/thinkpad/home-manager/zen/default.nix
@ -0,0 +1,7 @@
+{
+  # TODO merge with shared
+  home.file.".zen/xdaxqlov.default/chrome" = {
+    source = ./chrome;
+    recursive = true;
+  };
+}
--- a/hosts/thinkpad/security.nix
+++ b/hosts/thinkpad/security.nix
@ -0,0 +1,45 @@
+{ pkgs, ... }:
+
+{
+  security = {
+    pam = {
+      services = {
+        gdm-fingerprint.text = ''
+          auth       required                    pam_shells.so
+          auth       requisite                   pam_nologin.so
+          auth       requisite                   pam_faillock.so      preauth
+          auth       required                    ${pkgs.fprintd}/lib/security/pam_fprintd.so
+          auth       optional                    pam_permit.so
+          auth       required                    pam_env.so
+          auth       [success=ok default=1]      ${pkgs.gdm}/lib/security/pam_gdm.so
+          auth       optional                    ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so
+
+          account    include                     login
+
+          password   required                    pam_deny.so
+
+          session    include                     login
+          session    optional                    ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
+        '';
+        login.fprintAuth = false;
+      };
+    };
+  };
+
+  # Start the driver at boot
+  systemd.services.fprintd = {
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig.Type = "simple";
+  };
+
+  # Install the driver
+  services.fprintd = {
+    enable = true;
+    tod.driver = pkgs.libfprint-2-tod1-goodix-550a; # Goodix 550a driver (from Lenovo)
+  };
+
+  # however for focaltech 2808:a658, use fprintd with overidden package (without tod)
+  # services.fprintd.package = pkgs.fprintd.override {
+  #   libfprint = pkgs.libfprint-focaltech-2808-a658;
+  # };
+}
--- a/4
+++ b/4
@ -34,3 +34,7 @@ lock:
 # Decrypt all files in the repo using git-crypt and the user's GPG key
 unlock:
    git-crypt unlock ~/.config/git/crypt-key
+
+# Connect to tailnet or sign-in if not registered
+start-tailscale:
+    tailscale up --login-server https://vpn.martials.no
--- a/lib/default.nix
+++ b/lib/default.nix
@ -0,0 +1,24 @@
+# FIXME(lib.custom): Add some stuff from hmajid2301/dotfiles/lib/module/default.nix, as simplifies option declaration
+{ lib, ... }:
+
+{
+  getSecret = with lib.strings; filePath: trim (removeSuffix "\n" (builtins.readFile filePath));
+
+  # use path relative to the root of the project
+  relativeToRoot = lib.path.append ../.;
+
+  scanPaths =
+    path:
+    builtins.map (f: (path + "/${f}")) (
+      builtins.attrNames (
+        lib.attrsets.filterAttrs (
+          path: _type:
+          (_type == "directory") # include directories
+          || (
+            (path != "default.nix") # ignore default.nix
+            && (lib.strings.hasSuffix ".nix" path) # include .nix files
+          )
+        ) (builtins.readDir path)
+      )
+    );
+}
--- a/overlays.nix
+++ b/overlays.nix
@ -1,7 +1,11 @@
 { inputs, ... }:

 {
-  nixpkgs.overlays = with inputs; [
-    hyprpanel.overlay
-  ];
+  # Gives access to unstable packages everywhere
+  unstable-packages = final: _prev: {
+    unstable = import inputs.nixpkgs-unstable {
+      system = final.system;
+      config.allowUnfree = true;
+    };
+  };
 }
--- a/shared/assets/Catppuccin.png
+++ b/shared/assets/Catppuccin.png
--- a/shared/assets/catppuccin_high.png
+++ b/shared/assets/catppuccin_high.png
--- a/shared/assets/catppuccin_page_curl.png
+++ b/shared/assets/catppuccin_page_curl.png
--- a/shared/assets/downtown.gif
+++ b/shared/assets/downtown.gif
--- a/shared/assets/ekg_v2.png
+++ b/shared/assets/ekg_v2.png
--- a/shared/assets/face.png
+++ b/shared/assets/face.png
--- a/shared/assets/nixos_waves.png
+++ b/shared/assets/nixos_waves.png
--- a/shared/common.nix
+++ b/shared/common.nix
@ -3,7 +3,7 @@ rec {
    browser = "zen";
    calculator = "gnome-calculator";
    fileManager = "nautilus";
-    imageViewer = "loupe";
+    imageViewer = "imv";
    lockScreen = "hyprlock";
    terminal = "kitty";
  };
@ -13,19 +13,15 @@ rec {
    pictures = "${dir.home}/Pictures";
  };

-  hostname = "nixos";
-
  keymaps = {
    layout = "gb,no";
    options = "grp:alt_shift_toggle"; # Toggle using ALT + SHIFT
  };

-  # Empty matches all
-  monitor1 = "DP-1";
-  monitor2 = "DP-3";
-
  username = "martin";

+  root = ../.;
+
  # This value determines the NixOS release from which the default
  # settings for stateful data, like file locations and database versions
  # on your system were taken. It's perfectly fine and recommended to leave
@ -33,9 +29,4 @@ rec {
  # Before changing this value read the documentation for this option
  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
  system.version = "24.11";
-
-  secret.weatherApiKey = lib: loadSecret lib ./home-manager/secrets/weather-api-key;
-
-  loadSecret =
-    lib: filePath: lib.strings.trim (lib.strings.removeSuffix "\n" (builtins.readFile filePath));
 }
--- a/shared/home-manager/btop.nix
+++ b/shared/home-manager/btop.nix
--- a/shared/home-manager/cava/cava.png
+++ b/shared/home-manager/cava/cava.png
--- a/shared/home-manager/cava/default.nix
+++ b/shared/home-manager/cava/default.nix
--- a/shared/home-manager/cursors.nix
+++ b/shared/home-manager/cursors.nix
--- a/shared/home-manager/default-applications.nix
+++ b/shared/home-manager/default-applications.nix
--- a/shared/home-manager/default.nix
+++ b/shared/home-manager/default.nix
@ -1,5 +1,6 @@
 {
  inputs,
+  outputs,
  common,
  ...
 }:
@ -24,7 +25,6 @@ in
    ./media
    ./nextcloud.nix
    ./rofi
-    ./wlogout
    ./hyprland
    ./spicetify.nix
    ./yazi
@ -45,6 +45,9 @@ in
    stateVersion = common.system.version;
  };

+  # Adds pkgs.unstable in order to fetch packages from unstable repositories
+  nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
+
  # Let Home Manager install and manage itself.
  programs.home-manager.enable = true;
 }
--- a/shared/home-manager/development/default.nix
+++ b/shared/home-manager/development/default.nix
--- a/shared/home-manager/development/git.nix
+++ b/shared/home-manager/development/git.nix
@ -20,12 +20,10 @@
        p = "push";
      };

-      signing = {
-        signByDefault = true;
-        key = "706F53DD087A91DE";
-      };
+      signing.signByDefault = true;

      extraConfig = {
+        pull.rebase = true;
        push.autoSetupRemote = true;
        safe.directory = "/etc/nixos";
        credential.helper = "${package}/bin/git-credential-libsecret";
--- a/shared/home-manager/development/nixvim/default.nix
+++ b/shared/home-manager/development/nixvim/default.nix
--- a/shared/home-manager/development/zed.nix
+++ b/shared/home-manager/development/zed.nix
--- a/shared/home-manager/fastfetch.nix
+++ b/shared/home-manager/fastfetch.nix
@ -1,3 +1,5 @@
+{ lib, ... }:
+
 {
  programs = {
    fish.shellAliases.fetch = "fastfetch";
@ -6,7 +8,7 @@
      enable = true;
      settings = {
        logo = {
-          source = "${../Catppuccin.png}";
+          source = "${lib.custom.relativeToRoot "shared/assets/Catppuccin.png"}";
          type = "kitty";
          height = 18;
          padding.top = 2;
--- a/shared/home-manager/fish.nix
+++ b/shared/home-manager/fish.nix
--- a/shared/home-manager/freetube.nix
+++ b/shared/home-manager/freetube.nix
--- a/shared/home-manager/gpg.nix
+++ b/shared/home-manager/gpg.nix
--- a/shared/home-manager/gtk.nix
+++ b/shared/home-manager/gtk.nix
--- a/shared/home-manager/hyprland/binds.nix
+++ b/shared/home-manager/hyprland/binds.nix
--- a/shared/home-manager/hyprland/default.nix
+++ b/shared/home-manager/hyprland/default.nix
@ -1,22 +1,15 @@
-# Home configurations for Hyprland. For system configs, see ./modules/hyprland
-{ outputs, ... }:
-
+# Home configurations for Hyprland. For system configs, see ./shared/modules/hyprland
 {
  imports = [
    ./binds.nix
-    ./waybar
    ./hypridle
    ./hyprlock
    ./hyprpanel
    ./hyprpaper.nix
    ./hyprshot.nix
    ./settings.nix
-    ./swaync
  ];

-  # Adds pkgs.unstable in order to fetch packages from unstable repositories
-  nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
-
  wayland.windowManager.hyprland = {
    enable = true;
    systemd.variables = [ "--all" ]; # Import environment into systemd
--- a/shared/home-manager/hyprland/hypridle/default.nix
+++ b/shared/home-manager/hyprland/hypridle/default.nix
--- a/shared/home-manager/hyprland/hyprlock/default.nix
+++ b/shared/home-manager/hyprland/hyprlock/default.nix
--- a/shared/home-manager/hyprland/hyprpanel/default.nix
+++ b/shared/home-manager/hyprland/hyprpanel/default.nix
@ -17,14 +17,42 @@
    # Fix the overwrite issue with HyprPanel.
    overwrite.enable = true;

-    # Import a theme from './themes/*.json'.
-    theme = "";
-
    # Override the final config with an arbitrary set.
    # Useful for overriding colors in your selected theme.
-    # Default: {}
+    # TODO fixes theming bugs in recent versions, should be removed when fixed
    override = {
-      theme.bar.menus.text = "#123ABC";
+      theme = {
+        bar.transparent = true;
+        font = {
+          name = "${theme.nerdFont} NF";
+          size = "15px";
+        };
+      };
+    };
+
+    # Configure and theme almost all options from the GUI.
+    # Options that require '{}' or '[]' are not yet implemented,
+    # except for the layout above.
+    # See 'https://hyprpanel.com/configuration/settings.html'.
+    # Default: <same as gui>
+    settings = {
+      bar = {
+        clock.format = "%a %b %d  %H:%M";
+        customModules.kbLayout.leftClick = "hyprctl switchxkblayout keychron-keychron-k8-pro next";
+        launcher.autoDetectIcon = true;
+        network.label = false;
+        volume =
+          let
+            step = "1";
+          in
+          {
+            scrollDown = "${pkgs.hyprpanel}/bin/hyprpanel 'vol -${step}'";
+            scrollUp = "${pkgs.hyprpanel}/bin/hyprpanel 'vol +${step}'";
+          };
+        workspaces = {
+          show_icons = false;
+          show_numbered = true;
+        };
      };

      # Configure bar layouts for monitors.
@ -49,27 +77,6 @@
        };
      };

-    # Configure and theme almost all options from the GUI.
-    # Options that require '{}' or '[]' are not yet implemented,
-    # except for the layout above.
-    # See 'https://hyprpanel.com/configuration/settings.html'.
-    # Default: <same as gui>
-    settings = {
-      bar = {
-        clock.format = "%a %b %d  %H:%M";
-        customModules.kbLayout.leftClick = "hyprctl switchxkblayout keychron-keychron-k8-pro next";
-        launcher.autoDetectIcon = true;
-        network.label = false;
-        volume = {
-          scrollDown = "${pkgs.hyprpanel}/bin/hyprpanel 'vol -1'";
-          scrollUp = "${pkgs.hyprpanel}/bin/hyprpanel 'vol +1'";
-        };
-        workspaces = {
-          show_icons = false;
-          show_numbered = true;
-        };
-      };
-
      menus = {
        clock = {
          time = {
@ -79,7 +86,7 @@
          weather = {
            unit = "metric";
            location = "Bergen, Norway";
-            key = common.secret.weatherApiKey lib;
+            key = with lib.custom; getSecret (relativeToRoot "shared/secrets/weather-api-key");
          };
        };

--- a/shared/home-manager/hyprland/hyprpaper.nix
+++ b/shared/home-manager/hyprland/hyprpaper.nix
@ -1,7 +1,6 @@
 # Wallpapers
 {
  pkgs,
-  common,
  theme,
  ...
 }:
@ -13,8 +12,7 @@
    enable = true;
    settings =
      let
-        monitor1 = builtins.toString theme.wallpaper.monitor1;
-        monitor2 = builtins.toString theme.wallpaper.monitor2;
+        defaultWallpaper = builtins.toString theme.wallpaper.default;
      in
      {
        ipc = "on";
@ -22,13 +20,11 @@
        splash_offset = 2.0;

        preload = [
-          monitor1
-          monitor2
+          defaultWallpaper
        ];

        wallpaper = [
-          "${common.monitor1},${monitor1}"
-          "${common.monitor2},${monitor2}"
+          ",${defaultWallpaper}"
        ];
      };
  };
--- a/shared/home-manager/hyprland/hyprshot.nix
+++ b/shared/home-manager/hyprland/hyprshot.nix
--- a/shared/home-manager/hyprland/settings.nix
+++ b/shared/home-manager/hyprland/settings.nix
@ -10,8 +10,7 @@ in
 {
  wayland.windowManager.hyprland.settings = {
    monitor = [
-      "${common.monitor1}, 3440x1440@175, 0x0, 1"
-      "${common.monitor2}, 3840x2160@60, 3440x0, 1.5, transform, 1"
+      ", preferred, auto, 1"
    ];

    # Autostart
--- a/shared/home-manager/kitty.nix
+++ b/shared/home-manager/kitty.nix
--- a/shared/home-manager/media/default.nix
+++ b/shared/home-manager/media/default.nix
--- a/shared/home-manager/media/imv.nix
+++ b/shared/home-manager/media/imv.nix
--- a/shared/home-manager/media/mpv.nix
+++ b/shared/home-manager/media/mpv.nix
--- a/shared/home-manager/nextcloud.nix
+++ b/shared/home-manager/nextcloud.nix
--- a/shared/home-manager/rofi/catppuccin-mocha.rasi
+++ b/shared/home-manager/rofi/catppuccin-mocha.rasi
--- a/shared/home-manager/rofi/config.rasi
+++ b/shared/home-manager/rofi/config.rasi
--- a/shared/home-manager/rofi/default.nix
+++ b/shared/home-manager/rofi/default.nix
--- a/shared/home-manager/rofi/rofimoji.rc
+++ b/shared/home-manager/rofi/rofimoji.rc
--- a/shared/home-manager/spicetify.nix
+++ b/shared/home-manager/spicetify.nix
--- a/shared/home-manager/yazi/catppuccin-mocha.tmTheme
+++ b/shared/home-manager/yazi/catppuccin-mocha.tmTheme
--- a/shared/home-manager/yazi/default.nix
+++ b/shared/home-manager/yazi/default.nix
--- a/shared/home-manager/yazi/icons.nix
+++ b/shared/home-manager/yazi/icons.nix
--- a/shared/home-manager/zen/default.nix
+++ b/shared/home-manager/zen/default.nix
@ -0,0 +1,5 @@
+{ pkgs, inputs, ... }:
+
+{
+  home.packages = with pkgs; [ inputs.zen-browser.packages.${system}.default ]; # Beta
+}
--- a/shared/modules/boot.nix
+++ b/shared/modules/boot.nix
@ -0,0 +1,6 @@
+{
+  boot.loader = {
+    systemd-boot.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
+}
--- a/shared/modules/default.nix
+++ b/shared/modules/default.nix
@ -1,17 +1,28 @@
 {
  imports = [
+    ./boot.nix
    ./development
+    ./electron.nix
    ./fonts.nix
    ./gaming
    ./gnome
    ./hardware
+    ./kdeconnect.nix
    ./locale.nix
+    ./mail.nix
+    ./media.nix
    ./networking.nix
+    ./nixos.nix
    ./nix-helper.nix
+    ./office.nix
    ./hyprland
    ./sddm.nix
-    ./security.nix
+    ./security
    ./shell.nix
+    ./social.nix
+    ./users.nix
    ./qt.nix
+    ./xdg.nix
+    ./xserver.nix
  ];
 }
--- a/shared/modules/development/default.nix
+++ b/shared/modules/development/default.nix
--- a/shared/modules/development/docker.nix
+++ b/shared/modules/development/docker.nix
--- a/shared/modules/development/dotnet.nix
+++ b/shared/modules/development/dotnet.nix
--- a/shared/modules/development/nix.nix
+++ b/shared/modules/development/nix.nix
--- a/shared/modules/development/node.nix
+++ b/shared/modules/development/node.nix
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Martin Berg Alstad	3df0986257	:Moved zen styling to hosts:	2025-04-15 18:26:14 +02:00
Martin Berg Alstad	57d4f949aa	🐛 Fix build errors. Moved zen styling to hosts and app to shared. Start tailscale in justfile	2025-04-15 18:22:06 +02:00
Martin Berg Alstad	4a884f5e6e	✨ Monitor specific configs in hosts	2025-04-15 17:48:57 +02:00
Martin Berg Alstad	980334b44b	✨ Prefer rebase when pulling from git	2025-04-15 13:01:23 +02:00
Martin Berg Alstad	0474fd9802	✨ Moved yubikey config to security dir and rename	2025-04-15 13:01:23 +02:00
Martin Berg Alstad	16c4a8f46b	✨ Split up config files to multiple and added imports. Fixed default values for systemConfigs	2025-04-15 12:48:27 +02:00
Martin Berg Alstad	9611b8bb8d	✨ Moved modeules into shared	2025-04-14 23:30:50 +02:00
Martin Berg Alstad	3b6a3e5a66	🐛 Moved fmt to before git add, formatted file	2025-04-13 13:22:57 +02:00
Martin Berg Alstad	a7836ff585	🐛 Fix config errors	2025-04-13 11:57:32 +02:00
Martin Berg Alstad	f0ce1f4169	♻️ Moved git key to desktop config, step variable in hyprpanel audio	2025-04-13 11:40:05 +02:00
Martin Berg Alstad	a0537f5634	✨ Moved common home-manager config to shared/home-manager	2025-04-12 23:29:10 +02:00
Martin Berg Alstad	0649473709	✨ Added pi4 to systems, moved getSecret function to lib	2025-04-12 20:25:10 +02:00
Martin Berg Alstad	6ca92c8537	✨ Added Thinkpad and pi4 configs	2025-04-12 19:45:01 +02:00
Martin Berg Alstad	00cf2c38f9	✨ Pass hostName in args, fix Hyprpanel theming, removed unused flake and overlay	2025-04-12 18:51:28 +02:00
Martin Berg Alstad	e3a1dd36d7	✨ Moved modules and hm dir to hosts dir. Moved some code to shared and extended lib with custom functions	2025-04-12 17:05:38 +02:00