Compare commits

..

3 Commits

Author SHA1 Message Date
91512af825 flake 2026-01-16 10:42:04 +00:00
380e81014a rm derek 2026-01-16 10:42:04 +00:00
bccee6dd51 up 2026-01-16 10:42:04 +00:00
8 changed files with 38 additions and 205 deletions

66
flake.lock generated
View File

@@ -128,11 +128,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1767941162, "lastModified": 1768113825,
"narHash": "sha256-7qJDycrXto4xrQWHbj5BkrRWt/hcfZtjlCstEJTyfJ8=", "narHash": "sha256-f09fAifGPEuRrz1DFY910jexq0DaBuQBbq7WcxQIUgs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "80b1a19a713e2558c411f3259fecb1edd4b5b327", "rev": "55106e04d905c6a7726d0f6be77ed39a99f66a61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -254,11 +254,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1768366276, "lastModified": 1768530555,
"narHash": "sha256-NUdsaB6H1wvbOC7oh1UZ7Ojg1I+mYBQv8ovlMB6FbHk=", "narHash": "sha256-EBXKDho4t1YSgodAL6C8M3UTm8MGMZNQ9rQnceR5+6c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4e235a8746b195e335306d898f0cc93ad6c4564c", "rev": "d21bee5abf9fb4a42b2fa7728bf671f8bb246ba6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -270,11 +270,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1768377904, "lastModified": 1768550189,
"narHash": "sha256-e3iYl1dxSuNFaRpFCBEGROh5i9PRhZGxwqWZN47ejtU=", "narHash": "sha256-62/On8avIAcE2sWsFLSlhHF113r1NyfQMhyXoD1J00s=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "e6ce2fb4e105e8736c8df83bd58aa1c79f1c7e13", "rev": "30aeb7cf1a5cc04250649b83cbaaa778826e32a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -286,11 +286,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1768381952, "lastModified": 1768556326,
"narHash": "sha256-Jv9ZOq8PRLfXZ7VDCMJoPVYZvLjJDzgaiKflU0fj6Qk=", "narHash": "sha256-lHUFstndOYQB3xia6Tq3Gc0Fxm8KgyVIuOPRJtnyxOQ=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "ba0786407a5cb72d3adad8431af343d32882c31e", "rev": "0e778dfaed298c94481e8b8c51d828c23767743f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -322,11 +322,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1768370489, "lastModified": 1768533022,
"narHash": "sha256-/tZo3ePuv6gbJ+OUAtn/vIL/NHwXmVdmTqwpRKKYuW4=", "narHash": "sha256-z2A4JDlOQ0KxHO4XLSoTArhi3BcYqoKuoMD2mPvZ1sQ=",
"owner": "numtide", "owner": "numtide",
"repo": "llm-agents.nix", "repo": "llm-agents.nix",
"rev": "41130668102a77795069d950e001926dd7542c99", "rev": "765ba8f934426582f38b6adfc1da6d57942f83f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -344,11 +344,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1768073227, "lastModified": 1768420401,
"narHash": "sha256-tmr6CNYSa0qoNe+5z39+as3Z0baKmF9pe485Z3DVVNU=", "narHash": "sha256-+N/snjGktzQ3wz1F7jZdlqQeW0FPXc0QZ4SUX1ll+Do=",
"owner": "jnsahaj", "owner": "jnsahaj",
"repo": "lumen", "repo": "lumen",
"rev": "dd570ede2d65052ebedb265127c01b1423a67827", "rev": "bd29015ba21f8bc91efdab9c8ebf20f4f7ba3d8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -398,11 +398,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1768302833, "lastModified": 1768395095,
"narHash": "sha256-h5bRFy9bco+8QcK7rGoOiqMxMbmn21moTACofNLRMP4=", "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "61db79b0c6b838d9894923920b612048e1201926", "rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -429,11 +429,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1768381560, "lastModified": 1768554546,
"narHash": "sha256-iBGGNRRhSRUwk3YXVTqV1yo9OIo77GMXvH24JXPRQ8s=", "narHash": "sha256-2bOcZETz9i9RzVgv2hcE7lBTUu+8pP1pmKXSBpIm5nU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "afcce51e9741862bb9381853a94f7580a4ad1978", "rev": "6c3f4b0f21b4ec5cd82ebf7ad77a71ef9e52e623",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -482,11 +482,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1767906546, "lastModified": 1768486009,
"narHash": "sha256-AoSWS8+P+7hQ/jIdv0wBjgH1MvnerdWBFXO4GV3JoQs=", "narHash": "sha256-I7ymDe6UQooHy9I9wrafKCCDnRbox/EMWAgJgpm7fGs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "7eb8f36f085b85a2aeff929aff52d0f6aa14e000", "rev": "03a638205b5cb04ba9c2ed6c604e137b15f07fa1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -517,11 +517,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1767905519, "lastModified": 1768083390,
"narHash": "sha256-mRU9VEhGQE9dnOU3pu1Rx3dZO4NpZO+cnC0rPMFcCqE=", "narHash": "sha256-TGWPJq2mXwxfAe83iZ18DIqXC4sOSj7RkW9b59h6Ox4=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "ff9a2e88b14907562294838f83963e5966f717de", "rev": "e42e8ff582ba12a88b6845525d08b6428e6d0fb9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -559,11 +559,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1768271704, "lastModified": 1768481291,
"narHash": "sha256-jJqlW8A3OZ5tYbXphF7U8P8g/3Cn8PPwPa4YlJ/9agg=", "narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "691b8b6713855d0fe463993867291c158472fc6f", "rev": "e085e303dfcce21adcb5fec535d65aacb066f101",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -54,7 +54,7 @@
inherit (constants) user; inherit (constants) user;
darwinHosts = ["chidi" "jason"]; darwinHosts = ["chidi" "jason"];
nixosHosts = ["derek" "michael" "tahani"]; nixosHosts = ["michael" "tahani"];
overlays = import ./overlays {inherit inputs;}; overlays = import ./overlays {inherit inputs;};
nixpkgsConfig = hostPlatform: { nixpkgsConfig = hostPlatform: {

View File

@@ -1,54 +0,0 @@
{...}: {
programs.vdirsyncer = {
enable = true;
};
programs.khal = {
enable = true;
locale = {
local_timezone = "Europe/Berlin";
default_timezone = "Europe/Berlin";
timeformat = "%H:%M";
dateformat = "%d/%m/%Y";
longdateformat = "%d/%m/%Y";
datetimeformat = "%d/%m/%Y %H:%M";
longdatetimeformat = "%d/%m/%Y %H:%M";
};
};
accounts.calendar = {
basePath = ".local/share/calendars";
accounts.icloud = {
primary = true;
primaryCollection = "home";
remote = {
type = "caldav";
url = "https://caldav.icloud.com/";
userName = "christoph@schmatzler.com";
passwordCommand = ["cat" "/run/secrets/derek-icloud-password"];
};
local = {
type = "filesystem";
fileExt = ".ics";
};
vdirsyncer = {
enable = true;
collections = ["from a" "from b"];
metadata = ["color" "displayname"];
};
khal = {
enable = true;
type = "discover";
};
};
};
services.vdirsyncer = {
enable = true;
frequency = "*:0/15";
};
}

View File

@@ -1,53 +0,0 @@
{
pkgs,
inputs,
user,
hostname,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
(modulesPath + "/profiles/qemu-guest.nix")
./disk-config.nix
./hardware-configuration.nix
./secrets.nix
../../profiles/core.nix
../../profiles/fail2ban.nix
../../profiles/nixos.nix
../../profiles/openssh.nix
../../profiles/tailscale.nix
inputs.disko.nixosModules.disko
inputs.sops-nix.nixosModules.sops
];
networking.hostName = hostname;
environment.systemPackages = with pkgs; [
chromium
playwright-driver.browsers
];
home-manager.users.${user} = {
imports = [
../../profiles/bash.nix
../../profiles/bat.nix
../../profiles/direnv.nix
../../profiles/eza.nix
../../profiles/fish.nix
../../profiles/fzf.nix
../../profiles/git.nix
../../profiles/home.nix
../../profiles/jjui.nix
../../profiles/jujutsu.nix
../../profiles/lazygit.nix
../../profiles/neovim
../../profiles/ripgrep.nix
../../profiles/ssh.nix
../../profiles/starship.nix
../../profiles/zoxide.nix
./calendar.nix
inputs.nixvim.homeModules.nixvim
];
};
}

View File

@@ -1,37 +0,0 @@
{
disko.devices = {
disk = {
main = {
type = "disk";
device = "/dev/sda";
content = {
type = "gpt";
partitions = {
boot = {
size = "1M";
type = "EF02";
};
ESP = {
size = "512M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = ["umask=0077"];
};
};
root = {
size = "100%";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/";
};
};
};
};
};
};
};
}

View File

@@ -1,18 +0,0 @@
{
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = [];
boot.extraModulePackages = [];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
networking.useDHCP = lib.mkDefault true;
}

View File

@@ -1,9 +0,0 @@
{user, ...}: {
sops.secrets = {
derek-icloud-password = {
sopsFile = ../../secrets/derek-icloud-password;
format = "binary";
owner = user;
};
};
}

View File

@@ -27,6 +27,10 @@ with pkgs;
hledger hledger
htop htop
hyperfine hyperfine
inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.amp
inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.codex
inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.ccusage-codex
inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.ccusage-opencode
jq jq
killall killall
lsof lsof