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

Compare commits

base: cschmatzler:2a14d62d83d39211d65b0c2f69d4ced733ab7cfc
Branches Tags
cschmatzler:master
..
compare: cschmatzler:master
Branches Tags
cschmatzler:master

9 Commits
2a14d62d83 ... master

Author SHA1 Message Date
Christoph Schmatzler
c75404cd44 flake 2025-12-17 11:23:11 +00:00
Christoph Schmatzler
bc410d8e09 Revert "ghostty tip" 
This reverts commit f0025dfde3.
 2025-12-16 12:07:08 +01:00
Christoph Schmatzler
f0025dfde3 ghostty tip 2025-12-16 10:53:13 +00:00
Christoph Schmatzler
20c2bae21d flake 2025-12-16 10:31:38 +00:00
Christoph Schmatzler
54db6ce681 cmdline 2025-12-15 22:09:53 +00:00
Christoph Schmatzler
fe57aa7f4a no caddy 2025-12-15 22:09:53 +00:00
Christoph Schmatzler
cb6a6f9f46 diffconflicts 2025-12-15 22:05:30 +00:00
Christoph Schmatzler
ed651788b4 up 2025-12-15 22:05:30 +00:00
Christoph Schmatzler
90801ae7c7 up 2025-12-15 12:54:45 +00:00
7 changed files with 79 additions and 143 deletions
Expand all files Collapse all files

189
flake.lock generated
View File

@@ -16,32 +16,13 @@
"url": "https://tangled.org/@jakelazaroff.com/actor-typeahead"
}
},
"beads": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1765103675,
"narHash": "sha256-PCsU2GwrPYFAE2KTCdk60E6ZTPRtgNdbPF+bzf8qi3Q=",
"owner": "steveyegge",
"repo": "beads",
"rev": "08d8353619777dfdd4119477ca029689597cec60",
"type": "github"
},
"original": {
"owner": "steveyegge",
"repo": "beads",
"type": "github"
}
},
"blueprint": {
"inputs": {
"nixpkgs": [
"llm-agents",
"nixpkgs"
],
"systems": "systems_2"
"systems": "systems"
},
"locked": {
"lastModified": 1763308703,
@@ -96,11 +77,11 @@
]
},
"locked": {
"lastModified": 1765065051,
"narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=",
"lastModified": 1765684049,
"narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79",
"rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33",
"type": "github"
},
"original": {
@@ -117,11 +98,11 @@
]
},
"locked": {
"lastModified": 1765326679,
"narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=",
"lastModified": 1765794845,
"narHash": "sha256-YD5QWlGnusNbZCqR3pxG8tRxx9yUXayLZfAJRWspq2s=",
"owner": "nix-community",
"repo": "disko",
"rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e",
"rev": "7194cfe5b7a3660726b0fe7296070eaef601cae9",
"type": "github"
},
"original": {
@@ -149,11 +130,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1765495779,
"narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
"lastModified": 1765835352,
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
"rev": "a34fae9c08a15ad73f295041fec82323541400a9",
"type": "github"
},
"original": {
@@ -170,11 +151,11 @@
]
},
"locked": {
"lastModified": 1765495779,
"narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
"lastModified": 1765835352,
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
"rev": "a34fae9c08a15ad73f295041fec82323541400a9",
"type": "github"
},
"original": {
@@ -185,25 +166,7 @@
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_4"
"systems": "systems_3"
},
"locked": {
"lastModified": 1694529238,
@@ -219,9 +182,9 @@
"type": "github"
}
},
"flake-utils_3": {
"flake-utils_2": {
"inputs": {
"systems": "systems_5"
"systems": "systems_4"
},
"locked": {
"lastModified": 1731533236,
@@ -239,7 +202,7 @@
},
"gomod2nix": {
"inputs": {
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils",
"nixpkgs": [
"tangled",
"nixpkgs"
@@ -266,11 +229,11 @@
]
},
"locked": {
"lastModified": 1765480374,
"narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=",
"lastModified": 1765860045,
"narHash": "sha256-7Lxp/PfOy4h3QIDtmWG/EgycaswqRSkDX4DGtet14NE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3",
"rev": "09de9577d47d8bffb11c449b6a3d24e32ac16c99",
"type": "github"
},
"original": {
@@ -282,11 +245,11 @@
"homebrew-cask": {
"flake": false,
"locked": {
"lastModified": 1765528246,
"narHash": "sha256-tF1QcJTTo22L5EQ/DoQYL0lQPQ/99E/vaAh6J7EoELU=",
"lastModified": 1765961995,
"narHash": "sha256-Tm6A+QdCwQiXeQNy8s2KaRVan+RpsKMGKa/SnLsU6TA=",
"owner": "homebrew",
"repo": "homebrew-cask",
"rev": "fce756b7cae0c70705e01e89d17811a96c7f52ad",
"rev": "53172986b54eb99477812fd04828d0fa86021ed9",
"type": "github"
},
"original": {
@@ -298,11 +261,11 @@
"homebrew-core": {
"flake": false,
"locked": {
"lastModified": 1765532319,
"narHash": "sha256-q6HrIOI19Gu84/x/6y1PfINc3p2c7pGfTViZaIzPP0k=",
"lastModified": 1765966197,
"narHash": "sha256-nc1TxNe16ikt936NNzXqNx5EDy3hQZfqjCLQHibK7cE=",
"owner": "homebrew",
"repo": "homebrew-core",
"rev": "453aba70829547fb3596d5a4b0fd2da8fca6d3d8",
"rev": "5ae13eb45f359eb10a969db66dc77023ed7f5176",
"type": "github"
},
"original": {
@@ -380,15 +343,15 @@
"llm-agents": {
"inputs": {
"blueprint": "blueprint",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1765508910,
"narHash": "sha256-rcNH6JgKo36ufvPJGUkZW4jktkVz0t8FBtPJv/gRUnQ=",
"lastModified": 1765939841,
"narHash": "sha256-pH4eJEadnh80MtZdwGmz4GXPsab1lnNjBHSD/LGA5wA=",
"owner": "numtide",
"repo": "llm-agents.nix",
"rev": "46c494b51cecf3476c20e54e772c6bc48f10e04d",
"rev": "9b10c593585c014025ba6fe28bc8ee6e64545687",
"type": "github"
},
"original": {
@@ -430,27 +393,27 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1760284886,
"narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",
"lastModified": 1765903799,
"narHash": "sha256-1wbl0y7U8TvSHxDWME7o92bIspfuhjVaTOs27r54uc4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43",
"rev": "e8d16d2186d6ed9f047eb30948e97e7e01886d10",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1761765539,
"narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
"lastModified": 1765674936,
"narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
"rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
"type": "github"
},
"original": {
@@ -461,27 +424,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1765270179,
"narHash": "sha256-g2a4MhRKu4ymR4xwo+I+auTknXt/+j37Lnf0Mvfl1rE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "677fbe97984e7af3175b6c121f3c39ee5c8d62c9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1765186076,
"narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
"lastModified": 1765779637,
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
"type": "github"
},
"original": {
@@ -491,13 +438,13 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_3": {
"locked": {
"lastModified": 1765425892,
"narHash": "sha256-jlQpSkg2sK6IJVzTQBDyRxQZgKADC2HKMRfGCSgNMHo=",
"lastModified": 1765772535,
"narHash": "sha256-aq+dQoaPONOSjtFIBnAXseDm9TUhIbe215TPmkfMYww=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5d6bdbddb4695a62f0d00a3620b37a15275a5093",
"rev": "09b8fda8959d761445f12b55f380d90375a1d6bb",
"type": "github"
},
"original": {
@@ -507,7 +454,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_4": {
"locked": {
"lastModified": 1754800730,
"narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=",
@@ -526,15 +473,15 @@
"nixvim": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_4",
"systems": "systems_3"
"nixpkgs": "nixpkgs_3",
"systems": "systems_2"
},
"locked": {
"lastModified": 1765532309,
"narHash": "sha256-/2w8cC+Bwut14P33SZydqni+DxvRpRLjq4dSjdfoJio=",
"lastModified": 1765961056,
"narHash": "sha256-RCPRBIqKkwngttpcOhRVMbsCjnKYpc6Q5W7gwp36RN0=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "8486f9144ecebdac9672a34b41e532f5a41fcb19",
"rev": "51bbde565a7538bb4e75defee13b3e951fb0ba81",
"type": "github"
},
"original": {
@@ -545,7 +492,6 @@
},
"root": {
"inputs": {
"beads": "beads",
"darwin": "darwin",
"disko": "disko",
"flake-parts": "flake-parts",
@@ -554,7 +500,7 @@
"homebrew-core": "homebrew-core",
"llm-agents": "llm-agents",
"nix-homebrew": "nix-homebrew",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_2",
"nixvim": "nixvim",
"sops-nix": "sops-nix",
"tangled": "tangled",
@@ -589,11 +535,11 @@
]
},
"locked": {
"lastModified": 1765231718,
"narHash": "sha256-qdBzo6puTgG4G2RHG0PkADg22ZnQo1JmSVFRxrD4QM4=",
"lastModified": 1765836173,
"narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "7fd1416aba1865eddcdec5bb11339b7222c2363e",
"rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63",
"type": "github"
},
"original": {
@@ -675,21 +621,6 @@
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tangled": {
"inputs": {
"actor-typeahead-src": "actor-typeahead-src",
@@ -707,11 +638,11 @@
"sqlite-lib-src": "sqlite-lib-src"
},
"locked": {
"lastModified": 1765368304,
"narHash": "sha256-Q3JC5+FYtsKJU70WIhGhsAYWzu0CvUmmbdYhcFe46Pg=",
"lastModified": 1765955549,
"narHash": "sha256-/Xll477g2g98i+AqprJG3HkPuhcUOiz0VYLD3ENWd6c=",
"ref": "refs/heads/master",
"rev": "a53d124ea4746109c1933f7adc72f0bde1309890",
"revCount": 1731,
"rev": "ae0185bd4b9ba8c928e287b98b53f283756e3542",
"revCount": 1749,
"type": "git",
"url": "https://tangled.org/tangled.org/core"
},
@@ -744,8 +675,8 @@
"zjstatus": {
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_5",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay"
},
"locked": {

1
flake.nix
View File

@@ -28,7 +28,6 @@
nixvim.url = "github:nix-community/nixvim";
zjstatus.url = "github:dj95/zjstatus";
llm-agents.url = "github:numtide/llm-agents.nix";
beads.url = "github:steveyegge/beads";
tangled = {
url = "git+https://tangled.org/tangled.org/core";
inputs.nixpkgs.follows = "nixpkgs";

12
hosts/tahani/default.nix
View File

@@ -48,8 +48,8 @@
];
home.packages = [
inputs.beads.packages.${pkgs.stdenv.hostPlatform.system}.default
inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.amp
inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.beads
];
programs.git.settings.user.email = "christoph@schmatzler.com";
@@ -142,14 +142,4 @@
devices = ["tahani" "chidi"];
};
};
services.caddy = {
enable = true;
virtualHosts."tahani.manticore-hippocampus.ts.net".extraConfig = ''
respond "OK"
'';
};
# Allow Caddy to fetch Tailscale HTTPS certs
services.tailscale.permitCertUid = "caddy";
}

1
profiles/neovim/default.nix
View File

@@ -9,6 +9,7 @@
./plugins/grug-far.nix
./plugins/harpoon.nix
./plugins/hunk.nix
./plugins/jj-diffconflicts.nix
./plugins/lsp.nix
./plugins/mini.nix
./plugins/oil.nix

5
profiles/neovim/mappings.nix
View File

@@ -120,8 +120,9 @@
# g - git
{
mode = "n";
key = "<leader>gd";
action = ":DiffviewOpen<CR>";
key = "<leader>gc";
action = ":JJDiffConflicts<CR>";
options.desc = "Resolve conflicts";
}
{
mode = "n";

13
profiles/neovim/plugins/jj-diffconflicts.nix Normal file
View File

@@ -0,0 +1,13 @@
{pkgs, ...}: {
programs.nixvim.extraPlugins = [
(pkgs.vimUtils.buildVimPlugin {
name = "jj-diffconflicts";
src = pkgs.fetchFromGitHub {
owner = "rafikdraoui";
repo = "jj-diffconflicts";
rev = "main";
hash = "sha256-FXsLSYy+eli8VArUL8ZOiPtyOk4Q8TUYwobEefZPRII=";
};
})
];
}

1
profiles/neovim/plugins/mini.nix
View File

@@ -122,6 +122,7 @@
}
];
};
cmdline = {};
comment = {};
diff = {};
extra = {};