mthomson/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Michael Thomson
2025-03-07 08:26:21 -05:00
parent f48cbf893e
commit 73d9c04d3e
10 changed files with 308 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/home-manager/email/default.nix
View File

@@ -60,6 +60,13 @@
khard = {
enable = true;
};
neomutt = {
enable = true;
vimKeys = true;
sidebar = {
enable = true;
};
};
};
accounts = {
@@ -73,6 +80,9 @@
aerc = {
enable = true;
};
neomutt = {
enable = true;
};
mbsync = {
enable = true;
create = "both";
@@ -96,6 +106,7 @@
};
notmuch = {
enable = true;
neomutt.enable = true;
};
};
};

48
modules/home-manager/git/default.nix
View File

@@ -10,6 +10,54 @@
diff-so-fancy = {
enable = true;
};
extraConfig = {
column = {
ui = "auto";
};
branch = {
sort = "-committerdate";
};
tag = {
sort = "version:refname";
};
diff = {
algorithm = "histogram";
colorMoved = "plain";
mnemonicPrefix = "true";
renames = "true";
};
push = {
default = "simple";
autoSetupRemote = "true";
followTags = "true";
};
fetch = {
prune = "true";
pruneTags = "true";
all = "true";
};
help = {
autocorrect = "prompt";
};
commit = {
verbose = "true";
};
rerere = {
enabled = "true";
autoupdate = "true";
};
rebase = {
autoSquash = "true";
autoStash = "true";
autoRefs = "true";
};
merge = {
conflictstyle = "zdiff3";
};
pull = {
rebase = "true";
};
};
includes = [
{
condition = "gitdir:~/dev/work/";

8
modules/home-manager/kitty/default.nix
View File

@@ -6,10 +6,14 @@
programs.kitty = {
enable = true;
font = {
name = "JetBrainsMono Nerd Font Mono";
name = "PragmataPro Mono Liga";
size = 12;
package = pkgs.nerd-fonts.jetbrains-mono;
};
# font = {
# name = "JetBrainsMono Nerd Font Mono";
# size = 12;
# package = pkgs.nerd-fonts.jetbrains-mono;
# };
shellIntegration = {
enableZshIntegration = true;
};

77
modules/home-manager/nixvim/default.nix
View File

@@ -38,6 +38,11 @@ lib,
laststatus = 3;
swapfile = false;
tabstop = 4;
softtabstop = 0;
shiftwidth = 4;
expandtab = true;
breakindent = true;
undofile = true;
ignorecase = true;
@@ -464,25 +469,25 @@ lib,
lsp = {
enable = true;
servers = {
nixd = {
enable = true;
settings = {
nixpkgs = {
expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).inputs.nixpkgs { }";
};
formatting = {
command = ["alejandra"];
};
options = {
nixos = {
expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).nixosConfigurations.desktop.options";
};
nix-darwin = {
expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).darwinConfigurations.macbook.options";
};
};
};
};
# nixd = {
# enable = true;
# settings = {
# nixpkgs = {
# expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).inputs.nixpkgs { }";
# };
# formatting = {
# command = ["alejandra"];
# };
# options = {
# nixos = {
# expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).nixosConfigurations.desktop.options";
# };
# nix-darwin = {
# expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).darwinConfigurations.macbook.options";
# };
# };
# };
# };
ts_ls = {
enable = true;
};
@@ -495,9 +500,9 @@ lib,
cssls = {
enable = true;
};
stylelint_lsp = {
enable = true;
};
# stylelint_lsp = {
# enable = true;
# };
volar = {
enable = true;
tslsIntegration = true;
@@ -508,6 +513,9 @@ lib,
gopls = {
enable = true;
};
golangci_lint_ls = {
enable = true;
};
bashls = {
enable = true;
};
@@ -530,23 +538,26 @@ lib,
};
};
};
neotest = {
enable = true;
adapters = {
jest = {
enable = true;
};
go = {
enable = true;
};
};
};
# neotest = {
# enable = true;
# adapters = {
# jest = {
# enable = true;
# };
# go = {
# enable = true;
# };
# };
# };
nvim-jdtls = {
enable = true;
cmd = [
(lib.getExe pkgs.jdt-language-server)
];
};
markdown-preview = {
enable = true;
};
};
};
}

63
modules/nix-darwin/aerospace.nix
View File

@@ -16,6 +16,18 @@
# Start AeroSpace at login
start-at-login = false;
# float certain windows
on-window-detected = [
{
"if" = {
app-id = "com.apple.finder";
};
run = [
"layout floating"
];
}
];
# Normalizations. See: https://nikitabobko.github.io/AeroSpace/guide#normalization
enable-normalization-flatten-containers = true;
enable-normalization-opposite-orientation-for-nested-containers = true;
@@ -43,7 +55,7 @@
# You can effectively turn off macOS "Hide application" (cmd-h) feature by toggling this flag
# Useful if you don't use this macOS feature, but accidentally hit cmd-h or cmd-alt-h key
# Also see: https://nikitabobko.github.io/AeroSpace/goodies#disable-hide-app
automatically-unhide-macos-hidden-apps = false;
automatically-unhide-macos-hidden-apps = true;
key-mapping = {
# Possible values: (qwerty|dvorak)
@@ -99,28 +111,6 @@
alt-7 = "workspace 7";
alt-8 = "workspace 8";
alt-9 = "workspace 9";
alt-a = "workspace A"; # In your config, you can drop workspace bindings that you don"t need
alt-b = "workspace B";
alt-c = "workspace C";
alt-d = "workspace D";
alt-e = "workspace E";
alt-f = "workspace F";
alt-g = "workspace G";
alt-i = "workspace I";
alt-m = "workspace M";
alt-n = "workspace N";
alt-o = "workspace O";
alt-p = "workspace P";
alt-q = "workspace Q";
alt-r = "workspace R";
alt-s = "workspace S";
alt-t = "workspace T";
alt-u = "workspace U";
alt-v = "workspace V";
alt-w = "workspace W";
alt-x = "workspace X";
alt-y = "workspace Y";
alt-z = "workspace Z";
# See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace
alt-shift-1 = "move-node-to-workspace 1";
@@ -132,28 +122,6 @@
alt-shift-7 = "move-node-to-workspace 7";
alt-shift-8 = "move-node-to-workspace 8";
alt-shift-9 = "move-node-to-workspace 9";
alt-shift-a = "move-node-to-workspace A";
alt-shift-b = "move-node-to-workspace B";
alt-shift-c = "move-node-to-workspace C";
alt-shift-d = "move-node-to-workspace D";
alt-shift-e = "move-node-to-workspace E";
alt-shift-f = "move-node-to-workspace F";
alt-shift-g = "move-node-to-workspace G";
alt-shift-i = "move-node-to-workspace I";
alt-shift-m = "move-node-to-workspace M";
alt-shift-n = "move-node-to-workspace N";
alt-shift-o = "move-node-to-workspace O";
alt-shift-p = "move-node-to-workspace P";
alt-shift-q = "move-node-to-workspace Q";
alt-shift-r = "move-node-to-workspace R";
alt-shift-s = "move-node-to-workspace S";
alt-shift-t = "move-node-to-workspace T";
alt-shift-u = "move-node-to-workspace U";
alt-shift-v = "move-node-to-workspace V";
alt-shift-w = "move-node-to-workspace W";
alt-shift-x = "move-node-to-workspace X";
alt-shift-y = "move-node-to-workspace Y";
alt-shift-z = "move-node-to-workspace Z";
# See: https://nikitabobko.github.io/AeroSpace/commands#workspace-back-and-forth
alt-tab = "workspace-back-and-forth";
@@ -181,5 +149,10 @@
};
};
};
jankyborders = {
enable = true;
active_color = "0xffe1e3e4";
inactive_color = "0xff494d64";
};
};
}

4
modules/nix-darwin/system.nix
View File

@@ -16,5 +16,9 @@
autohide = true;
autohide-delay = 0.0;
};
NSGlobalDomain = {
NSWindowShouldDragOnGesture = true;
NSAutomaticWindowAnimationsEnabled = true;
};
};
}

18
modules/nixos/postgres.nix
View File

@@ -1,16 +1,16 @@
{pkgs, ...}: {
services.postgresql = {
enable = true;
ensureDatabases = ["mydatabase"];
ensureDatabases = ["todo"];
ensureUsers = [
{
name = "todo";
ensurePermissions = {
"DATABASE todo" = "ALL PRIVILEGES";
};
}
];
enableTCPIP = true;
port = 5432;
authentication = pkgs.lib.mkOverride 10 ''
#type database DBuser origin-address auth-method
local all all trust
# ipv4
host all all 127.0.0.1/32 trust
# ipv6
host all all ::1/128 trust
'';
};
}