moved git to its own module
This commit is contained in:
parent
b40c908ffe
commit
38d653d2ff
4 changed files with 91 additions and 77 deletions
|
|
@ -91,6 +91,7 @@
|
||||||
./modules/home-manager/alacritty.nix
|
./modules/home-manager/alacritty.nix
|
||||||
./modules/home-manager/vscode.nix
|
./modules/home-manager/vscode.nix
|
||||||
./modules/home-manager/zsh.nix
|
./modules/home-manager/zsh.nix
|
||||||
|
./modules/home-manager/git.nix
|
||||||
]; #extra modules to be loaded by home-manager
|
]; #extra modules to be loaded by home-manager
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
13
modules/home-manager/git.nix
Normal file
13
modules/home-manager/git.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
{ pkgs, config, lib, ...}:
|
||||||
|
{
|
||||||
|
programs.git = {
|
||||||
|
enable = true;
|
||||||
|
userName = "specCon18";
|
||||||
|
userEmail = "steven.carpenter@skdevstudios.com";
|
||||||
|
extraConfig = {
|
||||||
|
init = {
|
||||||
|
defaultBranch = "main";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -1,81 +1,81 @@
|
||||||
{ pkgs, config, lib, ...}:
|
{ pkgs, config, lib, ...}:
|
||||||
{
|
{
|
||||||
programs.helix = {
|
programs.helix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
theme = "monokai_pro_octagon";
|
theme = "monokai_pro_octagon";
|
||||||
editor.line-number = "relative";
|
editor.line-number = "relative";
|
||||||
editor.shell = ["zsh" "-c"];
|
editor.shell = ["zsh" "-c"];
|
||||||
};
|
};
|
||||||
themes = {
|
themes = {
|
||||||
monokai_pro_octagon = let
|
monokai_pro_octagon = let
|
||||||
red = "#ff657a";
|
red = "#ff657a";
|
||||||
orange = "#ff9b5e";
|
orange = "#ff9b5e";
|
||||||
yellow = "#ffd76d";
|
yellow = "#ffd76d";
|
||||||
green = "#bad761";
|
green = "#bad761";
|
||||||
blue = "#9cd1bb";
|
blue = "#9cd1bb";
|
||||||
purple = "#c39ac9";
|
purple = "#c39ac9";
|
||||||
base0 = "#161821";
|
base0 = "#161821";
|
||||||
base1 = "#1e1f2b";
|
base1 = "#1e1f2b";
|
||||||
base2 = "#282a3a";
|
base2 = "#282a3a";
|
||||||
base3 = "#3a3d4b";
|
base3 = "#3a3d4b";
|
||||||
base4 = "#535763";
|
base4 = "#535763";
|
||||||
base5 = "#696d77";
|
base5 = "#696d77";
|
||||||
base6 = "#767b81";
|
base6 = "#767b81";
|
||||||
base7 = "#b2b9bd";
|
base7 = "#b2b9bd";
|
||||||
base8 = "#eaf2f1";
|
base8 = "#eaf2f1";
|
||||||
base8x0c = "#303342";
|
base8x0c = "#303342";
|
||||||
in {
|
in {
|
||||||
"ui.linenr.selected" = { bg = base3; }; "ui.text.focus" = { fg = yellow; modifiers = ["bold"]; }; "ui.menu" = { fg = base8; bg = base3; }; "ui.menu.selected" = { fg = base2; bg = yellow; }; "ui.virtual.whitespace" = base5; "ui.virtual.ruler" = { bg = base1; }; "info" = base8; "hint" = base8; "ui.background" = {}; "ui.statusline.inactive" = { fg = base8; bg = base8x0c; }; "ui.statusline" = { fg = base8; bg = base4; }; "ui.statusline.normal" = { fg = base4; bg = blue; }; "ui.statusline.insert" = { fg = base4; bg = green; }; "ui.statusline.select" = { fg = base4; bg = purple; }; "ui.popup" = { bg = base3; }; "ui.window" = { bg = base3; };
|
"ui.linenr.selected" = { bg = base3; }; "ui.text.focus" = { fg = yellow; modifiers = ["bold"]; }; "ui.menu" = { fg = base8; bg = base3; }; "ui.menu.selected" = { fg = base2; bg = yellow; }; "ui.virtual.whitespace" = base5; "ui.virtual.ruler" = { bg = base1; }; "info" = base8; "hint" = base8; "ui.background" = {}; "ui.statusline.inactive" = { fg = base8; bg = base8x0c; }; "ui.statusline" = { fg = base8; bg = base4; }; "ui.statusline.normal" = { fg = base4; bg = blue; }; "ui.statusline.insert" = { fg = base4; bg = green; }; "ui.statusline.select" = { fg = base4; bg = purple; }; "ui.popup" = { bg = base3; }; "ui.window" = { bg = base3; };
|
||||||
"ui.help" = { fg = base8; bg = base3; };
|
"ui.help" = { fg = base8; bg = base3; };
|
||||||
"ui.selection" = { bg = base4; };
|
"ui.selection" = { bg = base4; };
|
||||||
"ui.cursor.match" = { bg = base4; };
|
"ui.cursor.match" = { bg = base4; };
|
||||||
"ui.cursorline" = { bg = base1; };
|
"ui.cursorline" = { bg = base1; };
|
||||||
"comment" = { fg = base5; modifiers = ["italic"]; };
|
"comment" = { fg = base5; modifiers = ["italic"]; };
|
||||||
"ui.linenr" = { fg = base5; };
|
"ui.linenr" = { fg = base5; };
|
||||||
"ui.cursor.primary" = { fg = base7; modifiers = ["reversed"]; };
|
"ui.cursor.primary" = { fg = base7; modifiers = ["reversed"]; };
|
||||||
"attribute" = blue;
|
"attribute" = blue;
|
||||||
"variable" = base8;
|
"variable" = base8;
|
||||||
"constant" = orange;
|
"constant" = orange;
|
||||||
"variable.builtin" = red;
|
"variable.builtin" = red;
|
||||||
"constant.builtin" = red;
|
"constant.builtin" = red;
|
||||||
"namespace" = base8;
|
"namespace" = base8;
|
||||||
"ui.text" = { fg = base8; };
|
"ui.text" = { fg = base8; };
|
||||||
"punctuation" = base6;
|
"punctuation" = base6;
|
||||||
"type" = green;
|
"type" = green;
|
||||||
"type.builtin" = { fg = red; };
|
"type.builtin" = { fg = red; };
|
||||||
"label" = base8;
|
"label" = base8;
|
||||||
"constructor" = blue;
|
"constructor" = blue;
|
||||||
"function" = green;
|
"function" = green;
|
||||||
"function.macro" = { fg = blue; };
|
"function.macro" = { fg = blue; };
|
||||||
"function.builtin" = { fg = "cyan"; };
|
"function.builtin" = { fg = "cyan"; };
|
||||||
"operator" = red;
|
"operator" = red;
|
||||||
"variable.other.member" = base8;
|
"variable.other.member" = base8;
|
||||||
"keyword" = { fg = red; };
|
"keyword" = { fg = red; };
|
||||||
"keyword.directive" = blue;
|
"keyword.directive" = blue;
|
||||||
"variable.parameter" = "#f59762";
|
"variable.parameter" = "#f59762";
|
||||||
"error" = red;
|
"error" = red;
|
||||||
"special" = "#f59762";
|
"special" = "#f59762";
|
||||||
"module" = "#f59762";
|
"module" = "#f59762";
|
||||||
"warning" = "orange";
|
"warning" = "orange";
|
||||||
"constant.character.escape" = { fg = base8; };
|
"constant.character.escape" = { fg = base8; };
|
||||||
"string" = yellow;
|
"string" = yellow;
|
||||||
"constant.numeric" = purple;
|
"constant.numeric" = purple;
|
||||||
"diff.plus" = green;
|
"diff.plus" = green;
|
||||||
"diff.delta" = "orange";
|
"diff.delta" = "orange";
|
||||||
"diff.minus" = red;
|
"diff.minus" = red;
|
||||||
"diagnostic.warning" = { underline = { color = "orange"; style = "curl"; }; };
|
"diagnostic.warning" = { underline = { color = "orange"; style = "curl"; }; };
|
||||||
"diagnostic.error" = { underline = { color = red; style = "curl"; }; };
|
"diagnostic.error" = { underline = { color = red; style = "curl"; }; };
|
||||||
"diagnostic.info" = { underline = { color = base8; style = "curl"; }; };
|
"diagnostic.info" = { underline = { color = base8; style = "curl"; }; };
|
||||||
"diagnostic.hint" = { underline = { color = base8; style = "curl"; }; };
|
"diagnostic.hint" = { underline = { color = base8; style = "curl"; }; };
|
||||||
"markup.heading" = green;
|
"markup.heading" = green;
|
||||||
"markup.bold" = { fg = "orange"; modifiers = ["bold"]; };
|
"markup.bold" = { fg = "orange"; modifiers = ["bold"]; };
|
||||||
"markup.italic" = { fg = "orange"; modifiers = ["italic"]; };
|
"markup.italic" = { fg = "orange"; modifiers = ["italic"]; };
|
||||||
"markup.strikethrough" = { modifiers = ["crossed_out"]; };
|
"markup.strikethrough" = { modifiers = ["crossed_out"]; };
|
||||||
"markup.link.url" = { fg = "orange"; modifiers = ["underlined"]; };
|
"markup.link.url" = { fg = "orange"; modifiers = ["underlined"]; };
|
||||||
"markup.link.text" = yellow;
|
"markup.link.text" = yellow;
|
||||||
"markup.quote" = green;
|
"markup.quote" = green;
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{ pkgs, config, lib, ...}:
|
{ pkgs, config, lib, ...}:
|
||||||
{
|
{
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = lib.mkDefault true;
|
enable = lib.mkDefault true;
|
||||||
dotDir = ".config/zsh";
|
dotDir = ".config/zsh";
|
||||||
history = {
|
history = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue