albert/nix
albert/nix
1
0
Fork 0
Code Issues Pull requests Activity Actions

Update images

Browse source
This commit is contained in:
albert 2024-07-15 20:39:14 +09:00
parent 21b7ba63aa
commit ff8c892eb1
Signed by: albert
GPG key ID: 3895DD267CA11BA9
5 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -53,7 +53,7 @@
libx = import ./lib { inherit self inputs outputs stateVersion hmStateVersion; }; libx = import ./lib { inherit self inputs outputs stateVersion hmStateVersion; };
in { in {
nixosConfigurations = { nixosConfigurations = {
# Linode VM's # Linode VMs
osaka-linode-01 = libx.mkHost { hostname = "osaka-linode-01"; type = "small";}; osaka-linode-01 = libx.mkHost { hostname = "osaka-linode-01"; type = "small";};
milan-linode-01 = libx.mkHost { hostname = "milan-linode-01"; type = "small";}; milan-linode-01 = libx.mkHost { hostname = "milan-linode-01"; type = "small";};
frankfurt-linode-01 = libx.mkHost { hostname = "frankfurt-linode-01"; type = "small";}; frankfurt-linode-01 = libx.mkHost { hostname = "frankfurt-linode-01"; type = "small";};
@ -75,7 +75,7 @@
bakersfield-rpi4 = libx.mkHost { hostname = "bakersfield-rpi4"; system = "aarch64-linux"; type = "small"; }; bakersfield-rpi4 = libx.mkHost { hostname = "bakersfield-rpi4"; system = "aarch64-linux"; type = "small"; };
}; };
homeConfigurations = { homeConfigurations = {
# Linode VM's # Linode VMs
"albert@osaka-linode-01" = libx.mkHome { hostname = "osaka-linode-01"; type = "small"; }; "albert@osaka-linode-01" = libx.mkHome { hostname = "osaka-linode-01"; type = "small"; };
"albert@milan-linode-01" = libx.mkHome { hostname = "milan-linode-01"; type = "small"; }; "albert@milan-linode-01" = libx.mkHome { hostname = "milan-linode-01"; type = "small"; };
"albert@frankfurt-linode-01" = libx.mkHome { hostname = "frankfurt-linode-01"; type = "small"; }; "albert@frankfurt-linode-01" = libx.mkHome { hostname = "frankfurt-linode-01"; type = "small"; };
@ -100,7 +100,7 @@
"albert@rdesktop" = libx.mkHome { hostname = "rdesktop"; desktop = "plasma6"; }; "albert@rdesktop" = libx.mkHome { hostname = "rdesktop"; desktop = "plasma6"; };
}; };
deploy.nodes = { deploy.nodes = {
# Linode VM's # Linode VMs
osaka-linode-01 = libx.deploy { hostname = "osaka-linode-01"; }; osaka-linode-01 = libx.deploy { hostname = "osaka-linode-01"; };
milan-linode-01 = libx.deploy { hostname = "milan-linode-01"; }; milan-linode-01 = libx.deploy { hostname = "milan-linode-01"; };
frankfurt-linode-01 = libx.deploy { hostname = "frankfurt-linode-01"; }; frankfurt-linode-01 = libx.deploy { hostname = "frankfurt-linode-01"; };

3
home-manager/default.nix
View file

@ -1,4 +1,4 @@
{ lib, inputs, hostname, username, desktop, hmStateVersion, system, image, ... }: { { lib, inputs, hostname, username, desktop, hmStateVersion, system, ... }: {
imports = [ imports = [
# Common configs # Common configs
./common/software/cli ./common/software/cli
@ -16,7 +16,6 @@
++ lib.optional (builtins.isString desktop) ./common/software/gui # GUI packages ++ lib.optional (builtins.isString desktop) ./common/software/gui # GUI packages
++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop} # Machine-agnostic desktop configs ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop} # Machine-agnostic desktop configs
++ lib.optional (builtins.isString desktop) ./hosts/${hostname}/desktops/${desktop} # Machine-specific desktop configs ++ lib.optional (builtins.isString desktop) ./hosts/${hostname}/desktops/${desktop} # Machine-specific desktop configs
++ lib.optional (builtins.isString image ) ./common/image-specific.nix # Image specific items
; ;
news.display = "silent"; news.display = "silent";

8
lib/default.nix
View file

@ -24,10 +24,9 @@
system ? "x86_64-linux", system ? "x86_64-linux",
theme ? "default", theme ? "default",
type ? "default", type ? "default",
image ? null
}: inputs.home-manager.lib.homeManagerConfiguration { }: inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.${system}; pkgs = inputs.nixpkgs.legacyPackages.${system};
extraSpecialArgs = { inherit inputs outputs desktop hostname system username hmStateVersion theme image; }; extraSpecialArgs = { inherit inputs outputs desktop hostname system username hmStateVersion theme; };
modules = [ ../home-manager/${type}.nix ]; modules = [ ../home-manager/${type}.nix ];
}; };
@ -156,11 +155,10 @@
theme ? "default", theme ? "default",
repo ? "nixpkgs", repo ? "nixpkgs",
unfree ? false, unfree ? false,
image ? true,
format format
}: inputs.nixos-generators.nixosGenerate { }: inputs.nixos-generators.nixosGenerate {
specialArgs = { specialArgs = {
inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format image; inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format;
# Choose whether to pull from stable or unstable # Choose whether to pull from stable or unstable
pkgs = import inputs.${repo} { pkgs = import inputs.${repo} {
inherit system; inherit system;
@ -184,7 +182,7 @@
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.lanzaboote.nixosModules.lanzaboote inputs.lanzaboote.nixosModules.lanzaboote
inputs.home-manager.nixosModules.home-manager { inputs.home-manager.nixosModules.home-manager {
home-manager.extraSpecialArgs = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu system theme format image; }; home-manager.extraSpecialArgs = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu system theme format; };
home-manager.users."${username}" = import ../home-manager; home-manager.users."${username}" = import ../home-manager;
} }
]; ];

1
nixos/common/modules/installer.nix
View file

@ -1,6 +1,5 @@
{ config, desktop, lib, pkgs, username, ... }: { config, desktop, lib, pkgs, username, ... }:
let let
ifExists = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
install-system = pkgs.writeScriptBin "install-system" "${builtins.readFile ../../../docs/install.sh}"; install-system = pkgs.writeScriptBin "install-system" "${builtins.readFile ../../../docs/install.sh}";
in in
{ {

1
nixos/common/modules/networking.nix
View file

@ -4,7 +4,6 @@
networkmanager = { networkmanager = {
enable = true; enable = true;
logLevel = "INFO"; logLevel = "INFO";
dns = "dnsmasq";
}; };
useDHCP = lib.mkDefault true; useDHCP = lib.mkDefault true;