ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-19 09:29:36 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into redesign/flake

Browse Source
This commit is contained in:
Stefan Ellmauthaler 2022-06-10 17:42:45 +02:00
commit 36c217380e
Signed by: ellmau
GPG Key ID: C804A9C1B7AF8256
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
default.nix
View File

@ -5,7 +5,10 @@ let
name = if builtins.isString args then args else args.name; name = if builtins.isString args then args else args.name;
system = if args ? system then args.system else "x86_64-linux"; system = if args ? system then args.system else "x86_64-linux";
extraModules = if args ? extraModules then args.extraModules else [ ]; extraModules = if args ? extraModules then args.extraModules else [ ];
extraOverlays = if args ? extraOverlays then args.extraOverlays else [ overlay-unstable overlay-comma ]; extraOverlays = if args ? extraOverlays then args.extraOverlays else [
overlay-unstable
# overlay-comma
];
pkgs = flakes.nixpkgs; pkgs = flakes.nixpkgs;
configuration = if args ? configuration then args.configuration else import ./baseconfiguration.nix {inherit extraOverlays system pkgs name flakes flakeOutputs;} ; configuration = if args ? configuration then args.configuration else import ./baseconfiguration.nix {inherit extraOverlays system pkgs name flakes flakeOutputs;} ;
overlay-unstable = final: prev: { overlay-unstable = final: prev: {
@ -15,9 +18,9 @@ let
}; };
}; };
overlay-comma = final: prev: { # overlay-comma = final: prev: {
comma = flakes.comma.packages."${system}"; # comma = flakes.comma.packages."${system}";
}; # };
in in
{ {
inherit name; inherit name;

7
flake.lock generated
View File

@ -84,8 +84,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat": { "flake-utils": {
"flake": false,
"locked": { "locked": {
"lastModified": 1650374568, "lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
@ -95,8 +94,8 @@
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "edolstra", "owner": "numtide",
"repo": "flake-compat", "repo": "flake-utils",
"type": "github" "type": "github"
} }
}, },

2
modules/emacs/default.nix
View File

@ -53,7 +53,7 @@ let
free-keys free-keys
highlight-indentation highlight-indentation
helm helm
helm-bbdb #helm-bbdb
helm-company helm-company
helm-flx helm-flx
helm-descbinds helm-descbinds