pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

Remove digga from b12f branch #257

Merged
b12f merged 4 commits from remove-digga/b12f into b12f 2023-10-03 12:23:15 +00:00
Conversation 0 Commits 4 Files changed 89 +48 -151
10 changed files with 48 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d205236a4c - Show all commits

150
flake.lock
View file

@ -63,9 +63,9 @@
}, },
"deno2nix": { "deno2nix": {
"inputs": { "inputs": {
"devshell": "devshell_2", "devshell": "devshell",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
@ -109,17 +109,18 @@
"devshell": { "devshell": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"keycloak-theme-pub-solar", "scan2paperless",
"deno2nix",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1688380630, "lastModified": 1685972731,
"narHash": "sha256-8ilApWVb1mAi4439zS3iFeIT0ODlbrifm/fegWwgHjA=", "narHash": "sha256-VpwVUthxs3AFgvWxGTHu+KVDnS/zT3xkCtmjX2PjNQs=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "f9238ec3d75cefbb2b42a44948c4e8fb1ae9a205", "rev": "6b2554d28d46bfa6e24b941e999a145760dad0e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -132,7 +133,6 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"scan2paperless", "scan2paperless",
"deno2nix",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_3" "systems": "systems_3"
@ -151,60 +151,6 @@
"type": "github" "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-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -274,24 +220,6 @@
"inputs": { "inputs": {
"systems": "systems_2" "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": { "locked": {
"lastModified": 1685518550, "lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
@ -306,9 +234,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1685518550,
@ -345,29 +273,6 @@
"type": "github" "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": { "master": {
"locked": { "locked": {
"lastModified": 1693817516, "lastModified": 1693817516,
@ -540,12 +445,9 @@
"adblock-unbound": "adblock-unbound", "adblock-unbound": "adblock-unbound",
"agenix": "agenix", "agenix": "agenix",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"fix-atomic-container-restarts": "fix-atomic-container-restarts",
"fix-yubikey-agent": "fix-yubikey-agent",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"home-manager": "home-manager", "home-manager": "home-manager",
"keycloak-theme-pub-solar": "keycloak-theme-pub-solar",
"master": "master", "master": "master",
"musnix": "musnix", "musnix": "musnix",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
@ -559,8 +461,8 @@
"scan2paperless": { "scan2paperless": {
"inputs": { "inputs": {
"deno2nix": "deno2nix", "deno2nix": "deno2nix",
"devshell": "devshell_3", "devshell": "devshell_2",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
@ -637,36 +539,6 @@
"type": "github" "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": { "unstable": {
"locked": { "locked": {
"lastModified": 1696019113, "lastModified": 1696019113,

28
flake.nix
View file

@ -13,6 +13,7 @@
nix-darwin.url = "github:lnl7/nix-darwin/master"; nix-darwin.url = "github:lnl7/nix-darwin/master";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager/release-23.05"; home-manager.url = "github:nix-community/home-manager/release-23.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
@ -29,15 +30,9 @@
nixos-hardware.url = "github:nixos/nixos-hardware"; 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"; 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"; scan2paperless.url = "git+https://git.pub.solar/b12f/scan2paperless.git";
musnix.url = "github:musnix/musnix"; musnix.url = "github:musnix/musnix";
adblock-unbound.url = "github:MayNiklas/nixos-adblock-unbound"; adblock-unbound.url = "github:MayNiklas/nixos-adblock-unbound";
adblock-unbound.inputs.nixpkgs.follows = "nixpkgs"; adblock-unbound.inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -53,6 +48,7 @@
imports = [ imports = [
inputs.nixos-flake.flakeModule inputs.nixos-flake.flakeModule
./lib
./modules ./modules
./hosts ./hosts
./users ./users
@ -69,7 +65,6 @@
}; };
unstable = import inputs.unstable { inherit system; }; unstable = import inputs.unstable { inherit system; };
master = import inputs.master { inherit system; }; master = import inputs.master { inherit system; };
fix-yubikey-agent = import inputs.fix-yubikey-agent { inherit system; };
}; };
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
@ -94,14 +89,12 @@
lib, lib,
unstable, unstable,
master, master,
fix-yubikey-agent,
... ...
}: { }: {
nixpkgs.overlays = (import ./overlays) ++ [ nixpkgs.overlays = (import ./overlays) ++ [
(prev: next: { (prev: next: {
scan2paperless = inputs.scan2paperless.legacyPackages.${prev.system}.scan2paperless; scan2paperless = inputs.scan2paperless.legacyPackages.${prev.system}.scan2paperless;
nixd = inputs.unstable.legacyPackages.${prev.system}.nixd; 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; factorio-headless = inputs.master.legacyPackages.${prev.system}.factorio-headless;
paperless-ngx = inputs.master.legacyPackages.${prev.system}.paperless-ngx; paperless-ngx = inputs.master.legacyPackages.${prev.system}.paperless-ngx;
@ -147,6 +140,23 @@
self.nixosModules.root 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";
};
};
}; };
}; };
} }

2
hosts/chocolatebar/virtualisation/guest-xml.nix
View file

@ -257,7 +257,7 @@ in ''
<qemu:arg value='-device'/> <qemu:arg value='-device'/>
<qemu:arg value='hda-micro,audiodev=hda'/> <qemu:arg value='hda-micro,audiodev=hda'/>
<qemu:arg value='-audiodev'/> <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> </qemu:commandline>
</domain> </domain>
'' ''

2
hosts/pie/dhcpd.nix
View file

@ -48,7 +48,7 @@
reservations = [ reservations = [
{ {
hostname = "droppie.local"; 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"; ip-address = "192.168.178.3";
} }
{ {

2
hosts/pie/wake-droppie.nix
View file

@ -3,7 +3,7 @@
services.cron = { services.cron = {
enable = true; enable = true;
systemCronJobs = [ 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
View file

@ -0,0 +1,3 @@
final: prev: {
element-desktop = prev.element-desktop.override { electron = prev.electron_24; };
}

1
overlays/overrides.nix
View file

@ -20,6 +20,7 @@ channels: final: prev: {
paperless-ngx paperless-ngx
waybar waybar
element-desktop element-desktop
signal-desktop
; ;
haskellPackages = haskellPackages =

1
overlays/signal-desktop.nix
View file

@ -2,6 +2,7 @@ final: prev: {
signal-desktop = prev.signal-desktop.overrideAttrs (oldAttrs: rec { signal-desktop = prev.signal-desktop.overrideAttrs (oldAttrs: rec {
inherit (oldAttrs) pname; inherit (oldAttrs) pname;
dir = "Signal"; dir = "Signal";
electron = prev.electron_24;
preFixup = '' preFixup = ''
gappsWrapperArgs+=( gappsWrapperArgs+=(

5
users/b12f/concepts-and-training.nix
View file

@ -62,6 +62,11 @@ in {
user = "root"; user = "root";
}; };
"demo2.prod.test" = {
hostname = "10.0.0.5";
user = "root";
};
"proxy1.test.test" = { "proxy1.test.test" = {
hostname = "10.0.0.8"; hostname = "10.0.0.8";
user = "root"; user = "root";

5
users/b12f/home.nix
View file

@ -31,6 +31,11 @@ in {
programs.ssh = { programs.ssh = {
enable = true; enable = true;
matchBlocks = { matchBlocks = {
"pie.local" = {
hostname = "pie.local";
user = "yule";
};
"git.b12f.io" = { "git.b12f.io" = {
hostname = "git.b12f.io"; hostname = "git.b12f.io";
user = "git"; user = "git";