jan-leila/nix-config
1
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into storage-refactor

Browse source
This commit is contained in:
Leyla Becker 2026-01-15 19:55:56 -06:00
commit ff08812447
9 changed files with 85 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configurations/home-manager/leyla/packages/default.nix
View file

@ -75,6 +75,7 @@ in {
proton-mail-pwa.enable = true; proton-mail-pwa.enable = true;
proton-calendar-pwa.enable = true; proton-calendar-pwa.enable = true;
matrix-cyberia-pwa.enable = true; matrix-cyberia-pwa.enable = true;
kicad.enable = true;
}) })
]; ];
} }

3
configurations/home-manager/leyla/packages/vscode/default.nix
View file

@ -72,6 +72,9 @@ in {
# rust development # rust development
rustAnalyzer.enable = true; rustAnalyzer.enable = true;
# arduino development
platformIO.enable = true;
# claude development # claude development
claudeDev = lib.mkIf ai-tooling-enabled { claudeDev = lib.mkIf ai-tooling-enabled {
enable = true; enable = true;

77
flake.lock generated
View file

@ -28,11 +28,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1767911574, "lastModified": 1768500104,
"narHash": "sha256-JsYIPaTgbJHEb1rgzwS9H+c0hCy/Sr1WaxNgtvu6xro=", "narHash": "sha256-Xa8XJaydHKAhDCLyjdKcDKjFrGgdahNcVo1boGUdZKY=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "0d02843bec4ca8a16f7f08c25fe4e40cd829de0f", "rev": "7e517454cd248c76046c3157b56662d223de29b1",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -115,32 +115,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767909183, "lastModified": 1768512489,
"narHash": "sha256-u/bcU0xePi5bgNoRsiqSIwaGBwDilKKFTz3g0hqOBAo=", "narHash": "sha256-jZi945d3e6DYhrw3K5Pew+QaL3qSgq3O6xiVaEVLgXs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "cd6e96d56ed4b2a779ac73a1227e0bb1519b3509", "rev": "bba859cd85b90dd9e4e6fd44b2af4aa64ae801a1",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"impermanence",
"nixpkgs"
]
},
"locked": {
"lastModified": 1747978958,
"narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "7419250703fd5eb50e99bdfb07a86671939103ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -213,9 +192,7 @@
"mcp-nixos": { "mcp-nixos": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": [ "nixpkgs": "nixpkgs"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1767822362, "lastModified": 1767822362,
@ -238,11 +215,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767718503, "lastModified": 1768220509,
"narHash": "sha256-V+VkFs0aSG0ca8p/N3gib7FAf4cq9jyr5Gm+ZBrHQpo=", "narHash": "sha256-8wMrJP/Xk5Dkm0TxzaERLt3eGFEhHTWaJKUpK3AoL4o=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "9f48ffaca1f44b3e590976b4da8666a9e86e6eb1", "rev": "7b1d394e7d9112d4060e12ef3271b38a7c43e83b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -279,11 +256,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767838417, "lastModified": 1768443224,
"narHash": "sha256-UJ6qBXzOh/FMYgP/OlM8QeKolpQYN0198onIu8oB6dM=", "narHash": "sha256-U2UHV+8Ygba2eFhFSnl15wMuKqNR884V2mo2fLO9wy0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "4e92639f25e4f530990a99a32da696ee9117eb1e", "rev": "151bb82df60a9ffcd2fef1116e4c9baf133b3ec5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -294,11 +271,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1767185284, "lastModified": 1768499669,
"narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", "narHash": "sha256-jJr/zDxu5evfQxlXtMrFFF68/RNj1UrctS/eIsay4k0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", "rev": "7297dfc69ae9b06e984a6f69900ce25e67c76f46",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -310,15 +287,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1748026106, "lastModified": 1767640445,
"narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -341,11 +318,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1767767207, "lastModified": 1768305791,
"narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -455,11 +432,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767826491, "lastModified": 1768481291,
"narHash": "sha256-WSBENPotD2MIhZwolL6GC9npqgaS5fkM7j07V2i/Ur8=", "narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "ea3adcb6d2a000d9a69d0e23cad1f2cacb3a9fbe", "rev": "e085e303dfcce21adcb5fec535d65aacb066f101",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -77,7 +77,7 @@
# MCP NixOS server for Claude Dev # MCP NixOS server for Claude Dev
mcp-nixos = { mcp-nixos = {
url = "github:utensils/mcp-nixos"; url = "github:utensils/mcp-nixos";
inputs.nixpkgs.follows = "nixpkgs"; # Not following nixpkgs because aws-sam-translator doesn't support Python 3.14 yet
}; };
# Noita Entangled Worlds package # Noita Entangled Worlds package

1
modules/home-manager-modules/programs/default.nix
View file

@ -14,6 +14,7 @@
./prostudiomasters.nix ./prostudiomasters.nix
./idea.nix ./idea.nix
./kdenlive.nix ./kdenlive.nix
./kicad.nix
./krita.nix ./krita.nix
./protonvpn.nix ./protonvpn.nix
./calibre.nix ./calibre.nix

23
modules/home-manager-modules/programs/kicad.nix Normal file
View file

@ -0,0 +1,23 @@
{
lib,
pkgs,
config,
...
}: {
options.programs.kicad = {
enable = lib.mkEnableOption "enable kicad";
};
config = lib.mkIf config.programs.kicad.enable (lib.mkMerge [
{
home.packages = with pkgs; [
kicad
];
}
(
lib.mkIf config.impermanence.enable {
# TODO:
}
)
]);
}

1
modules/home-manager-modules/programs/vscode/default.nix
View file

@ -16,6 +16,7 @@
./go.nix ./go.nix
./evenBetterToml.nix ./evenBetterToml.nix
./openRemoteSsh.nix ./openRemoteSsh.nix
./platformIO.nix
./rustAnalyzer.nix ./rustAnalyzer.nix
./astroVscode.nix ./astroVscode.nix
./vscodeMdx.nix ./vscodeMdx.nix

27
modules/home-manager-modules/programs/vscode/platformIO.nix Normal file
View file

@ -0,0 +1,27 @@
{
lib,
pkgs,
config,
...
}: let
pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
pkgsRepository = pkgsRepositories.open-vsx;
in {
options.programs.vscode.profiles = lib.mkOption {
type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
options = {
extraExtensions.platformIO = {
enable = lib.mkEnableOption "should the platformIO extension for vscode be enabled";
extension = lib.mkPackageOption pkgsRepository "platformIO" {
default = ["pioarduino" "pioarduino-ide"];
};
};
};
config = lib.mkIf config.extraExtensions.platformIO.enable {
extensions = [
config.extraExtensions.platformIO.extension
];
};
}));
};
}

2
util/default.nix
View file

@ -10,7 +10,7 @@
nix-syncthing = inputs.nix-syncthing; nix-syncthing = inputs.nix-syncthing;
disko = inputs.disko; disko = inputs.disko;
impermanence = inputs.impermanence; impermanence = inputs.impermanence;
lix-module = inputs.lix-module; # lix-module = inputs.lix-module;
systems = [ systems = [
"aarch64-darwin" "aarch64-darwin"