Compare commits

..

No commits in common. "fdc39770f8e23adf1a664b593a6917207317d941" and "0d0ea496f10a2eacb6a0a8f069f9010f7488f461" have entirely different histories.

4 changed files with 27 additions and 37 deletions

42
flake.lock generated
View file

@ -68,11 +68,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739841949, "lastModified": 1737038063,
"narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,11 +89,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1740475513, "lastModified": 1737857281,
"narHash": "sha256-3I91L2+qV3DZ0dnCPTdehX82le93OLMYVoZk6KoJHBE=", "narHash": "sha256-MRexqLLgpAcRkRuBWwrQUZmR4A6CgqDxu86fiwbY0Ls=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "1f5b2624c2ee0491b1767be073765d6b9a3c67f4", "rev": "e1a127d279c42a3d935db6ab8771d5967b85c499",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -183,11 +183,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740432748, "lastModified": 1737762889,
"narHash": "sha256-BCeFtoJ/+LrZc03viRJWHfzAqqG8gPu/ikZeurv05xs=", "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c12dcc9b61429b2ad437a7d4974399ad8f910319", "rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -268,11 +268,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1740367490, "lastModified": 1737746512,
"narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "rev": "825479c345a7f806485b7f00dbe3abb50641b083",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -331,11 +331,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1740339700, "lastModified": 1737672001,
"narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -452,11 +452,11 @@
"nixpkgs-24_11": "nixpkgs-24_11" "nixpkgs-24_11": "nixpkgs-24_11"
}, },
"locked": { "locked": {
"lastModified": 1740409919, "lastModified": 1737201600,
"narHash": "sha256-Y6m+gyRLZjFqoSspLZd3BWUdf9KAIYm/favaiAbmrY0=", "narHash": "sha256-JBh5+g8oQteQdQqbO07dGHBRQo/NGI61JPlTjdfQ1pk=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "f23faf97d6668a4847be5d5c6399493e596b406d", "rev": "ade37b2765032f83d2d4bd50b6204a40a4c05eb4",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -468,11 +468,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1740339700, "lastModified": 1737672001,
"narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -86,9 +86,7 @@
{ {
nixpkgs = { nixpkgs = {
config.allowUnfree = true; config.allowUnfree = true;
overlays = with inputs; [ overlays = with inputs; [ emacs.overlay ];
emacs.overlay
];
}; };
} }
) )
@ -97,9 +95,6 @@
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {
inherit inputs;
};
} }
{ home-manager.users.alex = ./hosts/thrall/alex.nix; } { home-manager.users.alex = ./hosts/thrall/alex.nix; }
]; ];

View file

@ -1,13 +1,11 @@
{ { inputs, config, lib, pkgs, ... }:
pkgs,
...
}:
let let
emacsclient-wrapper = pkgs.writeShellScriptBin "e" '' emacsclient-wrapper = pkgs.writeShellScriptBin "e" ''
exec ${pkgs.emacs}/bin/emacsclient --reuse-frame --no-wait "$@" exec ${pkgs.emacs}/bin/emacsclient --reuse-frame --no-wait "$@"
''; '';
in in {
{ nixpkgs.overlays = [ inputs.emacs.overlay ];
home = { home = {
sessionPath = [ "$HOME/.emacs.d/bin" ]; sessionPath = [ "$HOME/.emacs.d/bin" ];
packages = [ emacsclient-wrapper ]; packages = [ emacsclient-wrapper ];

View file

@ -9,13 +9,10 @@
{ {
imports = [ imports = [
( (
{ inputs, lib, ... }: { ... }:
{ {
nixpkgs = { nixpkgs = {
config.allowUnfree = true; config.allowUnfree = true;
overlays = with inputs; [
emacs.overlay
];
}; };
home-manager.extraSpecialArgs = { inherit stable; }; home-manager.extraSpecialArgs = { inherit stable; };
} }