refactor: hjemify foot & keepassxc

flake.lock

@@ -156,6 +156,49 @@
         "type": "github"
       }
     },
+    "hjem": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737619027,
+        "narHash": "sha256-jEzZs9dHdmVP5X9HCC/7jrv08aWFfqZV5cZ+cZWYGA4=",
+        "owner": "feel-co",
+        "repo": "hjem",
+        "rev": "48cfa21987672a31a358b7e4d582fc174556e633",
+        "type": "github"
+      },
+      "original": {
+        "owner": "feel-co",
+        "repo": "hjem",
+        "type": "github"
+      }
+    },
+    "hjem-rum": {
+      "inputs": {
+        "hjem": [
+          "hjem"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738790283,
+        "narHash": "sha256-SKz3KfmK7iupR+Ef022pQQZccxXlm/2w5HxpSv+PAGE=",
+        "owner": "nydragon",
+        "repo": "hjem-rum",
+        "rev": "ac4bf585731b813ad37cb3822ad44b1e3bb16a7e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nydragon",
+        "repo": "hjem-rum",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -282,11 +325,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1738528812,
-        "narHash": "sha256-NgGylCEFg500fF8bDZfKhS+wSGT4wkHIg567XAwrFZ0=",
+        "lastModified": 1739197721,
+        "narHash": "sha256-+EYoZfeHycIH52SJMEkGtmsTddXa8dW06aDJCVg+lcI=",
         "ref": "refs/heads/main",
-        "rev": "f269a01ec07c12a19482caacbf67223a4eab22d3",
-        "revCount": 104,
+        "rev": "603e1c09b39ee57f6ea94f45b117360736816358",
+        "revCount": 106,
         "type": "git",
         "url": "https://git.ccnlc.eu/nydragon/nysh.git"
       },
@@ -340,6 +383,8 @@
         "agenix": "agenix",
         "disko": "disko",
         "flake-parts": "flake-parts",
+        "hjem": "hjem",
+        "hjem-rum": "hjem-rum",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",

flake.nix

@@ -35,6 +35,16 @@
       url = "git+https://git.ccnlc.eu/nydragon/nur.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    hjem = {
+      url = "github:feel-co/hjem";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    hjem-rum = {
+      url = "github:nydragon/hjem-rum";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.hjem.follows = "hjem";
+    };
   };
 
   outputs =

home/default.nix

@@ -7,7 +7,6 @@
     ./hyprland
     ./hyprlock
     ./services
-    ./foot.nix
     ./rofi
     ./sway
     ./waybar

home/graphical/default.nix

@@ -6,7 +6,6 @@
     ./fuzzel.nix
     ./gammastep.nix # default because I need to protect my peepers
     ./swww.nix
-    ./keepassxc.nix
     ./swayidle.nix
     ./swaylock.nix
   ];

home/terminal/default.nix

@@ -5,7 +5,6 @@
     ./git
     ./fish
     ./btop.nix
-    ./hyfetch.nix
     ./beets.nix
   ];
 }

home/terminal/hyfetch.nix

@@ -1,15 +0,0 @@
-{
-  programs.fastfetch.enable = true;
-  programs.hyfetch = {
-    enable = true;
-    settings = {
-      mode = "rgb"; # dunno the other value :sob:
-      lightness = 0.7; # u may change this
-      distro = "nixos";
-      preset = "pansexual"; # sexuality
-      light_dark = "dark"; # u not crazy are u
-      backend = "fastfetch";
-      color_align.mode = "horizontal"; # looks better
-    };
-  };
-}

hosts/brontes/default.nix

@@ -12,6 +12,7 @@ in
   imports = [
     ./hardware-configuration.nix
     ./home.nix
+    ../../users/ny
   ];
 
   boot.loader = {
@@ -37,6 +38,7 @@ in
   modules = {
     system = {
       roles.desktop.enable = true;
+      roles.gaming.enable = true;
 
       outputs = {
         "DP-2" = {

hosts/default.nix

@@ -25,7 +25,11 @@ in
       inherit username;
       hostname = "brontes";
       system = "x86_64-linux";
-      extraModules = [ inputs.agenix.nixosModules.default ];
+      extraModules = [
+        inputs.agenix.nixosModules.default
+        inputs.hjem.nixosModules.default
+        inputs.hjem-rum.nixosModules.default
+      ];
     })
 
     (mkSystem' {

hosts/raptus/default.nix

@@ -13,8 +13,7 @@ in
   imports = [
     (modulesPath + "/profiles/qemu-guest.nix")
     ./disk-config.nix
-    ./forgejo.nix
-    ./forgejo-runner.nix
+    ./forgejo
     ./headscale
     ./fail2ban.nix
   ];

hosts/raptus/forgejo/default.nix

@@ -4,6 +4,10 @@ let
   sshPort = 2222;
 in
 {
+  imports = [
+    ./runner.nix
+  ];
+
   systemd.tmpfiles.rules =
     let
       # Disallow crawlers from indexing this site.

hosts/raptus/headscale/acls.nix

@@ -2,6 +2,7 @@
   pkgs,
   options,
   lib,
+  self,
   ...
 }:
 let
@@ -13,6 +14,9 @@ let
     action = "accept";
     inherit src dst users;
   };
+
+  shanMeta = self.nixosConfigurations.shan.config.modules.meta;
+  homeAIp = "100.64.0.9";
 in
 {
   services.headscale.settings.policy.path = pkgs.writeTextFile {
@@ -39,7 +43,7 @@ in
           [
             "tag:guest"
           ]
-          [ "100.64.0.4:443" ]
+          [ "${shanMeta.tailscale.ip}:443" "${homeAIp}:80" ]
         )
       ];
 

hosts/shan/default.nix

@@ -28,6 +28,9 @@
   };
 
   modules = {
+    meta = {
+      tailscale.ip = "100.64.0.4";
+    };
     system.networking.bluetooth.enable = true;
     container = {
       kitchenowl = {

options/meta.nix

@@ -1,7 +1,7 @@
 { lib, ... }:
 let
   inherit (lib) mkOption stringLength;
-  inherit (lib.types) str strMatching;
+  inherit (lib.types) str strMatching nullOr;
 
   validateUserName =
     x:
@@ -24,5 +24,11 @@ in
       # Should handle multiple users one day? maybe...
       description = "This system's primary user.";
     };
+    tailscale = {
+      ip = mkOption {
+        default = null;
+        type = nullOr str;
+      };
+    };
   };
 }

users/default.nix

@@ -0,0 +1 @@
+{ imports = [ ./ny ]; }

users/ny/default.nix

@@ -0,0 +1,9 @@
+{
+  hjem = {
+    users.ny = {
+      enable = true;
+      imports = [ ./programs ];
+    };
+    clobberByDefault = true;
+  };
+}

users/ny/programs/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./foot.nix
+    ./keepassxc.nix
+  ];
+}

users/ny/programs/foot.nix

@@ -1,5 +1,5 @@
 {
-  programs.foot = {
+  rum.programs.foot = {
     enable = true;
     settings = {
       main = {

users/ny/programs/keepassxc.nix

@@ -1,12 +1,7 @@
-{ pkgs, ... }:
-let
-  ini = pkgs.formats.ini { };
-in
 {
-  home.file."keepassxc" = {
+  rum.programs.keepassxc = {
     enable = true;
-
-    source = ini.generate "keepassxc.ini" {
+    settings = {
       General = {
         BackupBeforeSave = true;
         ConfigVersion = 2;
@@ -24,7 +19,5 @@ in
         TrayIconAppearance = "colorful";
       };
     };
-
-    target = ".config/keepassxc/keepassxc.ini";
   };
 }