nrabulinski/settei
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

use nh from nixpkgs, move common options from hosts/ to modules/common/

Browse source
This commit is contained in:
Nikodem Rabuliński 2024-01-21 11:50:13 +01:00
parent d46e1d0f32
commit 07c2d7e460
4 changed files with 41 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

49
modules/system/common/default.nix
View file

@ -8,29 +8,48 @@
...
}: let
sharedConfig = {
settei.user.config = {
programs.git = {
settei = {
username = lib.mkDefault "niko";
sane-defaults = {
enable = lib.mkDefault true;
tailnet = "discus-macaroni.ts.net";
};
flake-qol.enable = true;
user = {
enable = true;
difftastic.enable = true;
lfs.enable = true;
userName = "Nikodem Rabuliński";
userEmail = lib.mkDefault "nikodem@rabulinski.com";
signing = {
key = config.settei.sane-defaults.allSshKeys.${configurationName};
signByDefault = true;
};
extraConfig = {
gpg.format = "ssh";
push.followTags = true;
config = {
home.packages = let
extraPkgs = [pkgs.nh];
in
[inputs'.settei.packages.base-packages] ++ extraPkgs;
home.sessionVariables.EDITOR = "hx";
programs.git = {
enable = true;
difftastic.enable = true;
lfs.enable = true;
userName = "Nikodem Rabuliński";
userEmail = lib.mkDefault "nikodem@rabulinski.com";
signing = {
key = config.settei.sane-defaults.allSshKeys.${configurationName};
signByDefault = true;
};
extraConfig = {
gpg.format = "ssh";
push.followTags = true;
};
};
programs.fish.enable = true;
};
};
programs.fish.enable = true;
};
programs.fish.enable = true;
users.users.${username}.shell = pkgs.fish;
time.timeZone = lib.mkDefault "Europe/Warsaw";
# NixOS' fish module doesn't allow setting what package to use for fish,
# so I need to override the fish package.
nixpkgs.overlays = [(_: _: {inherit (inputs'.settei.packages) fish;})];