From 3fb55bb0910f07dd94114f2ebba7fc7d4f411f1b Mon Sep 17 00:00:00 2001 From: Prouk Date: Sat, 3 Oct 2026 01:01:33 +0200 Subject: [PATCH] refactor with better structure --- flake.lock | 6 +++--- home/packages/web.nix | 28 +++++++++++++++------------- nixos/desktop/sddm.nix | 7 ++++++- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 3112750..dedd798 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1790928438, - "narHash": "sha256-ZuJbu8VQe/Qzy7GJdZ3Xv7adRllH1o4O7nqONtkhFbA=", + "lastModified": 1790955005, + "narHash": "sha256-EEQKUylD8zuRTmDFX4rbwsHQ+iZhqqOldYcFN8SLcE0=", "owner": "nix-community", "repo": "home-manager", - "rev": "833540099ef43cbeb28b1e3f3c21901961edb48e", + "rev": "0560d64401a6d5370732a69d08bc4a6b135962d9", "type": "github" }, "original": { diff --git a/home/packages/web.nix b/home/packages/web.nix index 33741c2..db40954 100644 --- a/home/packages/web.nix +++ b/home/packages/web.nix @@ -1,19 +1,21 @@ { pkgs, inputs, ... }: let # Track latest upstream Equicord release (nixpkgs lags behind). - equicord = pkgs.equicord.overrideAttrs (finalAttrs: prev: { - version = "2026-10-01"; - src = pkgs.fetchFromGitHub { - owner = "Equicord"; - repo = "Equicord"; - tag = finalAttrs.version; - hash = "sha256-hk2/djNmbwIBwVAJ1bj3ayurj85EPfMUgmAr1SpYlvw="; - }; - pnpmDeps = prev.pnpmDeps.overrideAttrs { - inherit (finalAttrs) src; - outputHash = "sha256-rx8z6PAlAPaZbkmg+3Vvq8OXR/yy5ZP0PmAk97ZDOSQ="; - }; - }); + equicord = pkgs.equicord.overrideAttrs ( + finalAttrs: prev: { + version = "2026-10-01"; + src = pkgs.fetchFromGitHub { + owner = "Equicord"; + repo = "Equicord"; + tag = finalAttrs.version; + hash = "sha256-hk2/djNmbwIBwVAJ1bj3ayurj85EPfMUgmAr1SpYlvw="; + }; + pnpmDeps = prev.pnpmDeps.overrideAttrs { + inherit (finalAttrs) src; + outputHash = "sha256-rx8z6PAlAPaZbkmg+3Vvq8OXR/yy5ZP0PmAk97ZDOSQ="; + }; + } + ); in { imports = [ diff --git a/nixos/desktop/sddm.nix b/nixos/desktop/sddm.nix index dd7e7f4..a0479f8 100644 --- a/nixos/desktop/sddm.nix +++ b/nixos/desktop/sddm.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: let # Same wallpaper niri displays (see home/dotfiles.nix). wallpaper = ../../assets/wallpaper.png;