fern/flock
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tidy up config, remove lix.

Browse source
This commit is contained in:
Fern Garden 2025-07-26 08:43:20 +08:00
parent daf692e9a6
commit 9339a196aa
6 changed files with 17 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

88
flake.lock generated
View file

@ -127,39 +127,6 @@
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"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"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
@ -254,41 +221,6 @@
"type": "github"
}
},
"lix": {
"flake": false,
"locked": {
"lastModified": 1753223229,
"narHash": "sha256-tkT4aCZZE6IEmjYotOzKKa2rV3pGpH3ZREeQn7ACgdU=",
"rev": "7ac20fc47cf2f1b7469c7a2f379e5a3a51a6789a",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7ac20fc47cf2f1b7469c7a2f379e5a3a51a6789a.tar.gz?rev=7ac20fc47cf2f1b7469c7a2f379e5a3a51a6789a"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1753282722,
"narHash": "sha256-KYMUrTV7H/RR5/HRnjV5R3rRIuBXMemyJzTLi50NFTs=",
"rev": "46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-1.tar.gz"
}
},
"nh": {
"inputs": {
"nixpkgs": "nixpkgs_3"
@ -455,7 +387,7 @@
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_5",
"nuschtosSearch": "nuschtosSearch",
"systems": "systems_4"
"systems": "systems_3"
},
"locked": {
"lastModified": 1752976861,
@ -473,7 +405,7 @@
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
@ -525,7 +457,6 @@
"deploy-rs": "deploy-rs",
"home-manager": "home-manager",
"lanzaboote": "lanzaboote",
"lix-module": "lix-module",
"nh": "nh",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_4",
@ -637,21 +568,6 @@
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems"

17
flake.nix
View file

@ -6,11 +6,6 @@
nixpkgs-pr-fluffychat.url = "github:NixOS/nixpkgs?ref=pull/419632/head"; # FluffyChat 2.0.0
nixpkgs-pr-feishin.url = "github:NixOS/nixpkgs?ref=pull/414929/head"; # Feishin 0.17.0
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-1.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
deploy-rs.url = "github:serokell/deploy-rs"; # Remote deployment
lanzaboote.url = "github:nix-community/lanzaboote"; # Secure boot.
nixos-hardware.url = "github:NixOS/nixos-hardware"; # Hardware specific config.
@ -31,12 +26,7 @@
};
};
outputs = {
lanzaboote,
nixos-hardware,
sops-nix,
...
} @ inputs: let
outputs = {nixos-hardware, ...} @ inputs: let
# Import helpers & make functions available.
helpers = import ./helpers.nix inputs;
inherit (helpers) mergeHosts mkHost;
@ -46,7 +36,6 @@
(mkHost "muskduck" {
suite = "desktop";
hostModules = [
lanzaboote.nixosModules.lanzaboote
nixos-hardware.nixosModules.lenovo-thinkpad-t480
];
})
@ -55,7 +44,6 @@
(mkHost "pardalote" {
suite = "desktop";
hostModules = [
lanzaboote.nixosModules.lanzaboote
nixos-hardware.nixosModules.lenovo-thinkpad-x220
];
})
@ -95,9 +83,6 @@
# Container running Mozilla's syncstorage-rs
(mkHost "firefox-syncserver" {
suite = "server/lxc";
hostModules = [
sops-nix.nixosModules.sops
];
})
];
}

9
helpers.nix
View file

@ -74,10 +74,9 @@ with inputs.nixpkgs.lib; {
modules =
[
{nix.nixPath = ["nixpkgs=${nixpkgs}"];} # Set $NIX_PATH.
nixvim.nixosModules.nixvim # Neovim.
lix-module.nixosModules.default # lix.
lanzaboote.nixosModules.lanzaboote # Secure boot.
sops-nix.nixosModules.sops # Secrets management.
./suites/${suite} # Collection of configuration options for different types of systems.
./hosts/${hostname} # Host-specific config.
@ -103,10 +102,6 @@ with inputs.nixpkgs.lib; {
user = "root";
sshuser = "fern";
path = deployPkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.${hostname};
remoteBuild =
if (system != "x86_64-linux")
then true
else false;
};
};
};

14
suites/default.nix
View file

@ -15,9 +15,15 @@ with lib; {
"flakes"
];
# Set $NIX_PATH.
nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
# Enable redistributable firmware.
hardware.enableRedistributableFirmware = true;
# Enable firmware updates.
services.fwupd.enable = true;
# Set time zone.
time.timeZone = "Australia/Perth";
@ -62,10 +68,10 @@ with lib; {
# Use fish shell
programs.fish = {
enable = true;
shellAbbrs = {
nrs = "nixos-rebuild switch --use-remote-sudo --flake /home/fern/Repositories/flock/";
nrt = "nixos-rebuild test --use-remote-sudo --flake /home/fern/Repositories/flock/";
nrb = "nixos-rebuild boot --use-remote-sudo --flake /home/fern/Repositories/flock/";
shellAbbrs = let flake = "/home/fern/Repositories/flock"; in {
ns = "nh os switch --flake ${flake}";
nt = "nh os test--flake ${flake}";
nb = "nh os boot --flake ${flake}";
};
interactiveShellInit = ''
# set gruvbox theme

8
suites/desktop/default.nix
View file

@ -28,9 +28,6 @@ with lib; {
binfmt.emulatedSystems = ["aarch64-linux"];
};
# Enable firmware updates.
services.fwupd.enable = true;
# Enable zram swap.
zramSwap.enable = true;
@ -82,9 +79,6 @@ with lib; {
]
);
# Remove NixOS HTML manual
documentation.doc.enable = false;
# Run electron apps under wayland.
environment.sessionVariables.NIXOS_OZONE_WL = "1";
@ -136,7 +130,7 @@ with lib; {
# Enable CUPS to print documents.
services.printing = {
enable = true;
drivers = [pkgs.brlaser pkgs.cups-dymo];
drivers = [pkgs.brlaser pkgs.cups-dymo]; # Brother laser printer & Dymo label printer.
};
# https://github.com/tailscale/tailscale/issues/4432#issuecomment-1112819111

7
suites/server/vm/default.nix
View file

@ -1,9 +1,4 @@
{
modulesPath,
lib,
...
}:
with lib; {
{modulesPath, ...}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
../. # Server config.