martials/nixos-configuration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into thinkpad

Browse Source
This commit is contained in:
Martin Berg Alstad
2025-03-03 21:52:34 +01:00
parent 1d20ef52a8 a6cb4a5cf6
commit b42c0d9988
20 changed files with 414 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
home-manager/development/git.nix
View File

@ -1,23 +1,33 @@
{ pkgs, ... }:
{
programs.git = {
enable = true;
userName = "Martin Berg Alstad";
userEmail = "git@martials.no";
home.packages = with pkgs; [ git-crypt ];
aliases = {
amend = "commit --amend";
cm = "commit";
s = "status";
};
programs.git =
let
package = pkgs.git.override { withLibsecret = true; };
in
{
enable = true;
package = package;
userName = "Martin Berg Alstad";
userEmail = "git@martials.no";
signing = {
signByDefault = true;
key = "848D71DE0590C199";
};
aliases = {
amend = "commit --amend";
cm = "commit";
s = "status";
};
extraConfig = {
push.autoSetupRemote = true;
safe.directory = "/etc/nixos";
signing = {
signByDefault = true;
key = "848D71DE0590C199";
};
extraConfig = {
push.autoSetupRemote = true;
safe.directory = "/etc/nixos";
credential.helper = "${package}/bin/git-credential-libsecret";
};
};
};
}

17
home-manager/development/zed.nix
View File

@ -20,10 +20,25 @@
fontSize = 14;
in
{
assistant = {
default_model = {
provider = "ollama";
model = "deepseek-r1:8b";
};
version = "2";
};
autosave = "on_focus_change";
base_keymap = "JetBrains";
buffer_font_family = font;
icon-theme = "Catppuccin Mocha"; # TODO doesn't work?
features = {
inline_completion_provider = "zed";
};
icon_theme = "Catppuccin Mocha";
# icon_theme = { TODO replace icon theme above with below
# mode = theme.mode;
# light = "Catppuccin Mocha";
# dark = "Catppuccin Mocha";
# };
ui_font_family = font;
ui_font_size = fontSize;
buffer_font_size = fontSize;