Merge branch 'b12f' into remove-digga/b12f
This commit is contained in:
commit
d205236a4c
150
flake.lock
150
flake.lock
|
@ -63,9 +63,9 @@
|
|||
},
|
||||
"deno2nix": {
|
||||
"inputs": {
|
||||
"devshell": "devshell_2",
|
||||
"devshell": "devshell",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
|
@ -109,17 +109,18 @@
|
|||
"devshell": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"keycloak-theme-pub-solar",
|
||||
"scan2paperless",
|
||||
"deno2nix",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1688380630,
|
||||
"narHash": "sha256-8ilApWVb1mAi4439zS3iFeIT0ODlbrifm/fegWwgHjA=",
|
||||
"lastModified": 1685972731,
|
||||
"narHash": "sha256-VpwVUthxs3AFgvWxGTHu+KVDnS/zT3xkCtmjX2PjNQs=",
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"rev": "f9238ec3d75cefbb2b42a44948c4e8fb1ae9a205",
|
||||
"rev": "6b2554d28d46bfa6e24b941e999a145760dad0e1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -132,7 +133,6 @@
|
|||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"scan2paperless",
|
||||
"deno2nix",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_3"
|
||||
|
@ -151,60 +151,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"devshell_3": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"scan2paperless",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1685972731,
|
||||
"narHash": "sha256-VpwVUthxs3AFgvWxGTHu+KVDnS/zT3xkCtmjX2PjNQs=",
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"rev": "6b2554d28d46bfa6e24b941e999a145760dad0e1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fix-atomic-container-restarts": {
|
||||
"locked": {
|
||||
"lastModified": 1688325567,
|
||||
"narHash": "sha256-7thz5UlbgR9LNWOoPKMtpchI8U1EQpj6p4FhIGe3ZRI=",
|
||||
"owner": "pub-solar",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2a04ada27acb5a7401f8265e9d0a6db0f259cafb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "pub-solar",
|
||||
"ref": "fix/atomic-container-restarts",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fix-yubikey-agent": {
|
||||
"locked": {
|
||||
"lastModified": 1654372286,
|
||||
"narHash": "sha256-z1WrQkL67Sosz1VnuKQLpzEkEl4ianeLpWJX8Q6bVQY=",
|
||||
"owner": "pub-solar",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4995a873a796c54cc49e5dca9e1d20350eceec7b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "pub-solar",
|
||||
"ref": "fix/use-latest-unstable-yubikey-agent",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
@ -274,24 +220,6 @@
|
|||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1689068808,
|
||||
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_3": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1685518550,
|
||||
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
|
||||
|
@ -306,9 +234,9 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_4": {
|
||||
"flake-utils_3": {
|
||||
"inputs": {
|
||||
"systems": "systems_6"
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1685518550,
|
||||
|
@ -345,29 +273,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"keycloak-theme-pub-solar": {
|
||||
"inputs": {
|
||||
"devshell": "devshell",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1689875310,
|
||||
"narHash": "sha256-gJxh8fVX24nZXBxstZcrzZhMRFG9jyOnQEfkgoRr39I=",
|
||||
"ref": "main",
|
||||
"rev": "c2c86bbf9855f16a231a596b75b443232a7b9395",
|
||||
"revCount": 24,
|
||||
"type": "git",
|
||||
"url": "https://git.pub.solar/pub-solar/keycloak-theme"
|
||||
},
|
||||
"original": {
|
||||
"ref": "main",
|
||||
"type": "git",
|
||||
"url": "https://git.pub.solar/pub-solar/keycloak-theme"
|
||||
}
|
||||
},
|
||||
"master": {
|
||||
"locked": {
|
||||
"lastModified": 1693817516,
|
||||
|
@ -540,12 +445,9 @@
|
|||
"adblock-unbound": "adblock-unbound",
|
||||
"agenix": "agenix",
|
||||
"deploy-rs": "deploy-rs",
|
||||
"fix-atomic-container-restarts": "fix-atomic-container-restarts",
|
||||
"fix-yubikey-agent": "fix-yubikey-agent",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"home-manager": "home-manager",
|
||||
"keycloak-theme-pub-solar": "keycloak-theme-pub-solar",
|
||||
"master": "master",
|
||||
"musnix": "musnix",
|
||||
"nix-darwin": "nix-darwin",
|
||||
|
@ -559,8 +461,8 @@
|
|||
"scan2paperless": {
|
||||
"inputs": {
|
||||
"deno2nix": "deno2nix",
|
||||
"devshell": "devshell_3",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"devshell": "devshell_2",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
|
@ -637,36 +539,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"
|
||||
}
|
||||
},
|
||||
"systems_6": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1696019113,
|
||||
|
|
28
flake.nix
28
flake.nix
|
@ -13,6 +13,7 @@
|
|||
|
||||
nix-darwin.url = "github:lnl7/nix-darwin/master";
|
||||
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
home-manager.url = "github:nix-community/home-manager/release-23.05";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
|
@ -29,15 +30,9 @@
|
|||
|
||||
nixos-hardware.url = "github:nixos/nixos-hardware";
|
||||
|
||||
keycloak-theme-pub-solar.url = "git+https://git.pub.solar/pub-solar/keycloak-theme?ref=main";
|
||||
keycloak-theme-pub-solar.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
master.url = "github:nixos/nixpkgs/master";
|
||||
fix-yubikey-agent.url = "github:pub-solar/nixpkgs/fix/use-latest-unstable-yubikey-agent";
|
||||
fix-atomic-container-restarts.url = "github:pub-solar/nixpkgs/fix/atomic-container-restarts";
|
||||
scan2paperless.url = "git+https://git.pub.solar/b12f/scan2paperless.git";
|
||||
musnix.url = "github:musnix/musnix";
|
||||
|
||||
adblock-unbound.url = "github:MayNiklas/nixos-adblock-unbound";
|
||||
adblock-unbound.inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
@ -53,6 +48,7 @@
|
|||
|
||||
imports = [
|
||||
inputs.nixos-flake.flakeModule
|
||||
./lib
|
||||
./modules
|
||||
./hosts
|
||||
./users
|
||||
|
@ -69,7 +65,6 @@
|
|||
};
|
||||
unstable = import inputs.unstable { inherit system; };
|
||||
master = import inputs.master { inherit system; };
|
||||
fix-yubikey-agent = import inputs.fix-yubikey-agent { inherit system; };
|
||||
};
|
||||
|
||||
devShells.default = pkgs.mkShell {
|
||||
|
@ -94,14 +89,12 @@
|
|||
lib,
|
||||
unstable,
|
||||
master,
|
||||
fix-yubikey-agent,
|
||||
...
|
||||
}: {
|
||||
nixpkgs.overlays = (import ./overlays) ++ [
|
||||
(prev: next: {
|
||||
scan2paperless = inputs.scan2paperless.legacyPackages.${prev.system}.scan2paperless;
|
||||
nixd = inputs.unstable.legacyPackages.${prev.system}.nixd;
|
||||
yubikey-agent = inputs.fix-yubikey-agent.legacyPackages.${prev.system}.yubikey-agent;
|
||||
|
||||
factorio-headless = inputs.master.legacyPackages.${prev.system}.factorio-headless;
|
||||
paperless-ngx = inputs.master.legacyPackages.${prev.system}.paperless-ngx;
|
||||
|
@ -147,6 +140,23 @@
|
|||
self.nixosModules.root
|
||||
];
|
||||
};
|
||||
|
||||
deploy.nodes = {
|
||||
droppie.profiles.system = {
|
||||
hostname = "backup.b12f.io";
|
||||
sshUser = "yule";
|
||||
path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.droppie;
|
||||
};
|
||||
|
||||
pie.profiles.system = {
|
||||
hostname = "pie.local";
|
||||
sshUser = "yule";
|
||||
};
|
||||
|
||||
maoam.profiles.system = {
|
||||
sshUser = "b12f";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -257,7 +257,7 @@ in ''
|
|||
<qemu:arg value='-device'/>
|
||||
<qemu:arg value='hda-micro,audiodev=hda'/>
|
||||
<qemu:arg value='-audiodev'/>
|
||||
<qemu:arg value='pa,id=hda,server=unix:/run/user/1001/pulse/native'/>
|
||||
<qemu:arg value='pa,id=hda,server=unix:/run/user/1003/pulse/native'/>
|
||||
</qemu:commandline>
|
||||
</domain>
|
||||
''
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
reservations = [
|
||||
{
|
||||
hostname = "droppie.local";
|
||||
hw-address = "08:F1:EA:97:0F:0C";
|
||||
hw-address = "08:f1:ea:97:0f:0c";
|
||||
ip-address = "192.168.178.3";
|
||||
}
|
||||
{
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
services.cron = {
|
||||
enable = true;
|
||||
systemCronJobs = [
|
||||
"30 1 * * * wake-droppie ${pkgs.wakeonlan}/bin/wakeonlan 08:F1:EA:97:0F:0C"
|
||||
"30 1 * * * root ${pkgs.wakeonlan}/bin/wakeonlan 08:f1:ea:97:0f:0c"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
3
overlays/element-desktop.nix
Normal file
3
overlays/element-desktop.nix
Normal file
|
@ -0,0 +1,3 @@
|
|||
final: prev: {
|
||||
element-desktop = prev.element-desktop.override { electron = prev.electron_24; };
|
||||
}
|
|
@ -20,6 +20,7 @@ channels: final: prev: {
|
|||
paperless-ngx
|
||||
waybar
|
||||
element-desktop
|
||||
signal-desktop
|
||||
;
|
||||
|
||||
haskellPackages =
|
||||
|
|
|
@ -2,6 +2,7 @@ final: prev: {
|
|||
signal-desktop = prev.signal-desktop.overrideAttrs (oldAttrs: rec {
|
||||
inherit (oldAttrs) pname;
|
||||
dir = "Signal";
|
||||
electron = prev.electron_24;
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
|
|
|
@ -62,6 +62,11 @@ in {
|
|||
user = "root";
|
||||
};
|
||||
|
||||
"demo2.prod.test" = {
|
||||
hostname = "10.0.0.5";
|
||||
user = "root";
|
||||
};
|
||||
|
||||
"proxy1.test.test" = {
|
||||
hostname = "10.0.0.8";
|
||||
user = "root";
|
||||
|
|
|
@ -31,6 +31,11 @@ in {
|
|||
programs.ssh = {
|
||||
enable = true;
|
||||
matchBlocks = {
|
||||
"pie.local" = {
|
||||
hostname = "pie.local";
|
||||
user = "yule";
|
||||
};
|
||||
|
||||
"git.b12f.io" = {
|
||||
hostname = "git.b12f.io";
|
||||
user = "git";
|
||||
|
|
Loading…
Reference in a new issue