format
This commit is contained in:
@@ -9,10 +9,14 @@
|
||||
};
|
||||
|
||||
overlays =
|
||||
let path = ../../overlays; in with builtins;
|
||||
map (n: import (path + ("/" + n)))
|
||||
(filter (n: match ".*\\.nix" n != null ||
|
||||
pathExists (path + ("/" + n + "/default.nix")))
|
||||
(attrNames (readDir path)));
|
||||
let
|
||||
path = ../../overlays;
|
||||
in
|
||||
with builtins;
|
||||
map (n: import (path + ("/" + n))) (
|
||||
filter (n: match ".*\\.nix" n != null || pathExists (path + ("/" + n + "/default.nix"))) (
|
||||
attrNames (readDir path)
|
||||
)
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
{ pkgs, config, ... }:
|
||||
{}
|
||||
{ pkgs, config, ... }: { }
|
||||
|
||||
@@ -1,8 +1,15 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
let name = "Christoph Schmatzler";
|
||||
user = "cschmatzler";
|
||||
email = "christoph@schmatzler.com"; in
|
||||
let
|
||||
name = "Christoph Schmatzler";
|
||||
user = "cschmatzler";
|
||||
email = "christoph@schmatzler.com";
|
||||
in
|
||||
{
|
||||
zsh = {
|
||||
enable = true;
|
||||
@@ -10,14 +17,14 @@ let name = "Christoph Schmatzler";
|
||||
cdpath = [ "~/Projects" ];
|
||||
plugins = [
|
||||
{
|
||||
name = "powerlevel10k";
|
||||
src = pkgs.zsh-powerlevel10k;
|
||||
file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
|
||||
name = "powerlevel10k";
|
||||
src = pkgs.zsh-powerlevel10k;
|
||||
file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
|
||||
}
|
||||
{
|
||||
name = "powerlevel10k-config";
|
||||
src = lib.cleanSource ./config;
|
||||
file = "p10k.zsh";
|
||||
name = "powerlevel10k-config";
|
||||
src = lib.cleanSource ./config;
|
||||
file = "p10k.zsh";
|
||||
}
|
||||
];
|
||||
initContent = lib.mkBefore ''
|
||||
@@ -74,7 +81,7 @@ let name = "Christoph Schmatzler";
|
||||
extraConfig = {
|
||||
init.defaultBranch = "main";
|
||||
core = {
|
||||
editor = "vim";
|
||||
editor = "vim";
|
||||
autocrlf = "input";
|
||||
};
|
||||
commit.gpgsign = true;
|
||||
@@ -86,23 +93,15 @@ let name = "Christoph Schmatzler";
|
||||
ssh = {
|
||||
enable = true;
|
||||
includes = [
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux
|
||||
"/home/${user}/.ssh/config_external"
|
||||
)
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isDarwin
|
||||
"/Users/${user}/.ssh/config_external"
|
||||
)
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${user}/.ssh/config_external")
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "/Users/${user}/.ssh/config_external")
|
||||
];
|
||||
matchBlocks = {
|
||||
"github.com" = {
|
||||
identitiesOnly = true;
|
||||
identityFile = [
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux
|
||||
"/home/${user}/.ssh/id_github"
|
||||
)
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isDarwin
|
||||
"/Users/${user}/.ssh/id_github"
|
||||
)
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${user}/.ssh/id_github")
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "/Users/${user}/.ssh/id_github")
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ pkgs }:
|
||||
|
||||
with pkgs; [
|
||||
with pkgs;
|
||||
[
|
||||
age
|
||||
age-plugin-yubikey
|
||||
bat
|
||||
|
||||
Reference in New Issue
Block a user