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

Compare commits

base: cschmatzler:90801ae7c79e5cd6904de404c7018d1443bbc7ee
Branches Tags
cschmatzler:master
...
compare: cschmatzler:master
Branches Tags
cschmatzler:master

7 Commits
90801ae7c7 ... master

Author SHA1 Message Date
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
6 changed files with 62 additions and 125 deletions
Expand all files Collapse all files

157
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": 1765786254,
"narHash": "sha256-5n+6D/+iPjGoKZTxGMuNbW2La+Ut0gvytGj9bZNqVkM=",
"owner": "steveyegge",
"repo": "beads",
"rev": "bc3e8f635950876beda546bdb456a814f1bdcdea",
"type": "github"
},
"original": {
"owner": "steveyegge",
"repo": "beads",
"type": "github"
}
},
"blueprint": {
"inputs": {
"nixpkgs": [
"llm-agents",
"nixpkgs"
],
"systems": "systems_2"
"systems": "systems"
},
"locked": {
"lastModified": 1763308703,
@@ -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": {
@@ -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": 1765682243,
"narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
"lastModified": 1765860045,
"narHash": "sha256-7Lxp/PfOy4h3QIDtmWG/EgycaswqRSkDX4DGtet14NE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
"rev": "09de9577d47d8bffb11c449b6a3d24e32ac16c99",
"type": "github"
},
"original": {
@@ -282,11 +245,11 @@
"homebrew-cask": {
"flake": false,
"locked": {
"lastModified": 1765801292,
"narHash": "sha256-hNcm+qC6b+HIkwAMSZhUIocUdeSiaoF73+0QQQbRCjw=",
"lastModified": 1765872721,
"narHash": "sha256-RBrwNiYWYca11tT78S9rN7mt3IemIHKjCcAiB0aM6I4=",
"owner": "homebrew",
"repo": "homebrew-cask",
"rev": "c4dd7bd19aa30a7df017a3fb427690c7ff8cb52e",
"rev": "82be75e553faef02d3ec1bf19a5e7e20f5247ce9",
"type": "github"
},
"original": {
@@ -298,11 +261,11 @@
"homebrew-core": {
"flake": false,
"locked": {
"lastModified": 1765802352,
"narHash": "sha256-nMKwxe+rGPbl7lYhDzwLVu4lOaYAOz4h72HSS5bRjSs=",
"lastModified": 1765878985,
"narHash": "sha256-QO81/BHm6ZtV2KrXUXmd1bB0epdkRjTNf6yR7YGJPMo=",
"owner": "homebrew",
"repo": "homebrew-core",
"rev": "5517542b12d08bf79b887739dcc1aae0c12c5f45",
"rev": "815c7ad127fcc2027c639fb9c93a211c1f2ff3c5",
"type": "github"
},
"original": {
@@ -380,15 +343,15 @@
"llm-agents": {
"inputs": {
"blueprint": "blueprint",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1765768182,
"narHash": "sha256-oyDG26cv3r6zUCLObdWJmf8tIOHYprkWVyuqJx+lleU=",
"lastModified": 1765854155,
"narHash": "sha256-yrECdmBoMhUAA8FqUJ1LbtDjuwn+38OkFgRrwbEq/DU=",
"owner": "numtide",
"repo": "llm-agents.nix",
"rev": "2e7d351f2005dbc95d39cf702e14dc02e43db578",
"rev": "9ee377d02d7e50e2903d9c7fa53138aebd9ae944",
"type": "github"
},
"original": {
@@ -430,27 +393,27 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1760284886,
"narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",
"lastModified": 1765772535,
"narHash": "sha256-aq+dQoaPONOSjtFIBnAXseDm9TUhIbe215TPmkfMYww=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43",
"rev": "09b8fda8959d761445f12b55f380d90375a1d6bb",
"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": 1765644376,
"narHash": "sha256-yqHBL2wYGwjGL2GUF2w3tofWl8qO9tZEuI4wSqbCrtE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "23735a82a828372c4ef92c660864e82fbe2f5fbe",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1765472234,
"narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
"lastModified": 1765779637,
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
"type": "github"
},
"original": {
@@ -491,7 +438,7 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_3": {
"locked": {
"lastModified": 1765644376,
"narHash": "sha256-yqHBL2wYGwjGL2GUF2w3tofWl8qO9tZEuI4wSqbCrtE=",
@@ -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": 1765796308,
"narHash": "sha256-szKgoF0JbDUvWkqjB2AyyFagmsF5ZFEjajZRUiUV9mU=",
"lastModified": 1765841289,
"narHash": "sha256-LpkgAzXRlh+qxbRGIsSy5kOX1oOzlFlZeOt/QmITg5M=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "12a76dd12beccd8d18249b05d10d6acda4e722e0",
"rev": "bdc41e4133d4b9e2c0d4f85265d7cce889b55743",
"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": 1765684837,
"narHash": "sha256-fJCnsYcpQxxy/wit9EBOK33c0Z9U4D3Tvo3gf2mvHos=",
"lastModified": 1765836173,
"narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "94d8af61d8a603d33d1ed3500a33fcf35ae7d3bc",
"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",
@@ -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": {

10
hosts/tahani/default.nix
View File

@@ -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 = {};