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
2024-12-20 19:42:09 -05:00
parent ab70f1f9f9
commit abc55c6d4e
9 changed files with 340 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,18 +8,18 @@
font = {
name = "JetBrainsMono Nerd Font Mono";
size = 12;
package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
package = pkgs.nerd-fonts.jetbrains-mono;
};
shellIntegration = {
enableZshIntegration = true;
};
themeFile = "kanagawa";
themeFile = "Modus_Vivendi";
# darwinLaunchOptions = [
# "--single-instance"
# ];
settings = {
background_opacity = "0.9";
background_blur = 5;
};
# settings = {
# background_opacity = "0.9";
# background_blur = 5;
# };
};
}

11
modules/home-manager/latex.nix Normal file
View File

@@ -0,0 +1,11 @@
{
pkgs,
config,
...
}: {
programs = {
texlive = {
enable = true;
};
};
}

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

@@ -2,6 +2,7 @@
inputs,
pkgs,
config,
lib,
...
}: {
imports = [
@@ -15,11 +16,12 @@ config,
programs.nixvim = {
enable = true;
package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
defaultEditor = true;
vimdiffAlias = true;
colorschemes = {
kanagawa = {
modus = {
enable = true;
};
};
@@ -87,6 +89,27 @@ config,
key = "<leader>zn";
action = "<cmd>ZkNew<CR>";
}
# quickfix/location list
{
mode = "n";
key = "]q";
action = "<cmd>cnext<CR>zz";
}
{
mode = "n";
key = "[q";
action = "<cmd>cprev<CR>zz";
}
{
mode = "n";
key = "]l";
action = "<cmd>lnext<CR>zz";
}
{
mode = "n";
key = "[l";
action = "<cmd>lprev<CR>zz";
}
# gitsigns
{
mode = "n";
@@ -284,6 +307,9 @@ config,
sleuth = {
enable = true;
};
spectre = {
enable = true;
};
treesitter = {
enable = true;
folding = true;
@@ -327,6 +353,7 @@ config,
ai = {
n_lines = 500;
};
splitjoin = {};
surround = {};
statusline = {
use_icons = true;
@@ -334,6 +361,7 @@ config,
comment = {};
trailspace = {};
pick = {};
jump = {};
};
};
zk = {
@@ -342,9 +370,36 @@ config,
picker = "minipick";
};
};
render-markdown = {
obsidian = {
enable = true;
settings = {
completion = {
min_chars = 1;
nvim_cmp = true;
};
notes_subir = "notes";
new_notes_location = "notes_subdir";
templates = {
folder = "templates";
};
workspaces = [
{
name = "personal";
path = "~/vaults/personal";
}
];
picker = {
name = "mini.pick";
};
daily_notes = {
folder = "dailies";
default_tags = [ "type/daily" ];
};
};
};
# render-markdown = {
# enable = true;
# };
friendly-snippets = {
enable = true;
};
@@ -359,7 +414,6 @@ config,
};
cmp = {
enable = true;
settings = {
snippet = {
expand = ''
@@ -470,6 +524,9 @@ config,
bashls = {
enable = true;
};
clangd = {
enable = true;
};
};
keymaps = {
diagnostic = {
@@ -497,6 +554,12 @@ config,
};
};
};
nvim-jdtls = {
enable = true;
cmd = [
(lib.getExe pkgs.jdt-language-server)
];
};
};
};
}

6
modules/home-manager/nushell.nix
View File

@@ -12,6 +12,12 @@
};
nushell = {
enable = true;
extraConfig = ''
edit_mode: vim
'';
};
direnv = {
enableNushellIntegration = true;
};
zoxide = {
enable = true;

1
modules/home-manager/tmux/default.nix
View File

@@ -8,7 +8,6 @@
{
programs = {
tmux = {
shell = "${pkgs.zsh}/bin/zsh";
enable = true;
shortcut = "Space";
mouse = true;

185
modules/nix-darwin/aerospace.nix Normal file
View File

@@ -0,0 +1,185 @@
{
services = {
aerospace = {
enable = true;
settings = {
# You can use it to add commands that run after login to macOS user session.
# 'start-at-login' needs to be 'true' for 'after-login-command' to work
# Available commands: https://nikitabobko.github.io/AeroSpace/commands
after-login-command = [];
# You can use it to add commands that run after AeroSpace startup.
# 'after-startup-command' is run after 'after-login-command'
# Available commands : https://nikitabobko.github.io/AeroSpace/commands
after-startup-command = [];
# Start AeroSpace at login
start-at-login = false;
# Normalizations. See: https://nikitabobko.github.io/AeroSpace/guide#normalization
enable-normalization-flatten-containers = true;
enable-normalization-opposite-orientation-for-nested-containers = true;
# See: https://nikitabobko.github.io/AeroSpace/guide#layouts
# The 'accordion-padding' specifies the size of accordion padding
# You can set 0 to disable the padding feature
accordion-padding = 30;
# Possible values: tiles|accordion
default-root-container-layout = "tiles";
# Possible values: horizontal|vertical|auto
# 'auto' means: wide monitor (anything wider than high) gets horizontal orientation,
# tall monitor (anything higher than wide) gets vertical orientation
default-root-container-orientation = "auto";
# Mouse follows focus when focused monitor changes
# Drop it from your config, if you don't like this behavior
# See https://nikitabobko.github.io/AeroSpace/guide#on-focus-changed-callbacks
# See https://nikitabobko.github.io/AeroSpace/commands#move-mouse
# Fallback value (if you omit the key): on-focused-monitor-changed = []
on-focused-monitor-changed = ["move-mouse monitor-lazy-center"];
# 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;
key-mapping = {
# Possible values: (qwerty|dvorak)
# See https://nikitabobko.github.io/AeroSpace/guide#key-mapping
preset = "qwerty";
};
# Gaps between windows (inner-*) and between monitor edges (outer-*).
# Possible values:
# - Constant: gaps.outer.top = 8
# - Per monitor: gaps.outer.top = [{ monitor.main = 16 }, { monitor."some-pattern" = 32 }, 24]
# In this example, 24 is a default value when there is no match.
# Monitor pattern is the same as for 'workspace-to-monitor-force-assignment'.
# See: https://nikitabobko.github.io/AeroSpace/guide#assign-workspaces-to-monitors
gaps = {
inner.horizontal = 8;
inner.vertical = 8;
outer.left = 8;
outer.bottom = 8;
outer.top = 8;
outer.right = 8;
};
mode = {
main.binding = {
# See: https://nikitabobko.github.io/AeroSpace/commands#layout
alt-slash = "layout tiles horizontal vertical";
alt-comma = "layout accordion horizontal vertical";
# See: https://nikitabobko.github.io/AeroSpace/commands#focus
alt-h = "focus left";
alt-j = "focus down";
alt-k = "focus up";
alt-l = "focus right";
# See: https://nikitabobko.github.io/AeroSpace/commands#move
alt-shift-h = "move left";
alt-shift-j = "move down";
alt-shift-k = "move up";
alt-shift-l = "move right";
# See: https://nikitabobko.github.io/AeroSpace/commands#resize
alt-shift-minus = "resize smart -50";
alt-shift-equal = "resize smart +50";
# See: https://nikitabobko.github.io/AeroSpace/commands#workspace
alt-1 = "workspace 1";
alt-2 = "workspace 2";
alt-3 = "workspace 3";
alt-4 = "workspace 4";
alt-5 = "workspace 5";
alt-6 = "workspace 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";
alt-shift-2 = "move-node-to-workspace 2";
alt-shift-3 = "move-node-to-workspace 3";
alt-shift-4 = "move-node-to-workspace 4";
alt-shift-5 = "move-node-to-workspace 5";
alt-shift-6 = "move-node-to-workspace 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";
# See: https://nikitabobko.github.io/AeroSpace/commands#move-workspace-to-monitor
alt-shift-tab = "move-workspace-to-monitor --wrap-around next";
# See: https://nikitabobko.github.io/AeroSpace/commands#mode
alt-shift-semicolon = "mode service";
};
service.binding = {
esc = ["reload-config" "mode main"];
r = ["flatten-workspace-tree" "mode main"]; # reset layout
f = ["layout floating tiling" "mode main"]; # Toggle between floating and tiling layout
backspace = ["close-all-windows-but-current" "mode main"];
# sticky is not yet supported https://github.com/nikitabobko/AeroSpace/issues/2
#s = ["layout sticky tiling" "mode main"]
alt-shift-h = ["join-with left" "mode main"];
alt-shift-j = ["join-with down" "mode main"];
alt-shift-k = ["join-with up" "mode main"];
alt-shift-l = ["join-with right" "mode main"];
};
};
};
};
};
}