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

update all deps

Browse Source
This commit is contained in:
Michael Thomson
2025-12-02 11:18:49 -05:00
parent dfd4b364fd
commit b81a57ddb8
27 changed files with 533 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/home-manager/bitwarden.nix
View File

@@ -1,7 +1,4 @@
{
pkgs,
...
}: {
{pkgs, ...}: {
programs = {
rbw = {
enable = true;

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

@@ -3,27 +3,24 @@
config,
inputs,
...
}:
let
}: let
myPkgs = import pkgs.path {
inherit (pkgs) system;
overlays = [ inputs.emacs-overlay.overlays.default ];
inherit (pkgs) system;
overlays = [inputs.emacs-overlay.overlays.default];
};
in
{
in {
home.packages = with pkgs; [
emacs-lsp-booster
tree-sitter
fd
ripgrep
typescript-language-server
typescript
vscode-langservers-extracted
tailwindcss-language-server
rust-analyzer
nodejs
nixd
emacs-lsp-booster
tree-sitter
fd
ripgrep
typescript-language-server
typescript
vscode-langservers-extracted
tailwindcss-language-server
rust-analyzer
nodejs
nixd
cmake
libtool
@@ -33,15 +30,16 @@ in
programs.emacs = {
enable = true;
package = myPkgs.emacsWithPackagesFromUsePackage {
package = myPkgs.emacsWithPackagesFromUsePackage {
config = ./init.el;
defaultInitFile = false;
extraEmacsPackages = epkgs: with epkgs; [
mu4e
pdf-tools
vterm
treesit-grammars.with-all-grammars
];
extraEmacsPackages = epkgs:
with epkgs; [
mu4e
pdf-tools
vterm
treesit-grammars.with-all-grammars
];
};
};
services.emacs.enable = true;

10
modules/home-manager/email-personal.nix
View File

@@ -11,15 +11,15 @@
mbsync = {
enable = true;
};
afew = {
enable = true;
};
afew = {
enable = true;
};
notmuch = {
enable = true;
new.tags = [ "new" ];
new.tags = ["new"];
hooks = {
postNew = ''
afew --tag --new
afew --tag --new
'';
preNew = ''
mbsync -a

22
modules/home-manager/email-work.nix
View File

@@ -1,23 +1,17 @@
{
pkgs,
osConfig,
lib,
...
osConfig,
lib,
...
}: {
home.packages = with pkgs; [
w3m
inetutils
inetutils
];
services = {
# mbsync = {
# enable = true;
# frequency = "*-*-* *:*/5:00";
# postExec = "\${pkgs.notmuch} new";
# };
vdirsyncer = {
enable = true;
#frequency = "*-*-* *:*/5:00";
};
};
@@ -68,7 +62,7 @@
};
notmuch = {
enable = true;
new.tags = [ "new" ];
new.tags = ["new"];
search.excludeTags = [
"trash"
"spam"
@@ -80,10 +74,10 @@
notmuch tag +cal attachment:.ics
notmuch tag +inbox +unread -new "tag:new"
'';
'';
preNew = ''
cd ~/Maildir/work/ && gmi sync
'';
'';
};
};
};
@@ -108,7 +102,7 @@
enable = true;
settings = {
replace_slash_with_dot = true;
ignore_tags = [ "new" "personal" "work" ];
ignore_tags = ["new" "personal" "work"];
};
};
};

129
modules/home-manager/git.nix
View File

@@ -3,71 +3,76 @@
config,
...
}: {
programs.git = {
enable = true;
userName = "Michael Thomson";
userEmail = "michael@michaelthomson.dev";
programs = {
diff-so-fancy = {
enable = true;
enableGitIntegration = 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/";
contents = {
user = {
email = "mthomson@konradgroup.com";
name = "Michael Thomson";
};
git = {
enable = true;
settings = {
user = {
name = "Michael Thomson";
email = "michael@michaelthomson.dev";
};
}
];
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/";
contents = {
user = {
email = "mthomson@konradgroup.com";
name = "Michael Thomson";
};
};
}
];
};
};
}

7
modules/home-manager/hledger.nix
View File

@@ -1,7 +1,4 @@
{
pkgs,
...
}: {
{pkgs, ...}: {
home.packages = with pkgs; [
hledger
hledger-ui
@@ -10,7 +7,7 @@
];
home.sessionVariables = {
LEDGER_FILE="~/finance/current.journal";
LEDGER_FILE = "~/finance/current.journal";
};
programs.ledger = {

5
modules/home-manager/network-manager-applet.nix
View File

@@ -1,7 +1,4 @@
{
pkgs,
...
}: {
{pkgs, ...}: {
services = {
network-manager-applet = {
enable = true;

43
modules/home-manager/nixcats/default.nix
View File

@@ -1,8 +1,14 @@
{ config, lib, inputs, ... }: let
{
config,
lib,
inputs,
...
}: let
utils = inputs.nixCats.utils;
in {
imports = [
inputs.nixCats.homeModule
../zk.nix
];
config = {
@@ -11,12 +17,20 @@ in {
};
nixCats = {
enable = true;
packageNames = [ "nvim" ];
packageNames = ["nvim"];
luaPath = ./.;
# for useage of this section, refer to :h nixCats.flake.outputs.categories
categoryDefinitions.replace = ({ pkgs, settings, categories, extra, name, mkPlugin, ... }@packageDef: {
categoryDefinitions.replace = {
pkgs,
settings,
categories,
extra,
name,
mkPlugin,
...
} @ packageDef: {
# lspsAndRuntimeDeps:
# this section is for dependencies that should be available
# at RUN TIME for plugins. Will be available to PATH within neovim terminal
@@ -27,6 +41,9 @@ in {
ripgrep
fzf
];
notes = with pkgs; [
zk
];
lua = with pkgs; [
lua-language-server
stylua
@@ -45,15 +62,13 @@ in {
go
];
typescript = with pkgs; [
typescript-language-server
vtsls
vscode-langservers-extracted
vue-language-server
stylelint-lsp
tailwindcss-language-server
];
yaml = with pkgs; [
yaml-language-server
gitlab-ci-ls
];
c = with pkgs; [
clang
@@ -90,6 +105,10 @@ in {
# not loaded automatically at startup.
# use with packadd and an autocommand in config to achieve lazy loading
optionalPlugins = {
notes = with pkgs.vimPlugins; [
zk-nvim
render-markdown-nvim
];
go = with pkgs.vimPlugins; [
nvim-dap-go
];
@@ -115,7 +134,7 @@ in {
# shared libraries to be added to LD_LIBRARY_PATH
# variable available to nvim runtime
sharedLibraries = {
general = with pkgs; [ ];
general = with pkgs; [];
};
# environmentVariables:
@@ -140,13 +159,17 @@ in {
# '' --set CATTESTVAR2 "It worked again!"''
# ];
};
});
};
# see :help nixCats.flake.outputs.packageDefinitions
packageDefinitions.replace = {
# These are the names of your packages
# you can include as many as you wish.
nvim = {pkgs, name, ... }: {
nvim = {
pkgs,
name,
...
}: {
# they contain a settings set defined above
# see :help nixCats.flake.outputs.settings
settings = {
@@ -166,6 +189,7 @@ in {
# and a set of categories that you want
categories = {
general = true;
notes = true;
lua = true;
nix = true;
go = true;
@@ -178,7 +202,6 @@ in {
# anything else to pass and grab in lua with `nixCats.extra`
extra = {
nixdExtras.nixpkgs = ''import ${pkgs.path} {}'';
vueExtras.location = "${lib.getBin pkgs.vue-language-server}/lib/node_modules/@vue/language-server";
};
};
};

54
modules/home-manager/nixcats/init.lua
View File

@@ -582,6 +582,39 @@ require('lze').load {
vim.keymap.set("n", "<leader>k", function() harpoon:list():prev() end)
vim.keymap.set("n", "<leader>j", function() harpoon:list():next() end)
end
},
{
"zk-nvim",
enabled = nixCats('notes') or false,
event = "DeferredUIEnter",
after = function ()
require("zk").setup({
picker = "snacks_picker"
})
local opts = { noremap=true, silent=false }
-- Create a new note after asking for its title.
vim.api.nvim_set_keymap("n", "<leader>zn", "<Cmd>ZkNew { title = vim.fn.input('Title: ') }<CR>", opts)
-- Open notes.
vim.api.nvim_set_keymap("n", "<leader>zf", "<Cmd>ZkNotes { sort = { 'modified' } }<CR>", opts)
-- Open notes associated with the selected tags.
vim.api.nvim_set_keymap("n", "<leader>zt", "<Cmd>ZkTags<CR>", opts)
-- Search for the notes matching a given query.
vim.api.nvim_set_keymap("n", "<leader>zg", "<Cmd>ZkNotes { sort = { 'modified' }, match = { vim.fn.input('Search: ') } }<CR>", opts)
-- Search for the notes matching the current visual selection.
vim.api.nvim_set_keymap("v", "<leader>zm", ":'<,'>ZkMatch<CR>", opts)
end
},
{
"render-markdown.nvim",
enabled = nixCats('notes') or false,
ft = "markdown",
after = function ()
require('render-markdown').setup({})
end
}
}
@@ -687,21 +720,9 @@ require('lze').load {
-- also these are regular specs and you can use before and after and all the other normal fields
},
{
"ts_ls",
"vtsls",
enabled = nixCats('typescript') or false,
lsp = {
on_attach = lsp_on_attach,
filetypes = { "javascript", "javascriptreact", "javascript.jsx", "typescript", "typescriptreact", "typescript.tsx", "vue" },
init_options = {
plugins = {
{
name = "@vue/typescript-plugin",
languages = { "vue" },
location = nixCats.extra("vueExtras.location"),
},
},
},
},
lsp = {},
},
{
"eslint",
@@ -723,11 +744,6 @@ require('lze').load {
enabled = nixCats('yaml') or false,
lsp = {},
},
{
"gitlab_ci_ls",
enabled = nixCats('yaml') or false,
lsp = {},
},
{
"clangd",
enabled = nixCats('c') or false,

4
modules/home-manager/password-store/default.nix
View File

@@ -26,7 +26,9 @@
services = {
gpg-agent = {
enable = !pkgs.stdenv.isDarwin;
pinentryPackage = pkgs.pinentry-curses;
pinentry = {
package = pkgs.pinentry-curses;
};
};
};
}

5
modules/home-manager/pasystray.nix
View File

@@ -1,7 +1,4 @@
{
pkgs,
...
}: {
{pkgs, ...}: {
services = {
pasystray = {
enable = true;

12
modules/home-manager/stylix.nix
View File

@@ -1,9 +1,9 @@
{
inputs,
pkgs,
config,
lib,
...
inputs,
pkgs,
config,
lib,
...
}: {
imports = [
inputs.stylix.homeModules.stylix
@@ -29,7 +29,7 @@ lib,
};
emoji = {
package = pkgs.noto-fonts-emoji;
package = pkgs.noto-fonts-color-emoji;
name = "Noto Color Emoji";
};
};

8
modules/home-manager/sway.nix
View File

@@ -1,8 +1,8 @@
{
pkgs,
config,
lib,
...
pkgs,
config,
lib,
...
}: {
services.gnome-keyring.enable = true;
wayland.windowManager.sway = {

21
modules/home-manager/zk.nix Normal file
View File

@@ -0,0 +1,21 @@
{
config,
lib,
pkgs,
...
}: {
home.sessionVariables = {
ZK_NOTEBOOK_DIR = "zk";
};
programs = {
zk = {
enable = true;
settings = {
notebook = {
dir = "~/zk";
};
};
};
};
}