erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:dd4f4efba50dbcbc59514a0efd8ea798c2d1a33a
Branches Tags
erwin:main
..
compare: erwin:29ba70166693481715085de13e56832b9b096b24
Branches Tags
erwin:main

No commits in common. "dd4f4efba50dbcbc59514a0efd8ea798c2d1a33a" and "29ba70166693481715085de13e56832b9b096b24" have entirely different histories.
dd4f4efba5 ... 29ba701666

6 changed files with 114 additions and 32 deletions
Show stats Expand all files Collapse all files

128
flake.lock
View file

@ -31,11 +31,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1729116596,
"narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=",
"lastModified": 1728577371,
"narHash": "sha256-f3bKclEV5t1eP1OH7kTGv/tLzlToSRIe0ktkdl1jihw=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782",
"rev": "e5c8d2d50981a34602358d917e7be011b2c397a8",
"type": "github"
},
"original": {
@ -193,11 +193,11 @@
]
},
"locked": {
"lastModified": 1729099656,
"narHash": "sha256-VftVIg7UXTy1bq+tzi1aVYOWl7PQ35IpjW88yMYjjpc=",
"lastModified": 1728922573,
"narHash": "sha256-FegyBabjV4868aJUbvFtqH0zKDEtUpeCAfnB1vWXeBg=",
"owner": "nix-community",
"repo": "disko",
"rev": "d7d57edb72e54891fa67a6f058a46b2bb405663b",
"rev": "3b778f10eb275573da9f5c8a7a49e774200b87e5",
"type": "github"
},
"original": {
@ -217,11 +217,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1729130734,
"narHash": "sha256-U1bIksHGGN/bObrRoiJxov51rVM3A5gNqw5oamo7yEI=",
"lastModified": 1728966217,
"narHash": "sha256-oP4ocNELjYaIjpjq7GOqrMjgc6IfxmFh34UxnzZYEFI=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "3ff861b0b86704afa226b70312b584bfcdb46bd7",
"rev": "b195d7067b4f14651ed55660d7a9a3d8e38afc6d",
"type": "github"
},
"original": {
@ -334,6 +334,22 @@
"type": "github"
}
},
"flake-compat_6": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@ -427,6 +443,24 @@
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"git-fs-monitor": {
"inputs": {
"crane": "crane_2",
@ -517,11 +551,11 @@
]
},
"locked": {
"lastModified": 1729027341,
"narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=",
"lastModified": 1728903686,
"narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2a4fd1cfd8ed5648583dadef86966a8231024221",
"rev": "e1aec543f5caf643ca0d94b6a633101942fd065f",
"type": "github"
},
"original": {
@ -600,6 +634,28 @@
"type": "github"
}
},
"nix-ld-rs": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1723871880,
"narHash": "sha256-HKHx2tDZEcKTKKkhyIDRifJW7a4bxOsWlvIVI1qm+ng=",
"owner": "nix-community",
"repo": "nix-ld-rs",
"rev": "8af5fc9add315c251edea8f659b56fc7836a163f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-ld-rs",
"type": "github"
}
},
"nixos-facter-modules": {
"locked": {
"lastModified": 1728725827,
@ -676,11 +732,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1728909085,
"narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=",
"lastModified": 1728740863,
"narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8",
"rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077",
"type": "github"
},
"original": {
@ -724,11 +780,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1728888510,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
"lastModified": 1728492678,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
"type": "github"
},
"original": {
@ -768,7 +824,7 @@
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-compat": "flake-compat_6",
"gitignore": "gitignore",
"nixpkgs": [
"nixpkgs"
@ -776,11 +832,11 @@
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1729104314,
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"lastModified": 1728778939,
"narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
"type": "github"
},
"original": {
@ -806,6 +862,7 @@
"microvm": "microvm",
"naersk": "naersk",
"nil": "nil",
"nix-ld-rs": "nix-ld-rs",
"nixos-facter-modules": "nixos-facter-modules",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2",
@ -823,11 +880,11 @@
]
},
"locked": {
"lastModified": 1729132166,
"narHash": "sha256-Mhl4T7gDGknG4nPbHNSGWynfSjZeoWBdsaIzhUYuIlU=",
"lastModified": 1728959392,
"narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "32d889f9b9fc65cb65aa2d5db282d60ed06f348e",
"rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b",
"type": "github"
},
"original": {
@ -919,6 +976,21 @@
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@ -926,11 +998,11 @@
]
},
"locked": {
"lastModified": 1729077719,
"narHash": "sha256-zayHqZO9gA1U85c4CPvVSnLV8/cBgc2yVrSKWaKeBUs=",
"lastModified": 1727984844,
"narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "5307ba60125bb024d7e52d71d582eafd511f3fee",
"rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
"type": "github"
},
"original": {

5
flake.nix
View file

@ -87,6 +87,11 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nix-ld-rs = {
url = "github:nix-community/nix-ld-rs";
inputs.nixpkgs.follows = "nixpkgs";
};
attic = {
url = "github:zhaofengli/attic";
# inputs.nixpkgs.follows = "nixpkgs";

3
machines/loki/configuration.nix
View file

@ -1,4 +1,4 @@
{ nixos-hardware, ... }:
{ nixos-hardware, nix-ld-rs, ... }:
{ pkgs, config, ... }:
{
imports = [
@ -448,6 +448,7 @@
nix-ld = {
enable = true;
package = nix-ld-rs.packages.${pkgs.hostPlatform.system}.nix-ld-rs;
libraries = with pkgs; [
alsa-lib
at-spi2-atk

2
machines/mimir/configuration.nix
View file

@ -1,6 +1,7 @@
{
nixos-hardware,
microvm,
nix-ld-rs,
attic,
...
}:
@ -368,6 +369,7 @@
gnome-disks.enable = true;
nix-ld = {
enable = true;
package = nix-ld-rs.packages.${pkgs.hostPlatform.system}.nix-ld-rs;
libraries = with pkgs; [
alsa-lib
at-spi2-atk

2
machines/odin/configuration.nix
View file

@ -1,6 +1,7 @@
{
nixos-hardware,
disko,
nix-ld-rs,
...
}:
{ pkgs, config, ... }:
@ -118,6 +119,7 @@
bandwhich.enable = true;
nix-ld = {
enable = true;
package = nix-ld-rs.packages.${pkgs.hostPlatform.system}.nix-ld-rs;
};
};

6
modules/barman/default.nix
View file

@ -112,9 +112,9 @@ in
services.barman = {
description = "Run barman maintenance tasks";
path = runtimeInputs;
environment = {
HOME = cfg.settings.barman.barman_home;
};
# environment = {
# PGPASSFILE = lib.mkIf (cfg.passwordsFile != null) cfg.passwordsFile;
# };
serviceConfig = {
Type = "oneshot";