From dd7433d5b70fb6ef8c2b67eb4476e13ca4ce443b Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Wed, 26 Feb 2025 15:15:39 +0100 Subject: [PATCH 1/2] chore: Move overlay to OS config --- flake.nix | 7 ++++++- home/alex/programs/emacs/default.nix | 10 ++++++---- hosts/dregil/default.nix | 5 ++++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 2c96d27..1aca992 100644 --- a/flake.nix +++ b/flake.nix @@ -86,7 +86,9 @@ { nixpkgs = { config.allowUnfree = true; - overlays = with inputs; [ emacs.overlay ]; + overlays = with inputs; [ + emacs.overlay + ]; }; } ) @@ -95,6 +97,9 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { + inherit inputs; + }; } { home-manager.users.alex = ./hosts/thrall/alex.nix; } ]; diff --git a/home/alex/programs/emacs/default.nix b/home/alex/programs/emacs/default.nix index cb38d8c..1707339 100644 --- a/home/alex/programs/emacs/default.nix +++ b/home/alex/programs/emacs/default.nix @@ -1,11 +1,13 @@ -{ inputs, config, lib, pkgs, ... }: +{ + pkgs, + ... +}: let emacsclient-wrapper = pkgs.writeShellScriptBin "e" '' exec ${pkgs.emacs}/bin/emacsclient --reuse-frame --no-wait "$@" ''; -in { - nixpkgs.overlays = [ inputs.emacs.overlay ]; - +in +{ home = { sessionPath = [ "$HOME/.emacs.d/bin" ]; packages = [ emacsclient-wrapper ]; diff --git a/hosts/dregil/default.nix b/hosts/dregil/default.nix index 40e0959..2880cb7 100644 --- a/hosts/dregil/default.nix +++ b/hosts/dregil/default.nix @@ -9,10 +9,13 @@ { imports = [ ( - { ... }: + { inputs, lib, ... }: { nixpkgs = { config.allowUnfree = true; + overlays = with inputs; [ + emacs.overlay + ]; }; home-manager.extraSpecialArgs = { inherit stable; }; } From fdc39770f8e23adf1a664b593a6917207317d941 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Wed, 26 Feb 2025 15:17:45 +0100 Subject: [PATCH 2/2] chore: Update inputs --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 397499f..56e40fc 100644 --- a/flake.lock +++ b/flake.lock @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1737038063, - "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", + "lastModified": 1739841949, + "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", "owner": "nix-community", "repo": "disko", - "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", + "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1737857281, - "narHash": "sha256-MRexqLLgpAcRkRuBWwrQUZmR4A6CgqDxu86fiwbY0Ls=", + "lastModified": 1740475513, + "narHash": "sha256-3I91L2+qV3DZ0dnCPTdehX82le93OLMYVoZk6KoJHBE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e1a127d279c42a3d935db6ab8771d5967b85c499", + "rev": "1f5b2624c2ee0491b1767be073765d6b9a3c67f4", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1737762889, - "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", + "lastModified": 1740432748, + "narHash": "sha256-BCeFtoJ/+LrZc03viRJWHfzAqqG8gPu/ikZeurv05xs=", "owner": "nix-community", "repo": "home-manager", - "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", + "rev": "c12dcc9b61429b2ad437a7d4974399ad8f910319", "type": "github" }, "original": { @@ -268,11 +268,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737746512, - "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "825479c345a7f806485b7f00dbe3abb50641b083", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1740339700, + "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", + "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "type": "github" }, "original": { @@ -452,11 +452,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1737201600, - "narHash": "sha256-JBh5+g8oQteQdQqbO07dGHBRQo/NGI61JPlTjdfQ1pk=", + "lastModified": 1740409919, + "narHash": "sha256-Y6m+gyRLZjFqoSspLZd3BWUdf9KAIYm/favaiAbmrY0=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "ade37b2765032f83d2d4bd50b6204a40a4c05eb4", + "rev": "f23faf97d6668a4847be5d5c6399493e596b406d", "type": "gitlab" }, "original": { @@ -468,11 +468,11 @@ }, "stable": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1740339700, + "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", + "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "type": "github" }, "original": {