Gabe/nix-config
1
0
Fork 0
Code Issues 12 Pull requests Projects Releases Packages Wiki Activity

flake update, kicad patch got merged.

Browse source
This commit is contained in:
Gabe Venberg 2025-12-27 21:03:03 +01:00
parent 58477a0079
commit 9670012844
17 changed files with 55 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configs/home-manager/common.nix
View file

@ -12,7 +12,7 @@
nixpkgs.overlays = lib.mkIf (config.targets.genericLinux.enable && (inputs ? nixpkgs-fork)) [ nixpkgs.overlays = lib.mkIf (config.targets.genericLinux.enable && (inputs ? nixpkgs-fork)) [
(final: prev: { (final: prev: {
fork = inputs.nixpkgs-fork.legacyPackages.${prev.system}; fork = inputs.nixpkgs-fork.legacyPackages.${prev.stdenv.hostPlatform.system};
}) })
]; ];

12
configs/home-manager/kicad.nix Normal file
View file

@ -0,0 +1,12 @@
{
inputs,
config,
pkgs,
lib,
...
}: {
home.packages = with pkgs; [
(kicad.override {compressStep=false;})
interactive-html-bom
];
}

4
configs/nixos/common.nix
View file

@ -27,7 +27,7 @@ in {
nixpkgs.overlays = lib.mkIf (inputs ? nixpkgs-fork) [ nixpkgs.overlays = lib.mkIf (inputs ? nixpkgs-fork) [
(final: prev: { (final: prev: {
fork = inputs.nixpkgs-fork.legacyPackages.${prev.system}; fork = inputs.nixpkgs-fork.legacyPackages.${prev.stdenv.hostPlatform.system};
}) })
]; ];
@ -46,7 +46,7 @@ in {
# packages that should be on every system. # packages that should be on every system.
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
inputs.nvim-config.packages.${pkgs.system}.nvim-minimal inputs.nvim-config.packages.${pkgs.stdenv.hostPlatform.system}.nvim-minimal
rsync rsync
]; ];

20
configs/nixos/kicad.nix
View file

@ -1,20 +0,0 @@
{
inputs,
config,
pkgs,
lib,
...
}: {
# nixpkgs.config = lib.mkIf (inputs ? nixpkgs-fork) {
# kicad = {compressStep = false;};
# };
nixpkgs.overlays = [
(final: prev: {kicad = inputs.nixpkgs-fork.legacyPackages.${prev.system}.kicad.override {compressStep = false;};})
];
home-manager.users.${config.host.details.user} = {config, ...}: {
home.packages = with pkgs; [
kicad
interactive-html-bom
];
};
}

71
flake.lock generated
View file

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764566768, "lastModified": 1766769718,
"narHash": "sha256-nNBD9vP87t0Sfzdutg09E8zcJG/R2Vqm5qAibkAYqW4=", "narHash": "sha256-HUFMhHktTdcdXL31Bhhjm+35W32xhts7ki67zADYwmw=",
"owner": "9001", "owner": "9001",
"repo": "copyparty", "repo": "copyparty",
"rev": "a31bfe6b2b01de178d8dd17e65cc8d9689ce0cdd", "rev": "4642d32366e30c131d933c8bd0a519b69f4d3fff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,11 +36,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762286984, "lastModified": 1766051518,
"narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=", "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f", "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -56,11 +56,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764350888, "lastModified": 1766150702,
"narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=", "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "2055a08fd0e2fd41318279a5355eb8a161accf26", "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -71,11 +71,11 @@
}, },
"flake-compat": { "flake-compat": {
"locked": { "locked": {
"lastModified": 1761588595, "lastModified": 1766661267,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "narHash": "sha256-QN1r/zNqvXHwWqlRAnRtFf4CQwIOJx58PtdExIzAw94=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "rev": "f275e157c50c3a9a682b4c9b4aa4db7a4cd3b5f2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -109,11 +109,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764544324, "lastModified": 1766850854,
"narHash": "sha256-GVBGjO7UsmzLrlOJV8NlKSxukHaHencrJqWkCA6FkqI=", "narHash": "sha256-asWZx7X5FRrna8ntfE0+vTBUIPLth8R8bckbOpfT3Us=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e4e25a8c310fa45f2a8339c7972dc43d2845a612", "rev": "2d36a6de2fee5cd232b0a28137d95541c21eb7f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,11 +156,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1764440730, "lastModified": 1766568855,
"narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -180,11 +180,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764591717, "lastModified": 1765841014,
"narHash": "sha256-T/HMA0Bb/O6UnlGQ0Xt+wGe1j8m7eyyQ5+vVcCJslsM=", "narHash": "sha256-55V0AJ36V5Egh4kMhWtDh117eE3GOjwq5LhwxDn9eHg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "84d1dab290feb4865d0cfcffc7aa0cf9bc65c3b7", "rev": "be4af8042e7a61fa12fda58fe9a3b3babdefe17b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -196,11 +196,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1764517877, "lastModified": 1766651565,
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,22 +210,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-fork": {
"locked": {
"lastModified": 1762695280,
"narHash": "sha256-AxkzIUAd0XA+Ju21lmnsVEvKH3HXe/s/XMWoputxWs0=",
"owner": "gabevenberg",
"repo": "nixpkgs",
"rev": "554c865ae8c7ba8031359ac30638102b8d379610",
"type": "github"
},
"original": {
"owner": "gabevenberg",
"ref": "kicad-step-fix",
"repo": "nixpkgs",
"type": "github"
}
},
"nvim-config": { "nvim-config": {
"inputs": { "inputs": {
"nixCats": "nixCats", "nixCats": "nixCats",
@ -260,7 +244,6 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-fork": "nixpkgs-fork",
"nvim-config": "nvim-config", "nvim-config": "nvim-config",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
@ -272,11 +255,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764483358, "lastModified": 1766289575,
"narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "5aca6ff67264321d47856a2ed183729271107c9c", "rev": "9836912e37aef546029e48c8749834735a6b9dad",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -5,7 +5,7 @@
# Nixpkgs # Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-fork.url="github:gabevenberg/nixpkgs/kicad-step-fix"; # nixpkgs-fork.url="github:gabevenberg/nixpkgs/nixos-unstable";
# nixpkgs-fork.url = "git+file:///home/gabe/dev/nixpkgs"; # nixpkgs-fork.url = "git+file:///home/gabe/dev/nixpkgs";
nixos-wsl = { nixos-wsl = {

2
hosts/altostratus/default.nix
View file

@ -4,7 +4,6 @@
... ...
}: }:
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs myLib;}; specialArgs = {inherit inputs myLib;};
modules = [ modules = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
@ -25,6 +24,7 @@ inputs.nixpkgs.lib.nixosSystem {
... ...
}: { }: {
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
nixpkgs.hostPlatform ="x86_64-linux";
host.details = { host.details = {
user = "gabe"; user = "gabe";
fullName = "Gabe Venberg"; fullName = "Gabe Venberg";

2
hosts/cirrostratus/default.nix
View file

@ -5,7 +5,6 @@
}: }:
# Karp site server. # Karp site server.
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs myLib;}; specialArgs = {inherit inputs myLib;};
# > Our main nixos configuration file < # > Our main nixos configuration file <
modules = [ modules = [
@ -42,6 +41,7 @@ inputs.nixpkgs.lib.nixosSystem {
fullName = "Gabe Venberg"; fullName = "Gabe Venberg";
gui.enable = false; gui.enable = false;
}; };
nixpkgs.hostPlatform ="x86_64-linux";
boot.zfs.extraPools = ["storage"]; boot.zfs.extraPools = ["storage"];
networking.hostName = "cirrostratus"; # Define your hostname. networking.hostName = "cirrostratus"; # Define your hostname.
networking.hostId = "1b9da0b9"; networking.hostId = "1b9da0b9";

2
hosts/cirrus/default.nix
View file

@ -5,7 +5,6 @@
}: }:
# Hetzner cloud multipurpouse server # Hetzner cloud multipurpouse server
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs myLib;}; specialArgs = {inherit inputs myLib;};
# > Our main nixos configuration file < # > Our main nixos configuration file <
modules = [ modules = [
@ -36,6 +35,7 @@ inputs.nixpkgs.lib.nixosSystem {
gui.enable = false; gui.enable = false;
isVm = true; isVm = true;
}; };
nixpkgs.hostPlatform ="x86_64-linux";
networking.hostName = "cirrus"; # Define your hostname. networking.hostName = "cirrus"; # Define your hostname.
networking.hostId = "908b80b6"; networking.hostId = "908b80b6";
networking.useNetworkd = true; networking.useNetworkd = true;

2
hosts/cumulus/default.nix
View file

@ -4,7 +4,6 @@
... ...
}: }:
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
specialArgs = {inherit inputs myLib;}; specialArgs = {inherit inputs myLib;};
modules = [ modules = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
@ -33,6 +32,7 @@ inputs.nixpkgs.lib.nixosSystem {
"rockchipdrm" "rockchipdrm"
"phy_rockchip_pcie" "phy_rockchip_pcie"
]; ];
nixpkgs.hostPlatform ="x86_64-linux";
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
host.details = { host.details = {
user = "gabe"; user = "gabe";

4
hosts/harmatan/default.nix
View file

@ -4,7 +4,6 @@
... ...
}: }:
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs myLib;}; specialArgs = {inherit inputs myLib;};
modules = [ modules = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
@ -22,7 +21,6 @@ inputs.nixpkgs.lib.nixosSystem {
../../configs/nixos/touchpad.nix ../../configs/nixos/touchpad.nix
../../configs/nixos/i3 ../../configs/nixos/i3
../../configs/nixos/bluetooth.nix ../../configs/nixos/bluetooth.nix
../../configs/nixos/kicad.nix
../../roles/nixos/gaming.nix ../../roles/nixos/gaming.nix
../../roles/nixos/power-saving.nix ../../roles/nixos/power-saving.nix
../../roles/nixos/embedded-dev ../../roles/nixos/embedded-dev
@ -32,6 +30,7 @@ inputs.nixpkgs.lib.nixosSystem {
lib, lib,
... ...
}: { }: {
nixpkgs.hostPlatform ="x86_64-linux";
host.details = { host.details = {
user = "gabe"; user = "gabe";
fullName = "Gabe Venberg"; fullName = "Gabe Venberg";
@ -104,6 +103,7 @@ inputs.nixpkgs.lib.nixosSystem {
../../configs/home-manager/tiny-irc.nix ../../configs/home-manager/tiny-irc.nix
../../configs/home-manager/senpai-irc.nix ../../configs/home-manager/senpai-irc.nix
../../configs/home-manager/halloy-irc.nix ../../configs/home-manager/halloy-irc.nix
../../configs/home-manager/kicad.nix
]; ];
sops = lib.mkIf (inputs ? nix-secrets) { sops = lib.mkIf (inputs ? nix-secrets) {

2
packages/aarch64-iso.nix
View file

@ -5,7 +5,6 @@
... ...
}: }:
(inputs.nixpkgs.lib.nixosSystem { (inputs.nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
specialArgs = {inherit inputs myLib;}; specialArgs = {inherit inputs myLib;};
# > Our main nixos configuration file < # > Our main nixos configuration file <
modules = [ modules = [
@ -37,6 +36,7 @@
"${modulesPath}/installer/scan/detected.nix" "${modulesPath}/installer/scan/detected.nix"
"${modulesPath}/installer/scan/not-detected.nix" "${modulesPath}/installer/scan/not-detected.nix"
]; ];
nixpkgs.hostPlatform ="aarch64-linux";
host.details = { host.details = {
user = "gabe"; user = "gabe";
fullName = "Gabe Venberg"; fullName = "Gabe Venberg";

2
packages/iso.nix
View file

@ -4,7 +4,6 @@
... ...
}: }:
(inputs.nixpkgs.lib.nixosSystem { (inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs myLib;}; specialArgs = {inherit inputs myLib;};
# > Our main nixos configuration file < # > Our main nixos configuration file <
modules = [ modules = [
@ -34,6 +33,7 @@
"${modulesPath}/installer/scan/detected.nix" "${modulesPath}/installer/scan/detected.nix"
"${modulesPath}/installer/scan/not-detected.nix" "${modulesPath}/installer/scan/not-detected.nix"
]; ];
nixpkgs.hostPlatform ="x86_64-linux";
host.details = { host.details = {
user = "gabe"; user = "gabe";
fullName = "Gabe Venberg"; fullName = "Gabe Venberg";

2
packages/proxmox.nix
View file

@ -4,7 +4,6 @@
... ...
}: }:
(inputs.nixpkgs.lib.nixosSystem { (inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs myLib;}; specialArgs = {inherit inputs myLib;};
modules = [ modules = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
@ -18,6 +17,7 @@
... ...
}: { }: {
imports = ["${modulesPath}/virtualisation/proxmox-lxc.nix"]; imports = ["${modulesPath}/virtualisation/proxmox-lxc.nix"];
nixpkgs.hostPlatform ="x86_64-linux";
proxmoxLXC.manageHostName = false; proxmoxLXC.manageHostName = false;
boot.loader.grub.enable = lib.mkForce false; boot.loader.grub.enable = lib.mkForce false;
boot.loader.systemd-boot.enable = lib.mkForce false; boot.loader.systemd-boot.enable = lib.mkForce false;

2
packages/rpi3-sd-image.nix
View file

@ -4,7 +4,6 @@
... ...
}: }:
(inputs.nixpkgs.lib.nixosSystem { (inputs.nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
specialArgs = {inherit inputs myLib;}; specialArgs = {inherit inputs myLib;};
modules = [ modules = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
@ -24,6 +23,7 @@
... ...
}: { }: {
imports = ["${modulesPath}/installer/sd-card/sd-image-aarch64.nix"]; imports = ["${modulesPath}/installer/sd-card/sd-image-aarch64.nix"];
nixpkgs.hostPlatform ="aarch64-linux";
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
host.details = { host.details = {
user = "gabe"; user = "gabe";

2
roles/home-manager/minimal-terminal.nix
View file

@ -31,7 +31,7 @@
curl curl
rsync rsync
p7zip p7zip
inputs.nvim-config.packages.${pkgs.system}.nvim-minimal inputs.nvim-config.packages.${pkgs.stdenv.hostPlatform.system}.nvim-minimal
]; ];
home.sessionVariables = { home.sessionVariables = {

2
roles/home-manager/terminal.nix
View file

@ -18,7 +18,7 @@
fclones fclones
libqalculate libqalculate
f2 f2
inputs.nvim-config.packages.${pkgs.system}.nvim inputs.nvim-config.packages.${pkgs.stdenv.hostPlatform.system}.nvim
#TODO! move this to graphics module? This provides a drag and drop interface from the CLI. #TODO! move this to graphics module? This provides a drag and drop interface from the CLI.
dragon-drop dragon-drop
]; ];