nix flake update plus some tidying

Ryan Gibb 8081571a edf57a74

Changed files
+47 -106
home
emacs
+18 -56
flake.lock
···
"systems": "systems"
},
"locked": {
-
"lastModified": 1723293904,
-
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
+
"lastModified": 1736955230,
+
"narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
"owner": "ryantm",
"repo": "agenix",
-
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
+
"rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
"type": "github"
},
"original": {
···
"type": "github"
}
},
-
"emacs-overlay": {
-
"inputs": {
-
"nixpkgs": [
-
"nixpkgs"
-
],
-
"nixpkgs-stable": "nixpkgs-stable"
-
},
-
"locked": {
-
"lastModified": 1734599675,
-
"narHash": "sha256-jTfIoLxbVK3r6rFHKs0JS8WEYrmp0AGomzGaPTDZvrE=",
-
"owner": "nix-community",
-
"repo": "emacs-overlay",
-
"rev": "df40078d8d4f3f0439e52a3f3e44af0005e6072e",
-
"type": "github"
-
},
-
"original": {
-
"owner": "nix-community",
-
"repo": "emacs-overlay",
-
"type": "github"
-
}
-
},
"eon": {
"inputs": {
"flake-utils": "flake-utils_3",
···
]
},
"locked": {
-
"lastModified": 1733951536,
-
"narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=",
+
"lastModified": 1736373539,
+
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
"owner": "nix-community",
"repo": "home-manager",
-
"rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f",
+
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
"type": "github"
},
"original": {
···
},
"nixos-hardware": {
"locked": {
-
"lastModified": 1733861262,
-
"narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=",
+
"lastModified": 1736978406,
+
"narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=",
"owner": "nixos",
"repo": "nixos-hardware",
-
"rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5",
+
"rev": "b678606690027913f3434dea3864e712b862dde5",
"type": "github"
},
"original": {
···
},
"nixpkgs-compat": {
"locked": {
-
"lastModified": 1733730953,
-
"narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=",
+
"lastModified": 1735563628,
+
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
"owner": "nixos",
"repo": "nixpkgs",
-
"rev": "7109b680d161993918b0a126f38bc39763e5a709",
+
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
"type": "github"
},
"original": {
···
"type": "github"
}
},
-
"nixpkgs-stable": {
-
"locked": {
-
"lastModified": 1734323986,
-
"narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
-
"owner": "NixOS",
-
"repo": "nixpkgs",
-
"rev": "394571358ce82dff7411395829aa6a3aad45b907",
-
"type": "github"
-
},
-
"original": {
-
"owner": "NixOS",
-
"ref": "nixos-24.11",
-
"repo": "nixpkgs",
-
"type": "github"
-
}
-
},
"nixpkgs-unstable": {
"locked": {
-
"lastModified": 1733940404,
-
"narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=",
+
"lastModified": 1736883708,
+
"narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
"owner": "nixos",
"repo": "nixpkgs",
-
"rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713",
+
"rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
"type": "github"
},
"original": {
···
},
"nixpkgs_2": {
"locked": {
-
"lastModified": 1734083684,
-
"narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
+
"lastModified": 1736867362,
+
"narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=",
"owner": "nixos",
"repo": "nixpkgs",
-
"rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
+
"rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc",
"type": "github"
},
"original": {
···
"colour-guesser": "colour-guesser",
"deploy-rs": "deploy-rs",
"eilean": "eilean",
-
"emacs-overlay": "emacs-overlay",
"eon": "eon",
"fn06-website": "fn06-website",
"home-manager": "home-manager_2",
+28 -45
flake.nix
···
hyperbib-eeg.url = "github:RyanGibb/hyperbib?ref=nixify";
nix-rpi5.url = "gitlab:vriska/nix-rpi5?ref=main";
nur.url = "github:nix-community/NUR/e9e77b7985ef9bdeca12a38523c63d47555cc89b";
-
emacs-overlay.url = "github:nix-community/emacs-overlay";
# deduplicate flake inputs
eilean.inputs.nixpkgs.follows = "nixpkgs";
···
hyperbib-eeg.inputs.nixpkgs.follows = "nixpkgs";
nix-rpi5.inputs.nixpkgs.follows = "nixpkgs";
nur.inputs.nixpkgs.follows = "nixpkgs";
-
emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
};
outputs =
-
{
-
self,
-
nixpkgs-compat,
-
nixpkgs,
-
nixpkgs-unstable,
-
nixpkgs-element,
-
home-manager,
-
agenix,
-
deploy-rs,
-
nix-on-droid,
-
eilean,
-
nur,
-
nixpkgs-flaresolverr,
-
nixpkgs-sonarr,
-
...
-
}@inputs:
+
inputs:
let
getSystemOverlays = system: nixpkgsConfig: [
(final: prev: {
# https://github.com/mautrix/whatsapp/issues/749
-
overlay-compat = import nixpkgs-compat {
+
overlay-compat = import inputs.nixpkgs-compat {
inherit system;
# follow stable nixpkgs config
config = nixpkgsConfig;
};
-
overlay-unstable = import nixpkgs-unstable {
+
overlay-unstable = import inputs.nixpkgs-unstable {
inherit system;
# follow stable nixpkgs config
config = nixpkgsConfig;
···
immich = final.overlay-unstable.immich;
mautrix-whatsapp = final.overlay-compat.mautrix-whatsapp;
element-desktop =
-
(import nixpkgs-element {
+
(import inputs.nixpkgs-element {
inherit system;
config = nixpkgsConfig;
}).element-desktop;
# https://github.com/NixOS/nixpkgs/issues/332776
flaresolverr =
-
(import nixpkgs-flaresolverr {
+
(import inputs.nixpkgs-flaresolverr {
inherit system;
config = nixpkgsConfig;
}).flaresolverr;
sonarr =
-
(import nixpkgs-sonarr {
+
(import inputs.nixpkgs-sonarr {
inherit system;
config = nixpkgsConfig;
}).sonarr;
})
-
nur.overlays.default
+
inputs.nur.overlays.default
];
in
{
···
mkMode =
mode: host:
let
-
host-nixpkgs = nixpkgs;
-
host-home-manager = home-manager;
+
host-nixpkgs = inputs.nixpkgs;
+
host-home-manager = inputs.home-manager;
in
host-nixpkgs.lib.nixosSystem {
# use system from config.localSystem
···
nix.registry.nixpkgs.flake = host-nixpkgs;
system.stateVersion = "24.05";
# record git revision (can be queried with `nixos-version --json)
-
system.configurationRevision = host-nixpkgs.lib.mkIf (self ? rev) self.rev;
+
system.configurationRevision = host-nixpkgs.lib.mkIf (inputs.self ? rev) inputs.self.rev;
nixpkgs = {
config.allowUnfree = true;
config.permittedInsecurePackages = [
···
}
)
host-home-manager.nixosModule
-
eilean.nixosModules.default
-
agenix.nixosModules.default
+
inputs.eilean.nixosModules.default
+
inputs.agenix.nixosModules.default
];
};
readModes =
···
files = builtins.readDir dir;
in
let
-
filtered = nixpkgs.lib.attrsets.filterAttrs (
+
filtered = inputs.nixpkgs.lib.attrsets.filterAttrs (
n: v: v == "regular" && (n == "default.nix" || n == "minimal.nix")
) files;
in
let
-
names = nixpkgs.lib.attrNames filtered;
+
names = inputs.nixpkgs.lib.attrNames filtered;
in
-
builtins.map (f: nixpkgs.lib.strings.removeSuffix ".nix" f) names;
+
builtins.map (f: inputs.nixpkgs.lib.strings.removeSuffix ".nix" f) names;
mkModes =
host: modes:
builtins.map (mode: {
···
nestedList = builtins.map (host: mkModes host (readModes ./hosts/${host})) hosts;
in
let
-
list = nixpkgs.lib.lists.flatten nestedList;
+
list = inputs.nixpkgs.lib.lists.flatten nestedList;
in
builtins.listToAttrs list;
hosts = builtins.attrNames (builtins.readDir ./hosts);
···
(
name:
let
-
machine = self.nixosConfigurations.${name};
+
machine = inputs.self.nixosConfigurations.${name};
system = machine.pkgs.system;
-
pkgs = import nixpkgs { inherit system; };
+
pkgs = import inputs.nixpkgs { inherit system; };
# nixpkgs with deploy-rs overlay but force the nixpkgs package
-
deployPkgs = import nixpkgs {
+
deployPkgs = import inputs.nixpkgs {
inherit system;
overlays = [
-
deploy-rs.overlay
+
inputs.deploy-rs.overlay
(self: super: {
deploy-rs = {
inherit (pkgs) deploy-rs;
···
);
};
-
nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {
+
nixOnDroidConfigurations.default = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
modules = [ ./nix-on-droid/default.nix ];
-
pkgs = import nixpkgs {
+
pkgs = import inputs.nixpkgs {
overlays = getSystemOverlays "aarch64-linux" { };
config.permittedInsecurePackages = [
# https://github.com/nix-community/nixd/issues/357
···
rtg24 =
let
system = "x86_64-linux";
-
pkgs = nixpkgs.legacyPackages.${system};
+
pkgs = inputs.nixpkgs.legacyPackages.${system};
in
-
home-manager.lib.homeManagerConfiguration {
+
inputs.home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
./home/default.nix
···
};
};
-
legacyPackages = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system: {
-
nixpkgs = import nixpkgs {
+
legacyPackages = inputs.nixpkgs.lib.genAttrs inputs.nixpkgs.lib.systems.flakeExposed (system: {
+
nixpkgs = import inputs.nixpkgs {
inherit system;
overlays = getSystemOverlays system { };
};
});
-
formatter = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (
-
system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style
+
formatter = inputs.nixpkgs.lib.genAttrs inputs.nixpkgs.lib.systems.flakeExposed (
+
system: inputs.nixpkgs.legacyPackages.${system}.nixfmt-rfc-style
);
templates.host.path = ./templates/host;
+1 -5
home/emacs/default.nix
···
lib,
config,
...
-
}@inputs:
+
}:
let
cfg = config.custom.emacs;
···
options.custom.emacs.enable = lib.mkEnableOption "emacs";
config = lib.mkIf cfg.enable {
-
nixpkgs.overlays = [
-
inputs.emacs-overlay.overlays.default
-
];
-
home.packages = with pkgs; [
binutils
emacs