add ways, add viz1090 and update lockfile
This commit is contained in:
parent
4605073d02
commit
fda4be9553
119
flake.lock
119
flake.lock
|
@ -176,11 +176,11 @@
|
||||||
"systems": "systems_5"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1731533236,
|
||||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -225,6 +225,24 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-utils_6": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems_8"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1731533236,
|
||||||
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"git-hooks-nix": {
|
"git-hooks-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": [
|
"flake-compat": [
|
||||||
|
@ -506,11 +524,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739624908,
|
"lastModified": 1740162160,
|
||||||
"narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=",
|
"narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a60651b217d2e529729cbc7d989c19f3941b9250",
|
"rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -618,16 +636,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717281328,
|
"lastModified": 1739758141,
|
||||||
"narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=",
|
"narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1",
|
"rev": "c618e28f70257593de75a7044438efc1c1fc0791",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-24.05",
|
"ref": "nixos-24.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -648,6 +666,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs_6": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1739758141,
|
||||||
|
"narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "c618e28f70257593de75a7044438efc1c1fc0791",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-24.11",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"poetry2nix": {
|
"poetry2nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": [
|
"flake-utils": [
|
||||||
|
@ -742,6 +776,7 @@
|
||||||
"thymis": "thymis",
|
"thymis": "thymis",
|
||||||
"tildefriends": "tildefriends",
|
"tildefriends": "tildefriends",
|
||||||
"vedirect-reader": "vedirect-reader",
|
"vedirect-reader": "vedirect-reader",
|
||||||
|
"viz1090": "viz1090",
|
||||||
"vulpecula-zone": "vulpecula-zone"
|
"vulpecula-zone": "vulpecula-zone"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -887,11 +922,11 @@
|
||||||
},
|
},
|
||||||
"stable": {
|
"stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739624908,
|
"lastModified": 1740162160,
|
||||||
"narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=",
|
"narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a60651b217d2e529729cbc7d989c19f3941b9250",
|
"rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1006,6 +1041,21 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems_8": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"tasiaiso-vulpecula-zone": {
|
"tasiaiso-vulpecula-zone": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
|
@ -1042,11 +1092,11 @@
|
||||||
"raspberry-pi-nix": "raspberry-pi-nix"
|
"raspberry-pi-nix": "raspberry-pi-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739687195,
|
"lastModified": 1740289373,
|
||||||
"narHash": "sha256-VQ5xbtBYU6MwCzcaXHvout3vkge/NLHxFO1qSm9rQ4g=",
|
"narHash": "sha256-3a31FZH8NVAXu7L0dZrb9B89hgC9ju5/afTXaxuM+Kg=",
|
||||||
"owner": "Thymis-io",
|
"owner": "Thymis-io",
|
||||||
"repo": "thymis",
|
"repo": "thymis",
|
||||||
"rev": "94eccc78e88b6cec18b749b2729954e6b93bf99e",
|
"rev": "8b567838c126b45baa2ba298d2e766ff963a6e18",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1061,18 +1111,18 @@
|
||||||
"nixpkgs": "nixpkgs_4"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739739147,
|
"lastModified": 1740043638,
|
||||||
"narHash": "sha256-UjD6Us28mSbdFVx5hFwj7kJRCMKcdw8PDwDIjjVAfwQ=",
|
"narHash": "sha256-ntAWy8T9dBRUPwSM/YVPIPML/cKU3VxMwhcDFxklDis=",
|
||||||
"ref": "main",
|
"ref": "tasiaiso-nix-module",
|
||||||
"rev": "6928d6caba8c57c8c7ffd493b94798dac743e615",
|
"rev": "d67e47ae4bc74c7682296df2907414e49f67c918",
|
||||||
"revCount": 2393,
|
"revCount": 2407,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://dev.tildefriends.net/cory/tildefriends"
|
"url": "https://dev.tildefriends.net/tasiaiso/tildefriends"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"ref": "main",
|
"ref": "tasiaiso-nix-module",
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://dev.tildefriends.net/cory/tildefriends"
|
"url": "https://dev.tildefriends.net/tasiaiso/tildefriends"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"treefmt-nix": {
|
"treefmt-nix": {
|
||||||
|
@ -1129,9 +1179,28 @@
|
||||||
"url": "https://gitea.com/tasiaiso/vedirect-reader"
|
"url": "https://gitea.com/tasiaiso/vedirect-reader"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"vulpecula-zone": {
|
"viz1090": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_5",
|
"flake-utils": "flake-utils_5",
|
||||||
|
"nixpkgs": "nixpkgs_6"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1740334200,
|
||||||
|
"narHash": "sha256-A43+VQ3D/JvmnebqtXyMtbrC4l5ZuOpdwfldG4ubmoY=",
|
||||||
|
"ref": "refs/heads/main",
|
||||||
|
"rev": "26a610c1a33b834f5e7575d1c9273c56f7d35f80",
|
||||||
|
"revCount": 227,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.vulpecula.zone/tasiaiso/viz1090"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.vulpecula.zone/tasiaiso/viz1090"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"vulpecula-zone": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils_6",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"stable"
|
"stable"
|
||||||
]
|
]
|
||||||
|
|
13
flake.nix
13
flake.nix
|
@ -22,7 +22,9 @@
|
||||||
inputs.nixpkgs.follows = "stable";
|
inputs.nixpkgs.follows = "stable";
|
||||||
};
|
};
|
||||||
|
|
||||||
tildefriends.url = "git+https://dev.tildefriends.net/cory/tildefriends?ref=main";
|
tildefriends.url = "git+https://dev.tildefriends.net/tasiaiso/tildefriends?ref=tasiaiso-nix-module";
|
||||||
|
viz1090.url = "git+https://git.vulpecula.zone/tasiaiso/viz1090";
|
||||||
|
|
||||||
vedirect-reader.url = "git+https://gitea.com/tasiaiso/vedirect-reader";
|
vedirect-reader.url = "git+https://gitea.com/tasiaiso/vedirect-reader";
|
||||||
|
|
||||||
tasiaiso-vulpecula-zone = {
|
tasiaiso-vulpecula-zone = {
|
||||||
|
@ -60,6 +62,7 @@
|
||||||
# nixos-conf-editor,
|
# nixos-conf-editor,
|
||||||
# nix-software-center,
|
# nix-software-center,
|
||||||
tildefriends,
|
tildefriends,
|
||||||
|
viz1090,
|
||||||
agenix,
|
agenix,
|
||||||
tasiaiso-vulpecula-zone,
|
tasiaiso-vulpecula-zone,
|
||||||
vulpecula-zone,
|
vulpecula-zone,
|
||||||
|
@ -160,6 +163,14 @@
|
||||||
./hosts/jo/configuration.nix
|
./hosts/jo/configuration.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ways = stable.lib.nixosSystem {
|
||||||
|
system = "x86_64-linux";
|
||||||
|
specialArgs = {inherit inputs outputs;};
|
||||||
|
modules = [
|
||||||
|
./hosts/ways/configuration.nix
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,6 +29,8 @@
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
thunderbird
|
thunderbird
|
||||||
|
telegram-desktop
|
||||||
|
zoom-us
|
||||||
];
|
];
|
||||||
|
|
||||||
# The state version is required and should stay at the version you
|
# The state version is required and should stay at the version you
|
||||||
|
|
|
@ -52,9 +52,6 @@ in {
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# Additional system packages here
|
# Additional system packages here
|
||||||
zoxide
|
|
||||||
telegram-desktop
|
|
||||||
zoom-us
|
|
||||||
];
|
];
|
||||||
|
|
||||||
services.displayManager.autoLogin.user = "user";
|
services.displayManager.autoLogin.user = "user";
|
||||||
|
|
62
hosts/ways/configuration.nix
Normal file
62
hosts/ways/configuration.nix
Normal file
|
@ -0,0 +1,62 @@
|
||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
sshKeys = import ../../crypto/ssh-keys.nix;
|
||||||
|
in {
|
||||||
|
imports = [
|
||||||
|
./hardware-configuration.nix
|
||||||
|
../../common/base.nix
|
||||||
|
../../common/full-install.nix
|
||||||
|
|
||||||
|
../../common/locales/fr.nix
|
||||||
|
../../common/locales/fr-keymap.nix
|
||||||
|
|
||||||
|
../../common/hardware/intel-cpu.nix
|
||||||
|
../../common/hardware/ssd.nix
|
||||||
|
../../common/hardware/btrfs.nix
|
||||||
|
|
||||||
|
../../common/components/de/plasma6.nix
|
||||||
|
|
||||||
|
../../common/services/autoupgrade.nix
|
||||||
|
../../common/services/syncthing.nix
|
||||||
|
../../common/services/nix-gc.nix
|
||||||
|
|
||||||
|
../../home/46d1.nix
|
||||||
|
|
||||||
|
inputs.agenix.nixosModules.default
|
||||||
|
../../common/components/wifi-secrets.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
networking.hostName = "ways";
|
||||||
|
|
||||||
|
users.users.user.openssh.authorizedKeys.keys = [
|
||||||
|
sshKeys.tasia.cave
|
||||||
|
];
|
||||||
|
|
||||||
|
nix.settings.trusted-users = ["root" "@wheel"]; # TODO
|
||||||
|
|
||||||
|
services.syncthing = {
|
||||||
|
dataDir = lib.mkForce "/home/user/Sync/data";
|
||||||
|
configDir = lib.mkForce "/home/user/Sync/configuration";
|
||||||
|
};
|
||||||
|
|
||||||
|
security.pam.services.kwallet = {
|
||||||
|
name = "kwallet";
|
||||||
|
enableKwallet = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# services.printing.drivers = [pkgs.cnijfilter2];
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
# Additional system packages here
|
||||||
|
];
|
||||||
|
|
||||||
|
services.displayManager.autoLogin.user = "user";
|
||||||
|
services.displayManager.autoLogin.enable = true;
|
||||||
|
|
||||||
|
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||||
|
system.stateVersion = "23.11";
|
||||||
|
}
|
0
hosts/ways/hardware-configuration.nix
Normal file
0
hosts/ways/hardware-configuration.nix
Normal file
Loading…
Reference in a new issue