chore: switch marr over to hjem

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": 1740423947,
+        "narHash": "sha256-TLUC9rkFZBvKSnNtrdkHY0NsnKmW6XYRIdje6Yt2b3w=",
+        "owner": "nydragon",
+        "repo": "hjem-rum",
+        "rev": "de016de0f8e602529f88c0dbd840e4091b566f3f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nydragon",
+        "repo": "hjem-rum",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -340,11 +383,14 @@
         "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",
         "nur": "nur",
-        "nysh": "nysh"
+        "nysh": "nysh",
+        "wallpapers": "wallpapers"
       }
     },
     "snowfall-lib": {
@@ -400,6 +446,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "wallpapers": {
+      "locked": {
+        "lastModified": 1740422160,
+        "narHash": "sha256-nHQOBJU/ZXnhHeOIv1InIjCKeFjnHZshGj/BcCdRjnQ=",
+        "ref": "refs/heads/main",
+        "rev": "f7857fa316d70847b02dc266099ce2b4eb10f5ea",
+        "revCount": 3,
+        "type": "git",
+        "url": "https://git.ccnlc.eu/nydragon/wallpapers.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.ccnlc.eu/nydragon/wallpapers.git"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -35,6 +35,18 @@
       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";
+    };
+
+    wallpapers.url = "git+https://git.ccnlc.eu/nydragon/wallpapers.git";
   };
 
   outputs =

home/default.nix

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

home/graphical/default.nix

@@ -3,10 +3,8 @@
     ./firefox
     ./thunderbird
     ./vscode
-    ./fuzzel.nix
     ./gammastep.nix # default because I need to protect my peepers
     ./swww.nix
-    ./keepassxc.nix
     ./swayidle.nix
     ./swaylock.nix
   ];

home/graphical/swww.nix

@@ -1,24 +1,20 @@
 {
-  self,
   lib,
   pkgs,
   config,
   ...
 }:
+let
+  inherit (lib.my) getExe';
+in
 {
   systemd.user.services.swww = {
     Install.WantedBy = [ "graphical-session.target" ];
+    Unit.After = [ "graphical-session.target" ];
 
-    Unit = {
-      After = [ "graphical-session.target" ];
-    };
     Service = {
       Type = "simple";
-      ExecStart = "${pkgs.swww}/bin/swww-daemon";
+      ExecStart = getExe' pkgs.swww "swww-daemon";
-      ExecStartPost = "${pkgs.swww}/bin/swww img ${
-        self + "/assets/landscape-pink-pastel.jpg"
-      } -t wipe --transition-fps 144";
-
       Restart = "on-failure";
       BindPaths = "/run/user /home/${config.home.username}/.cache/swww";
       TemporaryFileSystem = "/home /run/user /root";

home/hyprland/default.nix

@@ -7,6 +7,7 @@
 }:
 let
   inherit (lib) mapAttrsToList mkIf hasAttr;
+  inherit (lib.my) getExe;
 in
 mkIf osConfig.programs.hyprland.enable {
   home.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "auto";
@@ -148,13 +149,13 @@ mkIf osConfig.programs.hyprland.enable {
       bindm = [ "$mod,mouse:272,movewindow" ];
 
       bind = [
-        "$mod, D, exec, ${pkgs.fuzzel}/bin/fuzzel"
+        "$mod, D, exec, ${getExe osConfig.modules.system.roles.desktop.runner.package}"
-        "$mod, E, exec, ${lib.my.getExe osConfig.modules.system.roles.desktop.filemanager}"
+        "$mod, E, exec, ${getExe osConfig.modules.system.roles.desktop.filemanager}"
-        "$mod, Return, exec, ${lib.my.getExe osConfig.modules.system.roles.desktop.terminal}"
+        "$mod, Return, exec, ${getExe osConfig.modules.system.roles.desktop.terminal}"
         "$mod SHIFT, Q, killactive,"
         "$mod, V, togglefloating"
         "$mod SHIFT, P, exec, ${config.programs.rofi.package}/bin/rofi -show p -modi p:${pkgs.rofi-power-menu}/bin/rofi-power-menu"
-        "$mod, P, exec, ${pkgs.cliphist}/bin/cliphist wipe & ${pkgs.hyprlock}/bin/hyprlock"
+        "$mod, P, exec, ${getExe pkgs.cliphist} wipe & ${getExe pkgs.hyprlock}"
         "$mod SHIFT, C, exec, hyprctl reload"
         "$mod SHIFT, space, togglefloating"
         "$mod, left, movefocus, l"

home/hyprpaper/default.nix

@@ -1,10 +1,10 @@
-{ self, ... }:
+{ inputs, ... }:
 {
   services.hyprpaper = {
     enable = false;
     settings =
       let
-        wp = "${self}/assets/wallpapers/nix-flake-pastel.jpg";
+        wp = inputs.wallpapers.wallpapers.pastel.nix-flake-pastel.path;
       in
       {
         ipc = "on";

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 = {
@@ -25,6 +26,14 @@ in
     group = "wheel";
   };
 
+  virtualisation.docker = {
+    enable = true;
+    rootless = {
+      enable = true;
+      setSocketVariable = true;
+    };
+  };
+
   services.logind = {
     powerKey = "hibernate";
   };

hosts/default.nix

@@ -18,6 +18,8 @@ in
       extraModules = [
         inputs.disko.nixosModules.disko
         inputs.agenix.nixosModules.default
+        inputs.hjem.nixosModules.default
+        inputs.hjem-rum.nixosModules.default
       ];
     })
 
@@ -25,7 +27,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/marr/default.nix

@@ -9,6 +9,7 @@
     ./hardware-configuration.nix
     ./home.nix
     ./ny.nix
+    ../../users/ny
   ];
 
   time.timeZone = "Europe/Paris";
@@ -87,7 +88,6 @@
     fish.enable = true;
     firefox.enable = true;
     thunderbird.enable = true;
-    sway.enable = true;
     hyprland.enable = true;
     pulseview.enable = true;
     gnupg.agent = {

modules/env.nix

@@ -1,7 +1,8 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
   environment.sessionVariables = {
     MANROFFOPT = "-c";
     MANPAGER = "sh -c 'col -bx | ${pkgs.bat}/bin/bat -l man -p'";
+    WALLPAPERS = "${inputs.wallpapers}";
   };
 }

modules/sddm.nix

@@ -1,8 +1,8 @@
 {
-  self,
   pkgs,
   lib,
   config,
+  inputs,
   ...
 }:
 lib.mkIf config.services.displayManager.sddm.enable {
@@ -18,7 +18,7 @@ lib.mkIf config.services.displayManager.sddm.enable {
       flavor = "mocha";
       font = "Noto Sans";
       fontSize = "9";
-      background = "${self}/assets/wallpapers/nix-flake-pastel.jpg";
+      background = inputs.wallpapers.wallpapers.pastel.nix-flake-pastel.path;
       loginBackground = true;
     })
   ];

modules/system/mime.nix

@@ -3,7 +3,7 @@
     defaultApplications =
       let
         fileManager = "org.gnome.Nautilus.desktop";
-        browser = "firefox-beta.desktop";
+        browser = "firefox-esr.desktop";
       in
       {
         "inode/directory" = fileManager;

options/system/roles/gaming.nix

@@ -30,7 +30,6 @@ in
     programs.gamemode.enable = true;
 
     environment.systemPackages = with pkgs; [
-      lutris
       mangohud
       heroic
     ];

users/default.nix

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

users/ny/default.nix

@@ -0,0 +1,13 @@
+{ lib, ... }:
+{
+  hjem = {
+    users.ny = {
+      enable = true;
+      imports = [ ./programs ];
+    };
+    specialArgs = {
+      libmy = lib.my;
+    };
+    clobberByDefault = true;
+  };
+}

users/ny/programs/default.nix

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

users/ny/programs/foot.nix

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

users/ny/programs/fuzzel.nix

@@ -1,7 +1,10 @@
-{ lib, osConfig, ... }:
+{ libmy, osConfig, ... }:
+let
+  inherit (osConfig.modules.system.roles) desktop;
+in
 {
-  programs.fuzzel = {
+  rum.programs.fuzzel = {
-    enable = true;
+    enable = desktop.enable;
     settings = {
       main = {
         icon-theme = "Papirus-Dark";
@@ -9,7 +12,7 @@
         font = "Hack:weight=bold";
         line-height = 30;
         fields = "name,generic,comment";
-        terminal = lib.my.getExe osConfig.modules.system.roles.desktop.terminal;
+        terminal = libmy.getExe desktop.terminal;
         prompt = ''"❯   "'';
         layer = "overlay";
       };

users/ny/programs/keepassxc.nix

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