Skip to content

Commit c4d28a2

Browse files
committed
refactor: use unify framework
1 parent 8a5d086 commit c4d28a2

File tree

197 files changed

+3264
-3135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+3264
-3135
lines changed

flake.lock

Lines changed: 232 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@
4343
treefmt-nix.url = "github:numtide/treefmt-nix";
4444

4545
make-shell.url = "github:nicknovitski/make-shell";
46+
47+
unify = {
48+
url = "git+https://codeberg.org/quasigod/unify";
49+
inputs.nixpkgs.follows = "nixpkgs";
50+
inputs.home-manager.follows = "home-manager";
51+
};
4652
};
4753

48-
outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
54+
outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./imports);
4955
}

modules/hosts/nixos/boot.nix renamed to imports/hosts/nixos/boot.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
...
44
}:
55
{
6-
flake.modules.nixos.nixos = {
6+
unify.hosts.nixos.nixos = {
77
boot = {
88
# Use the GRUB 2 boot loader.
99
loader.grub.enable = true;

imports/hosts/nixos/default.nix

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
unify.hosts.nixos = {
3+
user = "pol";
4+
5+
tags = [
6+
"base"
7+
"ai"
8+
"dev"
9+
"facter"
10+
"shell"
11+
"sshd"
12+
"vpn"
13+
];
14+
};
15+
}
File renamed without changes.

imports/hosts/nixos/facter.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
unify.hosts.nixos.nixos.facter.reportPath = ./facter.json;
3+
}

modules/hosts/nixos/fileSystems.nix renamed to imports/hosts/nixos/fileSystems.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
flake.modules.nixos.nixos = {
2+
unify.hosts.nixos.nixos = {
33
fileSystems."/" = {
44
device = "/dev/disk/by-uuid/7bb30cda-a7fd-4f83-9cea-a4a80ede8a6e";
55
fsType = "ext4";

modules/hosts/nixos/networking.nix renamed to imports/hosts/nixos/networking.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
flake.modules.nixos.nixos = {
2+
unify.hosts.nixos.nixos = {
33
networking = {
44
interfaces.eno1.useDHCP = true;
55
};

imports/hosts/x13/boot.nix

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
unify.hosts.x13.nixos = {
3+
boot = {
4+
loader = {
5+
systemd-boot.enable = true;
6+
efi.canTouchEfiVariables = true;
7+
efi.efiSysMountPoint = "/boot/efi";
8+
};
9+
10+
initrd = {
11+
availableKernelModules = [
12+
"xhci_pci"
13+
"thunderbolt"
14+
"nvme"
15+
"usb_storage"
16+
"sd_mod"
17+
];
18+
};
19+
20+
kernelModules = [ "kvm-intel" ];
21+
};
22+
};
23+
}

imports/hosts/x13/default.nix

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
...
3+
}:
4+
{
5+
unify.hosts.x13 = {
6+
user = "pol";
7+
8+
tags = [
9+
"base"
10+
"desktop"
11+
"dev"
12+
"displaylink"
13+
"facter"
14+
"fwupd"
15+
"games"
16+
"shell"
17+
"sound"
18+
"virtualisation"
19+
"vpn"
20+
];
21+
};
22+
}

0 commit comments

Comments
 (0)