✨ [pi4] Containerize Actual service

♻️ [pi4] Refactor firewall with variables
✨ [pi4] Initial Actual Budget service
2025-06-23 19:18:40 +00:00 · 2025-06-23 18:17:08 +00:00 · 2025-06-23 18:07:09 +00:00 · 2025-06-23 17:47:35 +00:00 · 2025-06-23 17:42:15 +00:00 · 2025-06-10 16:41:54 +00:00
230 changed files with 3811 additions and 2211 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+shared/secrets/weather-api-key filter=git-crypt diff=git-crypt
--- a/.gitea/assets/desktop.png
+++ b/.gitea/assets/desktop.png
--- a/.sops.yaml
+++ b/.sops.yaml
@ -0,0 +1,11 @@
+keys:
+  - &thinkpad age1j66v6z6hlsgqjfv5fz7fldm5q9jay4j5v5du6ymfda6hv40nsqesg89g7p
+  - &desktop age1fxr5s6d6ar0xy5pr63kpq93tk7jha5k96jcxnyquj6s2mw8mmcpss8w29w
+  - &pi4 age1xlnprpvshv93eerthxzg6cahklsfc4efh8dd6u8dte9u6cl0u5qsz48qlt
+creation_rules:
+  - path_regex: shared/secrets/secrets.yaml$
+    key_groups:
+      - age:
+          - *thinkpad
+          - *desktop
+          - *pi4
--- a/README.md
+++ b/README.md
@ -1,24 +1,37 @@
 # NixOS Configurations

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

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

-## Includes
+## Uses

 |        |            |
-|--------|------------|
+| ------ | ---------- |
 | WM     | Hyprland   |
 | Shell  | Fish       |
 | Prompt | Starship   |
 | Theme  | Catppuccin |
+| GPU    | Nvidia     |
+| Panel  | Hyprpanel  |
+| Runner | Rofi       |
+| Fetch  | Fastfetch  |

 ## Commands

+First time run, will create a shell with the minimum dependencies in order to download the rest
+
+```Shell
+nix develop . --experimental-features 'nix-command flakes'
+just switch-now
+```
+
+Scripts below will not run unless the necessary packages have been added to the path, either in a shell or by running nixos-rebuild
+
 Format all .nix files

 ```Shell
-  ./fmt
+  just fmt
 ```

 Rebuild and test Nix configuration
@ -26,7 +39,7 @@ Rebuild and test Nix configuration
 - Will add all new files to git and format all nix-files

 ```Shell
-  ./test
+  just test
 ```

 Rebuild and switch Nix configuration
@ -34,5 +47,19 @@ Rebuild and switch Nix configuration
 - Will add all new files to git and format all nix-files

 ```Shell
-  ./rebuild
+  just switch
+```
+
+Update and switch
+
+- Will update the flakes and nix-channel, then switch if there are no errors
+
+```Shell
+  just update-all
+```
+
+To update a single flake and rebuild
+
+```Shell
+  just update zen-browser
 ```
--- a/assets/desktop.png
+++ b/assets/desktop.png
--- a/catppuccin.png
+++ b/catppuccin.png
--- a/configuration.nix
+++ b/configuration.nix
@ -1,71 +0,0 @@
-{
-  pkgs,
-  outputs,
-  ...
-}:
-let
-  common = import ./common.nix;
-in
-{
-  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
-    protonmail-desktop
-    stremio
-    fastfetch
-    freetube
-    nextcloud-client
-    discord
-    nix-prefetch-github # Cmd to get rev and hash from GitHub
-    gimp
-    vlc
-    fortune
-    cowsay
-  ];
-
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
-  ];
-
-  programs.kdeconnect.enable = true;
-
-  services = {
-    flatpak.enable = true;
-    xserver.enable = true;
-  };
-
-  system.stateVersion = common.system.version;
-}
--- a/flake.lock
+++ b/flake.lock
@ -1,114 +1,112 @@
 {
  "nodes": {
-    "base16": {
-      "inputs": {
-        "fromYaml": "fromYaml"
-      },
-      "locked": {
-        "lastModified": 1732200724,
-        "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "rev": "153d52373b0fb2d343592871009a286ec8837aec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "type": "github"
-      }
-    },
-    "base16-fish": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1622559957,
-        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "type": "github"
-      }
-    },
-    "base16-helix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1725860795,
-        "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=",
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "type": "github"
-      }
-    },
-    "base16-vim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731949548,
-        "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=",
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "type": "github"
-      }
-    },
-    "devshell": {
+    "ags": {
      "inputs": {
+        "astal": "astal",
        "nixpkgs": [
-          "nixvim",
+          "hyprpanel",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1735644329,
-        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
+        "lastModified": 1744557573,
+        "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=",
+        "owner": "aylur",
+        "repo": "ags",
+        "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6",
        "type": "github"
      },
      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
+        "owner": "aylur",
+        "repo": "ags",
+        "type": "github"
+      }
+    },
+    "astal": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprpanel",
+          "ags",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742571008,
+        "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=",
+        "owner": "aylur",
+        "repo": "astal",
+        "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "aylur",
+        "repo": "astal",
+        "type": "github"
+      }
+    },
+    "astal_2": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprpanel",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1748416910,
+        "narHash": "sha256-FEQcs58HL8Fe4i7XlqVEUwthjxwvRvgX15gTTfW17sU=",
+        "owner": "aylur",
+        "repo": "astal",
+        "rev": "c1bd89a47c81c66ab5fc6872db5a916c0433fb89",
+        "type": "github"
+      },
+      "original": {
+        "owner": "aylur",
+        "repo": "astal",
+        "type": "github"
+      }
+    },
+    "blobs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1604995301,
+        "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=",
+        "owner": "simple-nixos-mailserver",
+        "repo": "blobs",
+        "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "simple-nixos-mailserver",
+        "repo": "blobs",
+        "type": "gitlab"
+      }
+    },
+    "catppuccin": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1748080874,
+        "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
        "type": "github"
      }
    },
    "flake-compat": {
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "revCount": 57,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
-      }
-    },
-    "flake-compat_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
        "type": "github"
      },
      "original": {
@ -117,131 +115,24 @@
        "type": "github"
      }
    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1735774679,
-        "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": [
-          "stylix",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "fromYaml": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731966426,
-        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "type": "github"
-      }
-    },
    "git-hooks": {
      "inputs": {
        "flake-compat": [
-          "nixvim",
+          "simple-nixos-mailserver",
          "flake-compat"
        ],
        "gitignore": "gitignore",
        "nixpkgs": [
-          "nixvim",
+          "simple-nixos-mailserver",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1735882644,
-        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "git-hooks_2": {
-      "inputs": {
-        "flake-compat": [
-          "stylix",
-          "flake-compat"
-        ],
-        "gitignore": "gitignore_2",
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "stylix",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731363552,
-        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
        "type": "github"
      },
      "original": {
@ -253,7 +144,7 @@
    "gitignore": {
      "inputs": {
        "nixpkgs": [
-          "nixvim",
+          "simple-nixos-mailserver",
          "git-hooks",
          "nixpkgs"
        ]
@ -272,42 +163,21 @@
        "type": "github"
      }
    },
-    "gitignore_2": {
+    "grayjay": {
      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "git-hooks",
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "lastModified": 1748772835,
+        "narHash": "sha256-p/hGSN1DOU/pELQi5PTds8eL+czjmb/0RvwvLm7nGC8=",
+        "owner": "rishabh5321",
+        "repo": "grayjay-flake",
+        "rev": "998cbc285d936a45daf07414d03db3f60c133caa",
        "type": "github"
      },
      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "gnome-shell": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732369855,
-        "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
-        "owner": "GNOME",
-        "repo": "gnome-shell",
-        "rev": "dadd58f630eeea41d645ee225a63f719390829dc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "GNOME",
-        "ref": "47.2",
-        "repo": "gnome-shell",
+        "owner": "rishabh5321",
+        "repo": "grayjay-flake",
        "type": "github"
      }
    },
@ -318,16 +188,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1735344290,
-        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
+        "lastModified": 1748665073,
+        "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
+        "rev": "282e1e029cb6ab4811114fc85110613d72771dea",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
        "repo": "home-manager",
        "type": "github"
      }
@ -335,16 +205,16 @@
    "home-manager_2": {
      "inputs": {
        "nixpkgs": [
-          "nixvim",
+          "zen-browser",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1735979091,
-        "narHash": "sha256-WpFjt6+8UD81EP386c269ZTqpEmlGJgcPw+OB4b7EBs=",
+        "lastModified": 1743604125,
+        "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "11ab08541e61ac3bbf2ab27229f68622629401df",
+        "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a",
        "type": "github"
      },
      "original": {
@ -353,100 +223,113 @@
        "type": "github"
      }
    },
-    "home-manager_3": {
+    "hyprpanel": {
      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
+        "ags": "ags",
+        "astal": "astal_2",
+        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1735344290,
-        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
+        "lastModified": 1748962037,
+        "narHash": "sha256-MkrOyZ6CqTzzmlfmvkPiezy51hG96xqucrR38xQpK/0=",
+        "owner": "Jas-SinghFSU",
+        "repo": "HyprPanel",
+        "rev": "8422c6b80526f8289a30b93cb5b354d9f007141d",
        "type": "github"
      },
      "original": {
-        "owner": "nix-community",
-        "ref": "release-24.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "ixx": {
-      "inputs": {
-        "flake-utils": [
-          "nixvim",
-          "nuschtosSearch",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixvim",
-          "nuschtosSearch",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729958008,
-        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
-        "owner": "NuschtOS",
-        "repo": "ixx",
-        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "ref": "v0.0.6",
-        "repo": "ixx",
-        "type": "github"
-      }
-    },
-    "nix-darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1735956190,
-        "narHash": "sha256-svzx3yVXD5tbBJZCn3Lt1RriH8GHo6CyVUPTHejf7sU=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "3feaf376d75d3d58ebf7e9a4f584d00628548ad9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "repo": "nix-darwin",
+        "owner": "Jas-SinghFSU",
+        "repo": "HyprPanel",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1735922141,
-        "narHash": "sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw=",
-        "owner": "nixos",
+        "lastModified": 1744463964,
+        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d29ab98cd4a70a387b8ceea3e930b3340d41ac5a",
+        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.11",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-25_05": {
+      "locked": {
+        "lastModified": 1747610100,
+        "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1748889542,
+        "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1735834308,
-        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
+        "lastModified": 1748693115,
+        "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1748693115,
+        "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1748370509,
+        "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
+        "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
        "type": "github"
      },
      "original": {
@ -456,97 +339,130 @@
        "type": "github"
      }
    },
-    "nixvim": {
-      "inputs": {
-        "devshell": "devshell",
-        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
-        "git-hooks": "git-hooks",
-        "home-manager": "home-manager_2",
-        "nix-darwin": "nix-darwin",
-        "nixpkgs": [
-          "nixpkgs-unstable"
-        ],
-        "nuschtosSearch": "nuschtosSearch",
-        "treefmt-nix": "treefmt-nix"
-      },
+    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1736025907,
-        "narHash": "sha256-OopQbnOMP5YCl2aVEQQmPeze8wDmofZjzU6URCFEPQU=",
-        "owner": "nix-community",
-        "repo": "nixvim",
-        "rev": "e07a482fd86eed90fd9378b97a2f938f07da1499",
+        "lastModified": 1748889542,
+        "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
        "type": "github"
      },
      "original": {
-        "owner": "nix-community",
-        "repo": "nixvim",
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nuschtosSearch": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "ixx": "ixx",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
+    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1735854821,
-        "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=",
-        "owner": "NuschtOS",
-        "repo": "search",
-        "rev": "836908e3bddd837ae0f13e215dd48767aee355f0",
+        "lastModified": 1747179050,
+        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
        "type": "github"
      },
      "original": {
-        "owner": "NuschtOS",
-        "repo": "search",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1743448293,
+        "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "root": {
      "inputs": {
+        "catppuccin": "catppuccin",
+        "grayjay": "grayjay",
        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
+        "hyprpanel": "hyprpanel",
+        "nixpkgs": "nixpkgs_4",
+        "nixpkgs-stable": "nixpkgs-stable",
        "nixpkgs-unstable": "nixpkgs-unstable",
-        "nixvim": "nixvim",
-        "stylix": "stylix"
+        "simple-nixos-mailserver": "simple-nixos-mailserver",
+        "sops-nix": "sops-nix",
+        "spicetify-nix": "spicetify-nix",
+        "zen-browser": "zen-browser"
      }
    },
-    "stylix": {
+    "simple-nixos-mailserver": {
      "inputs": {
-        "base16": "base16",
-        "base16-fish": "base16-fish",
-        "base16-helix": "base16-helix",
-        "base16-vim": "base16-vim",
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_2",
-        "git-hooks": "git-hooks_2",
-        "gnome-shell": "gnome-shell",
-        "home-manager": "home-manager_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_2",
-        "tinted-foot": "tinted-foot",
-        "tinted-kitty": "tinted-kitty",
-        "tinted-tmux": "tinted-tmux"
+        "blobs": "blobs",
+        "flake-compat": "flake-compat",
+        "git-hooks": "git-hooks",
+        "nixpkgs": "nixpkgs_5",
+        "nixpkgs-25_05": "nixpkgs-25_05"
      },
      "locked": {
-        "lastModified": 1736019457,
-        "narHash": "sha256-MWe3RXEV9dov1wFZraWagVAxynPo/VceStIYfNRgqG4=",
-        "owner": "danth",
-        "repo": "stylix",
-        "rev": "5204b085385c0bfaa1eb1bb0f8dc81922012128d",
+        "lastModified": 1747965231,
+        "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=",
+        "owner": "simple-nixos-mailserver",
+        "repo": "nixos-mailserver",
+        "rev": "53007af63fade28853408370c4c600a63dd97f41",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "simple-nixos-mailserver",
+        "ref": "nixos-25.05",
+        "repo": "nixos-mailserver",
+        "type": "gitlab"
+      }
+    },
+    "sops-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1747603214,
+        "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
+        "owner": "mic92",
+        "repo": "sops-nix",
+        "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
        "type": "github"
      },
      "original": {
-        "owner": "danth",
-        "ref": "release-24.11",
-        "repo": "stylix",
+        "owner": "mic92",
+        "repo": "sops-nix",
+        "type": "github"
+      }
+    },
+    "spicetify-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1748752728,
+        "narHash": "sha256-en008ncPUQjVx2i3PbM4RWeZkD9DNbJwIy0epppXe2o=",
+        "owner": "Gerg-L",
+        "repo": "spicetify-nix",
+        "rev": "0e03de40d5128eb2ad600c98f57cf5db2cdf3240",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "spicetify-nix",
        "type": "github"
      }
    },
@ -565,89 +481,22 @@
        "type": "github"
      }
    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "tinted-foot": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726913040,
-        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      }
-    },
-    "tinted-kitty": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1716423189,
-        "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
-        "type": "github"
-      }
-    },
-    "tinted-tmux": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1729501581,
-        "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=",
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "type": "github"
-      }
-    },
-    "treefmt-nix": {
+    "zen-browser": {
      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
+        "home-manager": "home-manager_2",
+        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1735905407,
-        "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8",
+        "lastModified": 1748920570,
+        "narHash": "sha256-m7EshkqPxa3IxN/qwxP1LlMlRdn37aiK0hghDieho8A=",
+        "owner": "0xc000022070",
+        "repo": "zen-browser-flake",
+        "rev": "ff5bf0bcf588e8c1d0f5fcd635b0c8e1cce8aee5",
        "type": "github"
      },
      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
+        "owner": "0xc000022070",
+        "repo": "zen-browser-flake",
        "type": "github"
      }
    }
--- a/flake.nix
+++ b/flake.nix
@ -1,74 +1,209 @@
 {
-  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-25.05";
+    # 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-25.05";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";

    home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    nixvim = {
-      url = "github:nix-community/nixvim";
+
+    #
+    # ========= Utilities =========
+    #
+    # Secrets management
+    sops-nix = {
+      url = "github:mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    # Catppuccin theming
+    catppuccin.url = "github:catppuccin/nix";
+    # Bar
+    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
+    simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
+    # Spotify
+    spicetify-nix = {
+      url = "github:Gerg-L/spicetify-nix";
      inputs.nixpkgs.follows = "nixpkgs-unstable";
    };
-    stylix = {
-      url = "github:danth/stylix/release-24.11";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # 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,
-      stylix,
+      simple-nixos-mailserver,
      ...
-    }:
+    }@inputs:
    let
-      system = "x86_64-linux";
      inherit (self) outputs;
+      common = import ./shared/common.nix;
+      theme = import ./shared/theme.nix;
+
+      #
+      # ========= 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";
+          nvidia.enable = true;
+          ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSzXyTuQyTrWsfORQbvgrqt/33+hfSUDXeMg6D1T2wz";
+        }
+        {
+          hostName = "thinkpad";
+          ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNlHKE/BD8kKfhJD7GBk1A3whZf3gTjk9VEgGAj3qsH";
+        }
+        {
+          hostName = "pi4";
+          system = "aarch64-linux";
+          wayland.enable = false;
+          ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJE9m7YiITe1sDqSZ7Pa8luIw3WToLsypixZEqE4wCQE";
+          address.private = common.localIpAddr 188;
+        }
+        {
+          hostName = "homelab";
+          wayland.enable = false;
+          ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIARDv5nRlfPDXdV+Db4FaqeSJZ3/3MO0frYGzuVeqYAl";
+          address.private = common.localIpAddr 231;
+          address.tailnet = common.tailnetAddr "admin";
+        }
+      ];
+
+      defaultAttrs = {
+        hostName = builtins.abort "hostName is required";
+        system = "x86_64-linux";
+        username = common.username;
+        version = common.system.version;
+        wayland.enable = true;
+        nvidia.enable = false;
+      };
+
+      knownSystems = [
+        {
+          # Samsung S23 FE
+          hostName = "localhost-y4maoyqm";
+          ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII7SSjiqnjif1Kko60iXVTKJ7a1/lRlR8TFNtoclNcnQ";
+        }
+        {
+          # OnePlus 8
+          hostName = "localhost-4izgka9k";
+          ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALtulVgLrUEpKnpfPFQTHjaEXTxs2Q818NC18eLx0bj";
+        }
+      ];
+
    in
    {
-      # Adds the nix fmt command to format nix files
-      formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
+      #
+      # ========= Overlays =========
+      #
+      # Custom modifications/overrides to upstream packages
+      overlays = import ./overlays.nix { inherit inputs; };

-      nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
-        system = system;
-        specialArgs = { inherit outputs; }; # Pass args to modules
-        modules = [
-          ./configuration.nix
-          home-manager.nixosModules.home-manager
+      #
+      # ========= Host Configurations =========
+      #
+      nixosConfigurations = builtins.listToAttrs (
+        builtins.map (
          {
-            home-manager =
-              let
-                common = import ./common.nix;
-              in
-              {
-                # Backups conflicting files in case of error
-                backupFileExtension = "bkp";
-                useGlobalPkgs = true;
-                useUserPackages = true;
-                # Passes inputs as an argument to home-manager
-                extraSpecialArgs = { inherit inputs; };
-                users.${common.username} = import ./home-manager;
-              };
-          }
-          stylix.nixosModules.stylix
-        ];
-      };
+            hostName,
+            system,
+            username,
+            ...
+          }@systemConfig:

-      overlays = {
-        # Gives access to unstable packages everywhere
-        unstable-packages = final: _prev: {
-          unstable = import nixpkgs-unstable {
-            system = final.system;
-            config.allowUnfree = true;
-          };
-        };
-      };
+          {
+            name = hostName;
+            value = nixpkgs.lib.nixosSystem {
+              inherit system;
+              specialArgs = {
+                inherit
+                  outputs
+                  inputs
+                  common
+                  theme
+                  lib
+                  systemConfig
+                  systems
+                  knownSystems
+                  ;
+                isDarwin = false;
+              };
+              modules = [
+                ./hosts/${hostName}
+                home-manager.nixosModules.home-manager
+                {
+                  home-manager = {
+                    # Backups conflicting files in case of error
+                    backupFileExtension = "bkp";
+                    useGlobalPkgs = true;
+                    useUserPackages = true;
+                    extraSpecialArgs = {
+                      inherit
+                        inputs
+                        common
+                        theme
+                        libHm
+                        systemConfig
+                        systems
+                        ;
+                    };
+                    users.${username} = import ./hosts/${hostName}/home-manager;
+                  };
+                }
+                {
+                  nixpkgs.overlays = with inputs; [
+                    hyprpanel.overlay
+                  ];
+                }
+              ];
+            };
+          }
+        ) systems
+      );
+
+      #
+      # ========= 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/5
+++ b/5
@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-
-# Format all files matched by treefmt.toml
-
-treefmt --on-unmatched info
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@ -1,65 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}:
-let
-  common = import ../common.nix;
-  username = common.username;
-  dir = common.dir;
-in
-{
-  imports = [
-    inputs.nixvim.homeManagerModules.nixvim
-    ./default-applications.nix
-    ./fish.nix
-    ./nixvim
-    ./rofi
-    ./wlogout
-    ./hyprland
-  ];
-
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home = {
-    username = username;
-    homeDirectory = dir.home;
-
-    sessionVariables = {
-      XDG_PICTURES_DIR = dir.pictures; # Define the default dir for pictures
-    };
-
-    # You can update Home Manager without changing this value. See
-    # the Home Manager release notes for a list of state version
-    # changes in each release.
-    stateVersion = common.system.version;
-  };
-
-  programs = {
-    btop.enable = true;
-
-    git = {
-      enable = true;
-      userName = "Martin Berg Alstad";
-      userEmail = "git@martials.no";
-      extraConfig = {
-        push.autoSetupRemote = true;
-      };
-    };
-
-    # Let Home Manager install and manage itself.
-    home-manager.enable = true;
-
-    kitty = {
-      enable = common.terminal == "kitty";
-      settings.window_padding_width = 10;
-    };
-  };
-
-  services = {
-    gpg-agent = {
-      enable = true;
-      pinentryPackage = pkgs.pinentry-curses;
-    };
-  };
-}
--- a/home-manager/fish.nix
+++ b/home-manager/fish.nix
@ -1,198 +0,0 @@
-{ pkgs, lib, ... }:
-let
-  replace =
-    from: to: current:
-    if current == from then to else current;
-  toSingleLine =
-    with lib.strings;
-    s: concatMapStrings (stringAsChars (replace "\n" "")) (splitString "n" s);
-  theme = import ../theme.nix;
-in
-{
-  programs = {
-    fish = {
-      enable = true;
-      plugins = [
-        {
-          # !! to get the previous command
-          name = "fishbang";
-          src = pkgs.fetchFromGitHub {
-            owner = "BrewingWeasel";
-            repo = "fishbang";
-            rev = "50389667eb9ac79edcff9b987c83e1de8ac93921";
-            hash = "sha256-IneNWyfo29C7FDA5b6pTZRX3HpP6y/dRM6GXuLq2+zc=";
-          };
-        }
-      ];
-    };
-
-    # TODO catppuccin colours on all parts
-    starship = {
-      enable = true;
-      settings = {
-        format = toSingleLine ''
-          [](#${theme.mantleAlpha})
-          $os
-          $username
-          [](bg:#${theme.lavenderAlpha} fg:#${theme.mantleAlpha})
-          $directory
-          [](fg:#${theme.lavenderAlpha} bg:#${theme.blueAlpha})
-          $git_branch
-          $git_status
-          [](fg:#${theme.blueAlpha} bg:#86BBD8)
-          $c
-          $elixir
-          $elm
-          $golang
-          $gradle
-          $haskell
-          $java
-          $julia
-          $nodejs
-          $nim
-          $rust
-          $scala
-          [](fg:#86BBD8 bg:#06969A)
-          $docker_context
-          [](fg:#06969A bg:#33658A)
-          $time
-          [ ](fg:#33658A)
-        '';
-
-        # Disable the blank line at the start of the prompt
-        # add_newline = false
-
-        # You can also replace your username with a neat symbol like   or disable this
-        # and use the os module below
-        username = {
-          show_always = false;
-          style_user = "bg:#${theme.crustAlpha}";
-          style_root = "bg:#${theme.mantleAlpha}";
-          format = "[$user]($style) in ";
-          disabled = false;
-        };
-
-        os = {
-          style = "bg:#${theme.mantleAlpha}";
-          disabled = false;
-        };
-
-        directory = {
-          style = "bg:#${theme.lavenderAlpha} fg:#${theme.baseAlpha}";
-          format = "[ $path ]($style)";
-          truncation_length = 3;
-          truncation_symbol = "…/";
-        };
-
-        # Here is how you can shorten some long paths by text replacement
-        # similar to mapped_locations in Oh My Posh:
-        directory.substitutions = {
-          "Documents" = "󰈙 ";
-          "Downloads" = " ";
-          "Music" = "󰓃 ";
-          "Pictures" = " ";
-        };
-        # Keep in mind that the order matters. For example:
-        # "Important Documents" = " 󰈙 "
-        # will not be replaced, because "Documents" was already substituted before.
-        # So either put "Important Documents" before "Documents" or use the substituted version:
-        # "Important 󰈙 " = " 󰈙 "
-
-        c = {
-          symbol = " ";
-          style = "bg:#86BBD8";
-          format = "[ $symbol ($version) ]($style)";
-        };
-
-        docker_context = {
-          symbol = " ";
-          style = "bg:#06969A";
-          format = "[ $symbol $context ]($style)";
-        };
-
-        elixir = {
-          symbol = " ";
-          style = "bg:#86BBD8";
-          format = "[ $symbol ($version) ]($style)";
-        };
-
-        elm = {
-          symbol = " ";
-          style = "bg:#86BBD8";
-          format = "[ $symbol ($version) ]($style)";
-        };
-
-        git_branch = {
-          symbol = " ";
-          style = "bg:#${theme.blueAlpha} fg:#${theme.baseAlpha}";
-          format = "[ $symbol $branch ]($style)";
-        };
-
-        git_status = {
-          style = "bg:#${theme.blueAlpha} fg:#${theme.baseAlpha}";
-          format = "[$all_status$ahead_behind ]($style)";
-        };
-
-        golang = {
-          symbol = " ";
-          style = "bg:#86BBD8";
-          format = "[ $symbol ($version) ]($style)";
-        };
-
-        gradle = {
-          style = "bg:#86BBD8";
-          format = "[ $symbol ($version) ]($style)";
-        };
-
-        haskell = {
-          symbol = " ";
-          style = "bg:#86BBD8";
-          format = "[ $symbol ($version) ]($style)";
-        };
-
-        java = {
-          symbol = " ";
-          style = "bg:#86BBD8";
-          format = "[ $symbol ($version) ]($style)";
-        };
-
-        julia = {
-          symbol = " ";
-          style = "bg:#86BBD8";
-          format = "[ $symbol ($version) ]($style)";
-        };
-
-        nodejs = {
-          symbol = "";
-          style = "bg:#86BBD8";
-          format = "[ $symbol ($version) ]($style)";
-        };
-
-        nim = {
-          symbol = "󰆥 ";
-          style = "bg:#86BBD8";
-          format = "[ $symbol ($version) ]($style)";
-        };
-
-        rust = {
-          symbol = " ";
-          style = "bg:#86BBD8";
-          format = "[ $symbol ($version) ]($style)";
-        };
-
-        scala = {
-          symbol = " ";
-          style = "bg:#86BBD8";
-          format = "[ $symbol ($version) ]($style)";
-        };
-
-        time = {
-          disabled = false;
-          time_format = "%R"; # Hour:Minute Format
-          style = "bg:#33658A";
-          format = "[ $time ]($style)";
-        };
-      };
-    };
-  };
-}
--- a/home-manager/hyprland/default.nix
+++ b/home-manager/hyprland/default.nix
@ -1,15 +0,0 @@
-# Home configurations for Hyprland. For system configs, see ./modules/hyprland
-{
-  imports = [
-    ./binds.nix
-    ./hyprcursor
-    ./waybar
-    ./hypridle
-    ./hyprlock
-    ./hyprshot.nix
-    ./settings.nix
-    ./swaync
-  ];
-
-  wayland.windowManager.hyprland.enable = true;
-}
--- a/home-manager/hyprland/hyprcursor/default.nix
+++ b/home-manager/hyprland/hyprcursor/default.nix
@ -1,36 +0,0 @@
-{ pkgs, ... }:
-let
-  cursorSize = 24;
-  cursorTheme = "rose-pine-hyprcursor";
-  cursorDir = "hyprcursors";
-in
-{
-  home = {
-    packages = with pkgs; [
-      hyprcursor
-    ];
-
-    file = {
-      ".local/share/icons/${cursorTheme}/manifest.hl".text = ''
-        name = ${cursorTheme}
-        description = BreezeX remixed with Rose Pine remixed to Hyprcursor format
-        version = 0.3.2
-        cursors_directory = ${cursorDir}
-      '';
-      ".local/share/icons/${cursorTheme}/${cursorDir}" = {
-        source = ./${cursorDir};
-        recursive = true;
-      };
-    };
-
-    sessionVariables = {
-      XCURSOR_SIZE = cursorSize;
-      HYPRCURSOR_SIZE = cursorSize;
-      HYPRCURSOR_THEME = cursorSize;
-    };
-  };
-
-  wayland.windowManager.hyprland.settings.exec-once = [
-    "hyprctl setcursor $HYPRCURSOR_THEME $HYPRCURSOR_SIZE" # Set cursor
-  ];
-}
--- a/home-manager/hyprland/hyprcursor/hyprcursors/X_cursor.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/X_cursor.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/all-scroll.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/all-scroll.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/bd_double_arrow.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/bd_double_arrow.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/bottom_left_corner.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/bottom_left_corner.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/bottom_right_corner.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/bottom_right_corner.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/bottom_side.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/bottom_side.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/center_ptr.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/center_ptr.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/col-resize.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/col-resize.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/color-picker.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/color-picker.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/context-menu.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/context-menu.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/copy.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/copy.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/cross.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/cross.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/crossed_circle.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/crossed_circle.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/dnd_no_drop.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/dnd_no_drop.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/dotbox.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/dotbox.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/fd_double_arrow.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/fd_double_arrow.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/hand1.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/hand1.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/hand2.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/hand2.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/left_ptr.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/left_ptr.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/left_side.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/left_side.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/link.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/link.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/move.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/move.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/pencil.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/pencil.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/pirate.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/pirate.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/plus.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/plus.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/question_arrow.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/question_arrow.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/right_ptr.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/right_ptr.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/right_side.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/right_side.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/row-resize.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/row-resize.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/sb_down_arrow.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/sb_down_arrow.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/sb_h_double_arrow.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/sb_h_double_arrow.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/sb_left_arrow.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/sb_left_arrow.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/sb_right_arrow.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/sb_right_arrow.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/sb_up_arrow.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/sb_up_arrow.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/sb_v_double_arrow.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/sb_v_double_arrow.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/top_left_corner.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/top_left_corner.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/top_right_corner.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/top_right_corner.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/top_side.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/top_side.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/vertical-text.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/vertical-text.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/wayland-cursor.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/wayland-cursor.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/xterm.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/xterm.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/zoom-in.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/zoom-in.hlc
--- a/home-manager/hyprland/hyprcursor/hyprcursors/zoom-out.hlc
+++ b/home-manager/hyprland/hyprcursor/hyprcursors/zoom-out.hlc
--- a/home-manager/hyprland/swaync/default.nix
+++ b/home-manager/hyprland/swaync/default.nix
@ -1,464 +0,0 @@
-{ lib, ... }:
-let
-  theme = import ../../../theme.nix;
-in
-{
-  # TODO inject font
-  services.swaync = {
-    enable = true;
-    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,8 +0,0 @@
-{ ... }:
-
-{
-  home.file.".config/waybar" = {
-    source = ./config;
-    recursive = true;
-  };
-}
--- a/home-manager/nixvim/default.nix
+++ b/home-manager/nixvim/default.nix
@ -1,60 +0,0 @@
-# Neovim configuration for Nix
-{
-  home.sessionVariables = {
-    EDITOR = "nvim";
-  };
-
-  programs.nixvim = {
-    enable = true;
-
-    clipboard.providers.wl-copy.enable = true;
-
-    opts = {
-      number = true; # Show line numbers
-      relativenumber = true; # Show relative line numbers
-
-      shiftwidth = 2; # Tab width should be 2
-    };
-
-    plugins = {
-      bufferline.enable = true;
-
-      # Formatters
-      conform-nvim = {
-        enable = true;
-        # TODO use nix fmt on save
-        settings = { };
-      };
-
-      lsp = {
-        enable = true;
-        servers = {
-          nixd.enable = true;
-        };
-      };
-
-      lualine.enable = true;
-      luasnip.enable = true;
-
-      # Completions
-      cmp = {
-        enable = true;
-
-        autoEnableSources = true;
-
-        # TODO complete on <tab>
-        settings = {
-          sources = [
-            { name = "nvim-lsp"; }
-            { name = "path"; }
-            { name = "buffer"; }
-          ];
-        };
-      };
-
-      treesitter.enable = true;
-
-      web-devicons.enable = true;
-    };
-  };
-}
--- 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 = true;
-    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/hosts/desktop/bluetooth.nix
+++ b/hosts/desktop/bluetooth.nix
@ -0,0 +1,18 @@
+{ pkgs, ... }:
+
+{
+  hardware.bluetooth = {
+    enable = true;
+    input = {
+      # Required to get PS3 controllers working
+      General = {
+        ClassicBondedOnly = false;
+        UserspaceHID = false;
+      };
+    };
+    powerOnBoot = true;
+    package = pkgs.unstable.bluez;
+  };
+
+  services.blueman.enable = true;
+}
--- 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,15 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [
+    (lib.custom.relativeToDesktop "modules")
+    ./bluetooth.nix
+    ./hardware-configuration.nix
+  ];
+
+  boot.kernelPackages = pkgs.linuxPackages_6_14;
+}
--- 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.relativeToDesktop "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.mkForce [
+        wallpaper1
+        wallpaper2
+      ];
+
+      wallpaper =
+        let
+          common = import ../common.nix;
+        in
+        lib.mkForce [
+          "${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
@ -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/desktop/home-manager/zen/chrome/userContent.css
+++ b/hosts/desktop/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/desktop/home-manager/zen/chrome/zen-logo.svg
+++ b/hosts/desktop/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/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/actual.nix
+++ b/hosts/pi4/actual.nix
@ -0,0 +1,42 @@
+{ config, common, ... }:
+let
+  domain = "beta.budget.${common.domain}";
+in
+{
+  networking.nat = {
+    enable = true;
+    internalInterfaces = [ "ve-*" ];
+    externalInterface = "wlan0";
+    # Lazy IPv6 connectivity for the container
+    enableIPv6 = true;
+  };
+
+  containers.actual = {
+    autoStart = true;
+    privateNetwork = true;
+    hostAddress = "192.168.10.188";
+    localAddress = "192.168.10.11";
+    config =
+      { ... }:
+      {
+        services = {
+          actual = {
+            enable = true;
+            settings = {
+              port = 8084;
+              loginMethod = "password";
+            };
+          };
+        };
+        system.stateVersion = common.system.version;
+      };
+  };
+  services.nginx.virtualHosts.${domain} = {
+    forceSSL = true;
+    enableACME = true;
+    locations."/" = {
+      proxyPass = "http://${config.containers.actual.localAddress}:8084";
+      proxyWebsockets = true;
+    };
+  };
+}
--- a/hosts/pi4/boot.nix
+++ b/hosts/pi4/boot.nix
@ -0,0 +1,16 @@
+{ pkgs, ... }:
+
+{
+  boot = {
+    kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
+    initrd.availableKernelModules = [
+      "xhci_pci"
+      "usbhid"
+      "usb_storage"
+    ];
+    loader = {
+      grub.enable = false;
+      generic-extlinux-compatible.enable = true;
+    };
+  };
+}
--- a/hosts/pi4/caddy.nix
+++ b/hosts/pi4/caddy.nix
@ -0,0 +1,91 @@
+{ common, ... }:
+let
+  domain = common.domain;
+in
+{
+  services.caddy = {
+    enable = false;
+    email = "cert@${domain}";
+    virtualHosts =
+      let
+        localProxy = proxyTo "localhost";
+        homelabProxy = proxyTo "192.168.10.231";
+        proxyTo = ip: port: "reverse_proxy ${ip}:${builtins.toString port}";
+        redirect = subdomain: "redir https://${subdomain}.${domain}{uri}";
+      in
+      {
+        "beta.${domain}".extraConfig = ''
+          redir https://${domain}{uri}
+        '';
+        "git.${domain}".extraConfig = ''
+          ${redirect "code"}
+        '';
+        "kitchenowl.${domain}".extraConfig = ''
+          ${redirect "grocery"}
+        '';
+        # Gitea
+        "code.${domain}".extraConfig = ''
+          ${homelabProxy 3000}
+        '';
+        # Forgejo
+        "beta.code.${domain}".extraConfig = ''
+          ${localProxy 8001}
+        '';
+        # Nextcloud
+        "nextcloud.${domain}".extraConfig = ''
+          redir /.well-known/carddav /remote.php/dav 301
+          redir /.well-known/caldav /remote.php/dav 301
+          ${homelabProxy 11000}
+        '';
+        # Kitchenowl
+        "grocery.${domain}".extraConfig = ''
+          ${homelabProxy 800}
+        '';
+        # Actual Budget
+        "budget.${domain}".extraConfig = ''
+          ${homelabProxy 5006}
+        '';
+        # Uptime Kuma
+        "status.${domain}".extraConfig = ''
+          ${homelabProxy 3001}
+        '';
+        # Headscale
+        "vpn.${domain}".extraConfig = ''
+          reverse_proxy /web* 192.168.10.231:8084
+          reverse_proxy * 192.168.10.231:8082
+        '';
+        # Headscale SmartDNS
+        "dns.${domain}".extraConfig = ''
+          ${homelabProxy 8082}
+        '';
+        # FreshRSS
+        "rss.${domain}".extraConfig = ''
+          ${homelabProxy 8085}
+        '';
+        # Ente backend
+        "api.ente.${domain}".extraConfig = ''
+          ${homelabProxy 8083}
+        '';
+        # Ente Photos frontend
+        "ente.${domain}".extraConfig = ''
+          ${homelabProxy 3003}
+        '';
+        # Ente Auth frontend
+        "mfa.${domain}".extraConfig = ''
+          ${homelabProxy 3004}
+        '';
+        # Homepage / portfolio
+        "${domain}".extraConfig = ''
+          ${homelabProxy 4321}
+        '';
+        # Yamtrack
+        "track.${domain}".extraConfig = ''
+          ${homelabProxy 8090}
+        '';
+        # Donetick
+        "chore.${domain}".extraConfig = ''
+          ${homelabProxy 2021}
+        '';
+      };
+  };
+}
--- a/hosts/pi4/default.nix
+++ b/hosts/pi4/default.nix
@ -0,0 +1,19 @@
+{ lib, ... }:
+
+{
+  imports = with lib.custom; [
+    (relativeToBase "modules")
+    ./actual.nix
+    ./boot.nix
+    ./caddy.nix
+    ./forgejo.nix
+    ./hardware.nix
+    ./headscale.nix
+    ./mailserver.nix
+    ./nextcloud.nix
+    ./nginx.nix
+    ./podman.nix
+    ./postgres.nix
+    ./security
+  ];
+}
--- a/hosts/pi4/forgejo.nix
+++ b/hosts/pi4/forgejo.nix
@ -0,0 +1,94 @@
+{
+  config,
+  pkgs,
+  lib,
+  systemConfig,
+  common,
+  ...
+}:
+let
+  cfg = config.services.forgejo;
+  srv = cfg.settings.server;
+  domain = "beta.code.${common.domain}";
+  passwordKey = "forgejo/admin-pass";
+  runnerTokenKey = "forgejo/runner-token";
+in
+{
+  services = {
+    nginx.virtualHosts.${domain} = {
+      enableACME = true;
+      forceSSL = true;
+      locations."/".proxyPass = "http://127.0.0.1:${builtins.toString srv.HTTP_PORT}";
+      serverAliases = [ "beta.git.${common.domain}" ];
+    };
+
+    forgejo = {
+      enable = true;
+      database.type = "postgres";
+      # Enable support for Git Large File Storage
+      lfs.enable = true;
+
+      secrets.mailer.PASSWD = config.sops.secrets."mailserver/password-hash".path;
+
+      settings = {
+        server = {
+          DOMAIN = domain;
+          # You need to specify this to remove the port from URLs in the web UI.
+          ROOT_URL = "https://${domain}/";
+          HTTP_PORT = 8002;
+        };
+        # You can temporarily allow registration to create an admin user.
+        service.DISABLE_REGISTRATION = true;
+        # Add support for actions, based on act: https://github.com/nektos/act
+        actions = {
+          ENABLED = true;
+          DEFAULT_ACTIONS_URL = "github";
+        };
+        # Sending emails is completely optional
+        # You can send a test email from the web UI at:
+        # Profile Picture > Site Administration > Configuration >  Mailer Configuration
+        mailer = lib.mkIf config.mailserver.enable {
+          ENABLED = true;
+          PROTOCOL = "smtps";
+          SMTP_ADDR = config.mailserver.fqdn;
+          FROM = "noreply-forgejo@${common.domain}";
+          USER = "${systemConfig.username}@${common.domain}";
+        };
+      };
+    };
+    gitea-actions-runner = {
+      package = pkgs.forgejo-actions-runner;
+      instances.default = {
+        enable = true;
+        name = "monolith";
+        url = "https://${domain}";
+        # Obtaining the path to the runner token file may differ
+        # tokenFile should be in format TOKEN=<secret>, since it's EnvironmentFile for systemd
+        tokenFile = config.sops.secrets.${runnerTokenKey}.path;
+        labels = [
+          "docker:docker://node:20-bullseye"
+          "native:host"
+        ];
+      };
+    };
+  };
+
+  sops.secrets = {
+    ${passwordKey}.owner = "forgejo";
+    ${runnerTokenKey}.owner = "forgejo";
+  };
+
+  # Create a single admin user / update password if exists
+  systemd.services.forgejo.preStart =
+    let
+      adminCmd = "${lib.getExe config.services.forgejo.package} admin user";
+      pwd = config.sops.secrets.${passwordKey};
+      user = "martin"; # Note, Forgejo doesn't allow creation of an account named "admin"
+      email = "git@${common.domain}";
+    in
+    ''
+      ${adminCmd} create --admin --email "${email}" --username ${user} --password "$(tr -d '\n' < ${pwd.path})" || true
+      ## Alter an existing user. Will prompt new password on login
+      # ${adminCmd} change-password --username ${user} --password "$(tr -d '\n' < ${pwd.path})" || true
+    '';
+}
--- a/hosts/pi4/hardware.nix
+++ b/hosts/pi4/hardware.nix
@ -0,0 +1,12 @@
+{
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-label/NIXOS_SD";
+      fsType = "ext4";
+      options = [ "noatime" ];
+    };
+    # TODO mount ext hdd
+  };
+
+  hardware.enableRedistributableFirmware = true;
+}
--- a/hosts/pi4/headscale.nix
+++ b/hosts/pi4/headscale.nix
@ -0,0 +1,66 @@
+{
+  config,
+  common,
+  ...
+}:
+let
+  cfg = config.services.headscale;
+
+  domain = "beta.vpn.${common.domain}";
+  dnsDomain = "secure.${common.domain}";
+in
+{
+  networking.firewall = {
+    trustedInterfaces = [ config.services.tailscale.interfaceName ];
+    allowedUDPPorts = [ config.services.tailscale.port ];
+  };
+
+  services = {
+    headscale = {
+      enable = true;
+      address = "0.0.0.0";
+      port = 8083;
+      settings = {
+        database = {
+          postgres = {
+            host = "/run/postgresql";
+            name = "headscale";
+            port = config.services.postgresql.settings.port;
+            user = cfg.user;
+          };
+          type = "postgres";
+        };
+        dns = {
+          base_domain = dnsDomain;
+          magic_dns = true;
+        };
+        logtail.enabled = false;
+        server_url = "https://${domain}";
+      };
+    };
+
+    nginx.virtualHosts.${domain} = {
+      forceSSL = true;
+      enableACME = true;
+      locations."/" = {
+        proxyPass = "http://localhost:${toString config.services.headscale.port}";
+        proxyWebsockets = true;
+      };
+    };
+
+    postgresql =
+      let
+        psql = cfg.settings.database.postgres;
+      in
+      {
+        ensureDatabases = [ psql.name ];
+        ensureUsers = [
+          {
+            name = psql.user;
+            ensureDBOwnership = true;
+          }
+        ];
+      };
+  };
+
+}
--- a/hosts/pi4/home-manager/default.nix
+++ b/hosts/pi4/home-manager/default.nix
@ -0,0 +1,9 @@
+{ lib, ... }:
+
+{
+  imports = with lib.custom; [
+    (relativeToBase "home-manager")
+  ];
+
+  programs.git.signing.key = "E3FA0E995C0D0E5E";
+}
--- a/hosts/pi4/mailserver.nix
+++ b/hosts/pi4/mailserver.nix
@ -0,0 +1,44 @@
+{
+  config,
+  inputs,
+  common,
+  systemConfig,
+  ...
+}:
+let
+  passwordHashKey = "mailserver/password-hash";
+in
+{
+  imports = [
+    inputs.simple-nixos-mailserver.nixosModule
+  ];
+
+  mailserver = {
+    enable = true;
+    # stateVersion = 1; TODO uncomment on 25.11
+    fqdn = "mail.${common.domain}";
+    domains = [
+      common.domain
+    ];
+
+    # A list of all login accounts. To create the password hashes, use
+    # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
+    loginAccounts = {
+      "${systemConfig.username}@${common.domain}" = {
+        hashedPasswordFile = config.sops.secrets.${passwordHashKey}.path;
+      };
+    };
+
+    # Use Let's Encrypt certificates. Note that this needs to set up a stripped
+    # down nginx and opens port 80.
+    certificateScheme = "acme-nginx";
+  };
+
+  networking.firewall.allowedTCPPorts = [
+    25
+    465
+    587
+  ];
+
+  sops.secrets.${passwordHashKey}.neededForUsers = true;
+}
--- a/hosts/pi4/nextcloud.nix
+++ b/hosts/pi4/nextcloud.nix
@ -0,0 +1,90 @@
+# https://mich-murphy.com/configure-nextcloud-nixos/
+{
+  pkgs,
+  config,
+  common,
+  ...
+}:
+let
+  adminPassKey = "nextcloud/admin-pass";
+  domain = "beta.nextcloud.${common.domain}";
+  dbname = "nextcloud";
+  dbuser = dbname;
+in
+{
+  security.acme = {
+    acceptTerms = true;
+    certs.${config.services.nextcloud.hostName}.email = "acme@${common.domain}";
+  };
+
+  services = {
+    nextcloud = {
+      enable = true;
+
+      autoUpdateApps.enable = true;
+
+      config = {
+        adminpassFile = config.sops.secrets.${adminPassKey}.path;
+        dbtype = "pgsql";
+        dbname = dbname;
+        dbuser = dbuser;
+        # default directory for postgresql, ensures automatic setup of db
+        dbhost = "/run/postgresql";
+        adminuser = "admin";
+      };
+
+      extraApps = {
+        inherit (config.services.nextcloud.package.packages.apps)
+          contacts
+          deck
+          notes
+          tasks
+          ;
+      };
+      extraAppsEnable = true;
+
+      hostName = domain;
+      https = true;
+
+      maxUploadSize = "0"; # No max limit
+      package = pkgs.nextcloud31;
+
+      settings = {
+        default_phone_region = "NO";
+        trusted_domains = [
+          domain
+        ];
+      };
+    };
+
+    nginx.virtualHosts.${config.services.nextcloud.hostName} = {
+      forceSSL = true;
+      enableACME = true;
+    };
+
+    postgresql = {
+      ensureDatabases = [ dbname ];
+      ensureUsers = [
+        {
+          name = dbuser;
+          ensureDBOwnership = true;
+        }
+      ];
+    };
+    postgresqlBackup = {
+      enable = true;
+      location = "/data/backup/nextclouddb";
+      databases = [ dbname ];
+      # time to start backup in systemd.time format
+      startAt = "*-*-* 23:15:00";
+    };
+  };
+
+  sops.secrets.${adminPassKey}.neededForUsers = true;
+
+  # ensure postgresql db is started with nextcloud
+  systemd.services."nextcloud-setup" = {
+    requires = [ "postgresql.service" ];
+    after = [ "postgresql.service" ];
+  };
+}
--- a/hosts/pi4/nginx.nix
+++ b/hosts/pi4/nginx.nix
@ -0,0 +1,93 @@
+{
+  common,
+  ...
+}:
+let
+  domain = common.domain;
+  proxyTo = address: port: {
+    enableACME = true;
+    forceSSL = true;
+    locations."/".proxyPass = "${address}:${builtins.toString port}";
+  };
+  proxyLocations = locations: {
+    enableACME = true;
+    forceSSL = true;
+    inherit locations;
+  };
+  homelab = "http://${common.localIpAddr 231}";
+  homelabProxy = proxyTo homelab; # TODO get homelab local ip from systems
+  redirect = subdomain: {
+    enableACME = true;
+    forceSSL = true;
+    globalRedirect = if subdomain == "" then domain else "${subdomain}.${domain}";
+  };
+in
+{
+  services.nginx = {
+    enable = true;
+    enableReload = true;
+    recommendedProxySettings = true;
+    recommendedTlsSettings = true;
+
+    virtualHosts = {
+      # Beta is currently stable
+      "www.${domain}" = redirect "";
+      "beta.${domain}" = redirect "";
+      "git.${domain}" = redirect "code";
+      "kitchenowl.${domain}" = redirect "grocery";
+      # Gitea
+      "code.${domain}" = homelabProxy 3000;
+      # Nextcloud
+      "nextcloud.${domain}" = proxyLocations {
+        "/".proxyPass = "${homelab}:11000";
+        "/.well-known/carddav".return = "301 /remote.php/dav";
+        "/.well-known/caldav".return = "301 /remote.php/dav";
+      };
+      # Kitchenowl
+      "grocery.${domain}" = homelabProxy 800;
+      # Actual budget
+      "budget.${domain}" = homelabProxy 5006;
+      # Uptime Kuma
+      "status.${domain}" = homelabProxy 3001;
+      # Headscale
+      "vpn.${domain}" = proxyLocations {
+        "/web".proxyPass = "${homelab}:8084";
+        "/" = {
+          proxyPass = "${homelab}:8082";
+          extraConfig = ''
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection $connection_upgrade;
+            proxy_redirect http:// https://;
+            proxy_buffering off;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;
+          '';
+        };
+      };
+      # Headscale SmartDNS
+      "dns.${domain}" = homelabProxy 8082;
+      # FreshRSS
+      "rss.${domain}" = homelabProxy 8085;
+      # Ente backend
+      "api.ente.${domain}" = homelabProxy 8083;
+      # Ente Photos frontend
+      "ente.${domain}" = homelabProxy 3003;
+      # Ente Auth frontend
+      "mfa.${domain}" = homelabProxy 3004;
+      # Homepage / portfolio
+      "${domain}" = homelabProxy 4321;
+      # Yamtrack
+      "track.${domain}" = homelabProxy 8090;
+      # Donetick
+      "chore.${domain}" = homelabProxy 2021;
+    };
+  };
+
+  security.acme = {
+    acceptTerms = true;
+    defaults.email = "acme@${domain}";
+  };
+}
--- a/hosts/pi4/podman.nix
+++ b/hosts/pi4/podman.nix
@ -0,0 +1,23 @@
+{ pkgs, ... }:
+
+{
+  virtualisation = {
+    # Enable common container config files in /etc/containers
+    containers.enable = true;
+    podman = {
+      enable = true;
+
+      # Create a `docker` alias for podman, to use it as a drop-in replacement
+      dockerCompat = true;
+
+      # Required for containers under podman-compose to be able to talk to each other.
+      defaultNetwork.settings.dns_enabled = true;
+    };
+  };
+
+  # Useful other development tools
+  environment.systemPackages = with pkgs; [
+    podman-tui # status of containers in the terminal
+    podman-compose # start group of containers for dev
+  ];
+}
--- a/hosts/pi4/postgres.nix
+++ b/hosts/pi4/postgres.nix
@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  services.postgresql = {
+    enable = true;
+    authentication = pkgs.lib.mkOverride 10 ''
+      #type database  DBuser        auth-method
+      local all       all           trust
+    '';
+  };
+}
--- a/hosts/pi4/security/default.nix
+++ b/hosts/pi4/security/default.nix
@ -0,0 +1,7 @@
+{
+  imports = [
+    ./firewall.nix
+  ];
+
+  services.pcscd.enable = true;
+}
--- a/hosts/pi4/security/firewall.nix
+++ b/hosts/pi4/security/firewall.nix
@ -0,0 +1,17 @@
+{ common, ... }:
+
+{
+  networking = {
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [
+        80
+        443
+      ];
+      extraInputRules = ''
+        ip saddr ${common.localIpRange} accept
+      '';
+    };
+    nftables.enable = true;
+  };
+}
--- 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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Martin Berg Alstad	3e718fadfc	✨ [pi4] Containerize Actual service	2025-06-23 19:18:40 +00:00
Martin Berg Alstad	763ee6312a	♻️ [pi4] Refactor firewall with variables	2025-06-23 18:17:08 +00:00
Martin Berg Alstad	5704ebe712	✨ [pi4] Initial Actual Budget service	2025-06-23 18:07:09 +00:00
Martin Berg Alstad	70b5d5fd4d	✨ [pi4] Nginx reload on change instead of restart	2025-06-23 17:47:35 +00:00
Martin Berg Alstad	c29acb0902	✨ [pi4] Headscale config with Postgres	2025-06-23 17:42:15 +00:00
Martin Berg Alstad	a545b4a45c	🔧 [pi4] Update Forgejo deprecated setting	2025-06-10 16:41:54 +00:00
Martin Berg Alstad	c839811b9f	🐛 [pi4] Fix wrong nginx config for headscale	2025-06-10 16:41:02 +00:00
Martin Berg Alstad	2812e85976	🚑 [pi4] Redirect from www. to	2025-06-08 21:41:29 +00:00
Martin Berg Alstad	3835c3a1a6	🚸 [pi4] Don't change password in forgejo	2025-06-08 21:37:07 +00:00
Martin Berg Alstad	a277e8f3ed	✨ [pi4] Fix nginx config with TLS	2025-06-08 21:34:06 +00:00
Martin Berg Alstad	eb8c857940	🚨 [shared] Migrate Yazi from manager to mgr	2025-06-03 21:50:42 +02:00
Martin Berg Alstad	b3e6222cac	✨ [pi4] Added initial Nginx config	2025-06-03 19:36:14 +00:00
Martin Berg Alstad	575452512a	📦 [desktop] Set Linux kernel to 6.14	2025-06-03 18:55:26 +02:00
Martin Berg Alstad	5cc4c6479c	📦 [shared] Update dependencies	2025-06-03 18:55:02 +02:00
Martin Berg Alstad	724fe6767e	♻️ [shared] Refactor system configs	2025-06-02 21:02:33 +02:00
Martin Berg Alstad	b74e5aab62	✨ [pi4] Added initial Simple mailserver config	2025-06-02 17:44:41 +00:00
Martin Berg Alstad	be02be6bf2	♻️ [pi4] Rename default_phone_region and other minor changes in Nextcloud	2025-05-31 16:04:19 +00:00
Martin Berg Alstad	d614495a2c	🧑‍💻 [pi4] Allow all traffic from local network	2025-05-31 15:42:48 +00:00
Martin Berg Alstad	1f2ea2d5fa	✨ [pi4] Added initial Forgejo config and Podman	2025-05-31 15:42:48 +00:00
Martin Berg Alstad	969a1e75bf	✨ [pi4] Added notes to nextcloud	2025-05-31 15:42:47 +00:00
Martin Berg Alstad	fe01334a85	🚸 [shared] Added public SSH keys for androids	2025-05-31 14:35:37 +02:00
Martin Berg Alstad	e986f337bd	✨ [pi4] Initial Nextcloud config	2025-05-27 20:01:07 +00:00
Martin Berg Alstad	96d57d34c1	🔒 [pi4] Disable ssh on gpg	2025-05-27 17:08:47 +00:00
Martin Berg Alstad	dcad8f12b9	🐛 [shared] Fix missing background on sddm	2025-05-27 18:27:07 +02:00
Martin Berg Alstad	1595e260d5	✨ [shared] Added bat with cat alias	2025-05-27 17:31:25 +02:00
Martin Berg Alstad	de53426fa5	🔧 [shared] Update stateVersion to 25.05	2025-05-26 20:30:17 +02:00
Martin Berg Alstad	fc89c377e8	⬆️ [shared] Upgrade to NixOS 25.05	2025-05-26 20:27:34 +02:00
Martin Berg Alstad	53329b8d1c	♻️ [shared] Moved Hm configs to shared base	2025-05-22 20:10:48 +02:00
Martin Berg Alstad	2b020958ed	♻️ [shared] Move gnome-keyring to base	2025-05-22 19:50:11 +02:00
Martin Berg Alstad	e4fe0e1127	♻️ [shared] Moved users config to base. Use password from Sops	2025-05-22 19:40:49 +02:00
Martin Berg Alstad	21d07edcf1	♻️ [shared] Moved files to base shared directory	2025-05-22 19:36:56 +02:00
Martin Berg Alstad	7455299dd7	♻️ [shared] Refactor hm ssh config, added systems to hm module	2025-05-20 22:03:58 +02:00
Martin Berg Alstad	9a8cc63674	🚚 [shared] Added shared config that shared desktop config inherits from	2025-05-20 21:52:00 +02:00
Martin Berg Alstad	adb02fbcc2	✨ [shared] Added homelab systemConfig	2025-05-20 21:37:26 +02:00
Martin Berg Alstad	882c42a093	♻️ [shared] Move domain to common file	2025-05-19 21:51:12 +02:00
Martin Berg Alstad	c6fcb7b6b8	♻️ [shared] Refactor ssh config to be dynamic	2025-05-19 21:42:29 +02:00
Martin Berg Alstad	b2fd4f1da5	✨ [shared] Added all public ssh keys to authorizedKeys	2025-05-19 20:23:04 +02:00
Martin Berg Alstad	2fe8c9edcb	🔧 [shared] Added ssh config for pi4 and homelab	2025-05-15 19:35:36 +00:00
Martin Berg Alstad	ab8a579a9c	➖ [shared] Only use cuda acceleration for Ollama if Nvidia is used	2025-05-15 21:32:19 +02:00
Martin Berg Alstad	b7c38d133e	🔧 [shared] Added thinkpad to ssh config	2025-05-15 21:18:06 +02:00
Martin Berg Alstad	55f7a37aaa	✨ [shared] Added ssh config for desktop. Justfile to get pub ssh	2025-05-15 21:14:05 +02:00
Martin Berg Alstad	48ff2cdfd2	💥 [pi4] Caddy redirect from kitchenowl to grocery	2025-05-15 20:48:00 +02:00
Martin Berg Alstad	73e6462229	🔐 [pi4] Password defined in sops	2025-05-15 18:47:22 +00:00
Martin Berg Alstad	050741393b	✨ [pi4] Added initial caddy config based on homelab	2025-05-13 21:31:29 +02:00
Martin Berg Alstad	08cd2cbebc	✨ [shared] Added planify	2025-05-13 21:00:14 +02:00
Martin Berg Alstad	5fce13233e	✨ Added Signal-desktop	2025-05-04 22:19:58 +02:00
Martin Berg Alstad	0770ae3ecf	✨ [desktop] Bluetooth Added Bluetooth support to desktop, including PS3 controllers	2025-04-29 20:32:24 +02:00
Martin Berg Alstad	a49dc70148	📦️ [desktop] Update packages, update Linux kernel to latest, update Nvidia drivers	2025-04-29 20:32:14 +02:00
Martin Berg Alstad	33351682c0	✨ [shared] Added fzf, ssh hm config, reencrypted secrets	2025-04-21 11:54:22 +02:00
Martin Berg Alstad	15d5121f0e	♻️ [shared] Refactor helix conifg, rm vscodium, add age for thinkpad	2025-04-20 18:04:23 +02:00
Martin Berg Alstad	d74f3880ca	✨ [shared] Helix config Support for more languages in Helix. C-f to format. Autosave. Added some lsp packages	2025-04-19 19:37:12 +02:00
Martin Berg Alstad	f1bf7b4ded	✨ [shared] Gitmoji-cli Added gitmoji-cli to home-manager	2025-04-19 18:07:55 +02:00
Martin Berg Alstad	985a71d901	✨ [shared] Replace Neovim with Helix Moved Helix editor to shared. Removed Nixvim flake and it's config	2025-04-19 17:54:56 +02:00
Martin Berg Alstad	7e5bc137e5	✨ [shared] Added eza, ls replacement	2025-04-19 17:05:35 +02:00
Martin Berg Alstad	923b0c8980	✨ [shared] Zoxide cd alias. Replaced Papers with sioyek	2025-04-19 16:27:53 +02:00
Martin Berg Alstad	e97dd6f5ce	✨ [shared] Updated Zed config, changed user config to just username	2025-04-18 19:49:14 +02:00
Martin Berg Alstad	31c25681c5	✨ [thinkpad] Fingerprint for sudo and login. Upgraded hyprlock to unstable	2025-04-18 17:54:17 +02:00
Martin Berg Alstad	9e96de997d	✨ [pi4] Added Sops with new hash. Added boot recipe to justfile	2025-04-18 13:59:06 +00:00
Martin Berg Alstad	b521aebef6	🐛 [pi4] Fix wrong paths. Added Zoxide	2025-04-17 12:49:59 +00:00
Martin Berg Alstad	feb1d07500	✨ [pi4] Public age key for pi4, generate ssh key in justfile	2025-04-17 10:25:14 +00:00
Martin Berg Alstad	4f126bab90	📝 [shared] Add justfile comments	2025-04-17 12:06:57 +02:00
Martin Berg Alstad	4b3ad49384	🐛 [desktop] Fix wallpaper not overriding default setting	2025-04-17 12:06:13 +02:00
Martin Berg Alstad	01e5fb42d3	✨ [shared] Sops nix for user passwords	2025-04-17 00:31:19 +02:00
Martin Berg Alstad	8244fe8927	✨ [pi4] Added gnome-keyring for keys	2025-04-16 21:17:50 +00:00
Martin Berg Alstad	244a029d70	✨ [pi4] Nftables firewall config, moved security.nix to security dir	2025-04-16 21:17:50 +00:00
Martin Berg Alstad	36ba00efc3	✨ [shared] Toggle hidden files using ctrl+h in Yazi	2025-04-16 15:45:57 +02:00
Martin Berg Alstad	f1d2672194	✨ [shared] Moved cmdline tools to /shell in home-manager config. Added Yazi catppuccin theme instead of manual	2025-04-16 15:10:40 +02:00
Martin Berg Alstad	b9e009b0cb	✨ [shell] Added shell for formatting entire repo	2025-04-16 14:16:00 +02:00
Martin Berg Alstad	8f1782eccd	🐛 [thinkpad] Fix hypr overrides not overriding	2025-04-16 13:50:22 +02:00
Martin Berg Alstad	ed6a435d79	✨ [pi4] Replaced Nvim with Helix editor	2025-04-16 09:26:50 +00:00
Martin Berg Alstad	7ed64943a6	🐛 [shared] Moved nixfmt to formatters.nix	2025-04-16 10:39:49 +02:00
Martin Berg Alstad	3c5484f1a1	✨ [shared] Formatters in their own file	2025-04-16 00:08:42 +02:00
Martin Berg Alstad	e515408ef2	🐛 [pi4] Fix wrong paths, added missing prettier formatter	2025-04-15 22:03:50 +00:00
Martin Berg Alstad	5a23b66666	✨ [pi4] Tailscale, just, nh, experimentals, fish in module	2025-04-15 23:44:15 +02:00
Martin Berg Alstad	22ab5aa5cf	✨ [pi4] Split module config	2025-04-15 23:39:10 +02:00
Martin Berg Alstad	4ed23cdf5f	Pi4 home-manager config	2025-04-15 23:22:49 +02:00
Martin Berg Alstad	a47b9bb118	Moved gpg config, added programs.gpg	2025-04-15 23:15:40 +02:00
Martin Berg Alstad	4df44fa4de	🐛 Fix build errors on pi4, added configs to push	2025-04-15 21:14:17 +00:00
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
Martin Berg Alstad	df5bea9cc0	✨ Added pdf-arranger	2025-04-12 11:19:08 +02:00
Martin Berg Alstad	b5c273e072	✨ Just recipe to update single flake, moved some home configs	2025-04-06 12:55:05 +02:00
Martin Berg Alstad	11e8f2f8c6	✨ Grayjay, Imv, updated dependencies - Added Grayjay flake - Added imv - Set imv as default image viewer - Changed catppuccin homeManagerModules to homeModules - Media dir in home dir for media config - pkg-config for rust development - Removed Loupe image viewer - Moved mpv to media dir	2025-04-02 20:09:55 +02:00
Martin Berg Alstad	542a627e23	♻️ Moved wallpapers, added wallpapers and secrets to theme and common files	2025-03-09 12:29:09 +01:00
Martin Berg Alstad	1ff146e3c0	♻️ Replace imports with function argument, hyprpanel does not follow nixpkgs, git push alias	2025-03-09 11:25:26 +01:00
Martin Berg Alstad	a6cb4a5cf6	🐛 Disable wallpaper by Hyprpanel, comments on justfile	2025-03-02 08:19:45 +01:00
Martin Berg Alstad	909d3b9b21	✨ Use same package of git	2025-03-01 23:00:24 +01:00
Martin Berg Alstad	3552314e69	✨ Store git secrets using libsecret	2025-03-01 22:54:49 +01:00
Martin Berg Alstad	adb963a48d	✨ Added lock and unlock to justfile	2025-03-01 15:11:42 +01:00
Martin Berg Alstad	7ab89cda7c	✨ Wildcard encrypt files in secrets dir, util function to load secrets, use apu-key in weather widget	2025-03-01 15:09:03 +01:00
Martin Berg Alstad	fd03c87c18	🔐 Add weather API key	2025-03-01 14:31:54 +01:00
Martin Berg Alstad	443530b667	✨ Added git-crypt and .gitattributes	2025-03-01 14:27:58 +01:00
Martin Berg Alstad	5a36e23ae7	📦 Updated packages, protonmail and freetube on unstable	2025-02-27 18:44:59 +01:00
Martin Berg Alstad	056012a288	✨ Gaming dir with heroic and wind, moved steam to dir	2025-02-18 21:56:34 +01:00
Martin Berg Alstad	1ed7ce2e89	🪟 Move windows with arrowkeys, moved zen package to /zen dir in home	2025-02-15 12:14:03 +01:00
Martin Berg Alstad	000b5fe81a	Zen theme, Updated dependencies, moved fortune and cowsay pkgs	2025-02-15 12:02:23 +01:00
Martin Berg Alstad	0825b293a1	>_ Replaced shell scripts with justfile, nix shell to download the rest	2025-02-13 21:52:01 +01:00
Martin Berg Alstad	0b0d93cf41	Zed tab icons, hyprsysteminfo, papers pdfReader, update flake.lock	2025-02-09 17:48:45 +01:00
Martin Berg Alstad	b50fce54a7	Git sign by default, hostname from common.nix in flake.nix	2025-02-02 19:05:07 +01:00
Martin Berg Alstad	830b76bcb6	🧹 Refactor, moved monitornames to common.nix, removed waypaper reload	2025-02-02 18:33:09 +01:00
Martin Berg Alstad	76ebdad3ce	🧹 Mpv loop config, moved fish aliases to proper files	2025-02-02 15:06:34 +01:00
Martin Berg Alstad	bd2f725029	🪛 Comments, git safe dir, moved nixvim import - Moved nixvim import to nixvim directory - Added git safe directory to /etc/nixos	2025-02-02 13:16:51 +01:00
Martin Berg Alstad	9da67d058d	📦 Onlyoffice and QT Wayland	2025-01-26 21:36:38 +01:00
Martin Berg Alstad	760cb4d8df	🎵 Cava desktop entry, Replaces node 20 with 22	2025-01-23 19:25:30 +01:00
Martin Berg Alstad	fd8ca5a8c3	🖌️ Styled Fastfetch, more info in README, alias for fastfetch	2025-01-19 19:59:54 +01:00
Martin Berg Alstad	29ac28bd15	👉 Replaced pointer with working Catppuccin pointer, start nix-shells in fish	2025-01-18 13:59:09 +01:00
Martin Berg Alstad	0bfa938db3	📺 Replaced DP-1 montior, uncommented turn off screen code	2025-01-17 22:34:22 +01:00
Martin Berg Alstad	1f06944f93	🌑 Prefer dark theme for GTK apps, removed obsolete hyprpanel setting	2025-01-16 22:29:43 +01:00
Martin Berg Alstad	7374764069	⬆ Updated packages, added update script	2025-01-16 22:11:55 +01:00
Martin Berg Alstad	3005b55e89	🪛 Unstable in home-manager, new wallpapers, .NET - Added unstable overlay in order to fetch pkgs from unstable - Changed Zed-editor to unstable - Commented turn off screen timeout, still buggy - Added new Catppuccin wallpapers - Changed secondary colours on lock screen to fit wallpaper - Removed <i/> on lock screen - Added Rider, .NET 9 adn ASP.NET 9 - Readded EDITOR env to nvim	2025-01-16 20:04:50 +01:00
Martin Berg Alstad	b12c09719a	🖼️ Replaced Swww with Hyprpaper, turned back on screen off after idle, fixed wallpaper on lockscreen, fixed hyprshot dir	2025-01-12 20:32:36 +01:00
Martin Berg Alstad	6fbe3a6da0	🖌️ Goodbye Stylix - Added theming to Btop - Added theming to Nvim and removed bufferline plugin - Added mode to theme.nix to change from light theme to dark theme - Replaced Starship theme with Catppuccin starship theme - Added QT platformtheme ENV - Moved wallpapers into wallpaper dir - Replaced image of desktop1 with more up to date one	2025-01-12 17:38:51 +01:00
Martin Berg Alstad	f7e4fc7638	🖌️ Styling, flatpak == false, clock - Disabled flatpak - Added kitty config and disabled stylix - Styled Mpv - Added gnome-clocks	2025-01-12 16:17:44 +01:00
Martin Berg Alstad	be020ff82c	🎬 Freetube config, added Zen flake and updated default browser	2025-01-12 12:27:00 +01:00
Martin Berg Alstad	759c57dfac	📺 Reorganized, changed hardware acceleration to use Nvidia, added Nvidia powermanagement	2025-01-11 23:50:44 +01:00
Martin Berg Alstad	e67a840d93	🧑‍💻 Use Systemd for Hyprland	2025-01-11 23:24:55 +01:00
Martin Berg Alstad	c75db3b717	🧑‍💻 Zed configs, Nextcloud as service, moved dev stuff	2025-01-11 21:00:27 +01:00
Martin Berg Alstad	99c1d855ab	🖌️ Catppuccin on GTK apps	2025-01-11 12:46:23 +01:00
Martin Berg Alstad	d192efdf0f	🐱 Added Catppuccin flake, Added Cava, removed wlogout and replace bind with Hyprpanel Dash	2025-01-11 12:15:19 +01:00
Martin Berg Alstad	c5b5896aef	📺 Added Mpv and updated flakes	2025-01-11 11:53:20 +01:00
Martin Berg Alstad	1834e6f23e	🧹 Moved git config to git.nix and added aliases	2025-01-11 11:20:09 +01:00
Martin Berg Alstad	e2d16b9aa9	📁 Yazi File Browser	2025-01-11 11:15:48 +01:00
Martin Berg Alstad	92e21a03dc	🪞 Rotate second monitor	2025-01-10 20:01:36 +01:00
Martin Berg Alstad	0df9d996c6	🎵 Spicetify with catppucchin theme	2025-01-09 22:23:28 +01:00
Martin Berg Alstad	e80f492b4e	🖼️ Changed wallpaper, added usericon, readded profile image on lockscreen	2025-01-09 21:49:54 +01:00
Martin Berg Alstad	914c25808f	✨ Replaced waybar and swaync with Hyprpanel and dunst	2025-01-09 19:52:08 +01:00
Martin Berg Alstad	89265aef48	🧹 Run garbage cleaner weekly. Fixed wrong keybind for esc menu	2025-01-08 20:00:37 +01:00
				`@ -0,0 +1 @@`
				`shared/secrets/weather-api-key filter=git-crypt diff=git-crypt`