Compare commits
2 commits
8dab093deb
...
ad8ff7d016
Author | SHA1 | Date | |
---|---|---|---|
ad8ff7d016 | |||
e07c55d902 |
2 changed files with 20 additions and 6 deletions
|
@ -90,6 +90,19 @@ in
|
||||||
stable.texlive.combined.scheme-full # NOTE breaks often
|
stable.texlive.combined.scheme-full # NOTE breaks often
|
||||||
thunderbird
|
thunderbird
|
||||||
vlc
|
vlc
|
||||||
|
(symlinkJoin {
|
||||||
|
name = "obsidian-wayland";
|
||||||
|
paths = [ obsidian ];
|
||||||
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
postBuild = ''
|
||||||
|
wrapProgram $out/bin/obsidian \
|
||||||
|
--add-flags "--socket=wayland --enable-features=UseOzonePlatform --ozone-platform=wayland"
|
||||||
|
'';
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
nixpkgs.config.permittedInsecurePackages = [
|
||||||
|
"electron-25.9.0" # obsidian
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.nix-ld.enable = true;
|
programs.nix-ld.enable = true;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{ config
|
{ config
|
||||||
, lib
|
, lib
|
||||||
, pkgs
|
|
||||||
, ...
|
, ...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -50,21 +49,23 @@ in
|
||||||
userName = cfg.identity.name;
|
userName = cfg.identity.name;
|
||||||
userEmail = cfg.identity.email;
|
userEmail = cfg.identity.email;
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
|
commit.verbose = true;
|
||||||
|
diff.algorithm = "histogram";
|
||||||
|
fetch.fsckobjects = true;
|
||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
merge.conflictstyle = "zdiff3";
|
merge.conflictstyle = "zdiff3";
|
||||||
diff.external = getExe pkgs.difftastic;
|
|
||||||
push.autoSetupRemote = true;
|
push.autoSetupRemote = true;
|
||||||
|
receive.fsckObjects = true;
|
||||||
|
transfer.fsckobjects = true;
|
||||||
};
|
};
|
||||||
signing = mkIf cfg.signing {
|
signing = mkIf cfg.signing {
|
||||||
key = "0x970C6E89EB0547A9";
|
key = "0x970C6E89EB0547A9";
|
||||||
signByDefault = true;
|
signByDefault = true;
|
||||||
};
|
};
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
|
delta.enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
programs.git = {
|
programs.git.enable = true;
|
||||||
enable = true;
|
|
||||||
config.safe.directory = "/home/moritz/.dotfiles";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue