mirror of
https://github.com/willemml/dotfiles.nix.git
synced 2025-04-12 19:27:17 +00:00
nixpkgs-fmt everything
This commit is contained in:
parent
be200a87c2
commit
4a2bef980b
10 changed files with 98 additions and 89 deletions
|
@ -1,7 +1,6 @@
|
|||
{ writeShellApplication
|
||||
, home-manager
|
||||
, stdenv
|
||||
,
|
||||
}:
|
||||
writeShellApplication {
|
||||
name = "home-switch";
|
||||
|
|
|
@ -5,19 +5,20 @@
|
|||
|
||||
# https://github.com/terlar/nix-config/blob/00c8a3622e8bc4cb522bbf335e6ede04ca07da40/flake-parts/home-manager/default.nix
|
||||
|
||||
{
|
||||
lib,
|
||||
flake-parts-lib,
|
||||
self,
|
||||
...
|
||||
}: let
|
||||
{ lib
|
||||
, flake-parts-lib
|
||||
, self
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
inherit
|
||||
(lib)
|
||||
mkOption
|
||||
types
|
||||
;
|
||||
inherit (flake-parts-lib) mkSubmoduleOptions;
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = [ ./modules.nix ./users.nix ./configurations.nix ];
|
||||
|
||||
options = {
|
||||
|
|
|
@ -31,13 +31,15 @@ in
|
|||
{
|
||||
accounts.email.accounts = {
|
||||
gmail = (gmailAccount "willemleitso@gmail.com") // { realName = "Willem Leitso"; };
|
||||
icloud = (pkgs.lib.attrsets.recursiveUpdate {
|
||||
icloud = (pkgs.lib.attrsets.recursiveUpdate
|
||||
{
|
||||
flavor = "plain";
|
||||
imap.host = "imap.mail.me.com";
|
||||
imap.port = 993;
|
||||
smtp.host = "smtp.mail.me.com";
|
||||
smtp.port = 587;
|
||||
} (generalAccount "coalminecraft@icloud.com")) // { folders.inbox = "INBOX"; };
|
||||
}
|
||||
(generalAccount "coalminecraft@icloud.com")) // { folders.inbox = "INBOX"; };
|
||||
leitso = (gmailAccount "willem@leit.so") // { primary = true; realName = "Willem Leitso"; };
|
||||
wnuke9 = gmailAccount "wnuke9@gmail.com";
|
||||
};
|
||||
|
|
|
@ -219,7 +219,8 @@ let
|
|||
};
|
||||
|
||||
config = mkIf config.enable {
|
||||
assembly = let
|
||||
assembly =
|
||||
let
|
||||
quoted = v: ''"${escape [ ''"'' ] v}"'';
|
||||
mkBindHelper = cmd: prefix: bs:
|
||||
optionals (bs != { }) ([ ":${cmd} (${prefix}" ]
|
||||
|
@ -244,7 +245,9 @@ let
|
|||
else
|
||||
[ ":defer ${toString v}" ];
|
||||
mkDemand = v: optional v ":demand t";
|
||||
in concatStringsSep "\n " ([ "(use-package ${name}" ]
|
||||
in
|
||||
concatStringsSep "\n "
|
||||
([ "(use-package ${name}" ]
|
||||
++ mkAfter config.after ++ mkBind config.bind
|
||||
++ mkBindKeyMap config.bindKeyMap ++ mkBindLocal config.bindLocal
|
||||
++ mkChords config.chords ++ mkCommand config.command
|
||||
|
@ -390,7 +393,8 @@ let
|
|||
;; hm-init.el ends here
|
||||
'';
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.programs.emacs.init = {
|
||||
enable = mkEnableOption "Emacs configuration";
|
||||
|
||||
|
@ -469,7 +473,8 @@ in {
|
|||
home.packages = concatMap (v: v.extraPackages)
|
||||
(filter (getAttr "enable") (builtins.attrValues cfg.usePackage));
|
||||
|
||||
programs.emacs.init.earlyInit = let
|
||||
programs.emacs.init.earlyInit =
|
||||
let
|
||||
|
||||
standardEarlyInit = mkBefore ''
|
||||
${optionalString cfg.recommendedGcSettings gcSettings}
|
||||
|
@ -489,7 +494,8 @@ in {
|
|||
packageEarlyInits = map (p: p.earlyInit)
|
||||
(filter (p: p.earlyInit != "") (builtins.attrValues cfg.usePackage));
|
||||
|
||||
in mkMerge ([ standardEarlyInit ] ++ packageEarlyInits);
|
||||
in
|
||||
mkMerge ([ standardEarlyInit ] ++ packageEarlyInits);
|
||||
|
||||
programs.emacs.extraPackages = epkgs:
|
||||
let
|
||||
|
@ -501,7 +507,8 @@ in {
|
|||
|
||||
packages = concatMap (v: getPkg (v.package))
|
||||
(filter (getAttr "enable") (builtins.attrValues cfg.usePackage));
|
||||
in [
|
||||
in
|
||||
[
|
||||
(epkgs.trivialBuild {
|
||||
pname = "hm-early-init";
|
||||
src = pkgs.writeText "hm-early-init.el" earlyInitFile;
|
||||
|
|
Loading…
Add table
Reference in a new issue