mirror of
https://gitlab.com/upRootNutrition/dotfiles.git
synced 2025-06-15 17:45:12 -05:00
feat: changed system naming convention
This commit is contained in:
parent
33455dccd9
commit
1b36918ced
30 changed files with 51 additions and 49 deletions
24
flake.nix
24
flake.nix
|
@ -74,11 +74,11 @@
|
||||||
{ config, ... }:
|
{ config, ... }:
|
||||||
{
|
{
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
jupiter = inputs.self.lib.mkLinuxSystem [
|
mars = inputs.self.lib.mkLinuxSystem [
|
||||||
./systems/jupiter
|
./systems/mars
|
||||||
./profiles/user0
|
./profiles/user0
|
||||||
./profiles/user1
|
./profiles/user1
|
||||||
config.nixosModules.jupiter
|
config.nixosModules.mars
|
||||||
config.nixosModules.core
|
config.nixosModules.core
|
||||||
config.nixosModules.mantle
|
config.nixosModules.mantle
|
||||||
config.nixosModules.crust
|
config.nixosModules.crust
|
||||||
|
@ -89,10 +89,10 @@
|
||||||
inputs.sops-nix.nixosModules.sops
|
inputs.sops-nix.nixosModules.sops
|
||||||
inputs.nixvim.nixosModules.nixvim
|
inputs.nixvim.nixosModules.nixvim
|
||||||
];
|
];
|
||||||
saturn = inputs.self.lib.mkLinuxSystem [
|
venus = inputs.self.lib.mkLinuxSystem [
|
||||||
./systems/saturn
|
./systems/venus
|
||||||
./profiles/user2
|
./profiles/user2
|
||||||
config.nixosModules.saturn
|
config.nixosModules.venus
|
||||||
config.nixosModules.core
|
config.nixosModules.core
|
||||||
config.nixosModules.mantle
|
config.nixosModules.mantle
|
||||||
config.nixosModules.crust
|
config.nixosModules.crust
|
||||||
|
@ -100,11 +100,11 @@
|
||||||
inputs.lix-module.nixosModules.default
|
inputs.lix-module.nixosModules.default
|
||||||
inputs.sops-nix.nixosModules.sops
|
inputs.sops-nix.nixosModules.sops
|
||||||
];
|
];
|
||||||
ganymede = inputs.self.lib.mkLinuxSystem [
|
deimos = inputs.self.lib.mkLinuxSystem [
|
||||||
./systems/ganymede
|
./systems/deimos
|
||||||
./profiles/user0
|
./profiles/user0
|
||||||
./profiles/user1
|
./profiles/user1
|
||||||
config.nixosModules.ganymede
|
config.nixosModules.deimos
|
||||||
config.nixosModules.core
|
config.nixosModules.core
|
||||||
config.nixosModules.mantle
|
config.nixosModules.mantle
|
||||||
config.nixosModules.crust
|
config.nixosModules.crust
|
||||||
|
@ -113,10 +113,10 @@
|
||||||
inputs.nur.modules.nixos.default
|
inputs.nur.modules.nixos.default
|
||||||
inputs.sops-nix.nixosModules.sops
|
inputs.sops-nix.nixosModules.sops
|
||||||
];
|
];
|
||||||
callisto = inputs.self.lib.mkLinuxSystem [
|
charon = inputs.self.lib.mkLinuxSystem [
|
||||||
./systems/callisto
|
./systems/charon
|
||||||
./profiles/user1
|
./profiles/user1
|
||||||
config.nixosModules.callisto
|
config.nixosModules.charon
|
||||||
config.nixosModules.core
|
config.nixosModules.core
|
||||||
config.nixosModules.crust
|
config.nixosModules.crust
|
||||||
inputs.home-manager.nixosModules.home-manager
|
inputs.home-manager.nixosModules.home-manager
|
||||||
|
|
|
@ -4,7 +4,7 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
flake.nixosModules = {
|
flake.nixosModules = {
|
||||||
jupiter = {
|
mars = {
|
||||||
imports = builtins.attrValues {
|
imports = builtins.attrValues {
|
||||||
inherit (modules)
|
inherit (modules)
|
||||||
mullvad
|
mullvad
|
||||||
|
@ -17,7 +17,7 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
saturn = {
|
venus = {
|
||||||
imports = builtins.attrValues {
|
imports = builtins.attrValues {
|
||||||
inherit (modules)
|
inherit (modules)
|
||||||
plasma
|
plasma
|
||||||
|
@ -27,7 +27,7 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
ganymede = {
|
deimos = {
|
||||||
imports = builtins.attrValues {
|
imports = builtins.attrValues {
|
||||||
inherit (modules)
|
inherit (modules)
|
||||||
gnome
|
gnome
|
||||||
|
|
|
@ -31,6 +31,7 @@ in
|
||||||
"networkmanager"
|
"networkmanager"
|
||||||
"nextcloud"
|
"nextcloud"
|
||||||
"ollama"
|
"ollama"
|
||||||
|
"plugdev"
|
||||||
"postgres"
|
"postgres"
|
||||||
"redis-mastodon"
|
"redis-mastodon"
|
||||||
"samba"
|
"samba"
|
||||||
|
|
|
@ -5,7 +5,7 @@ vpnoff:
|
||||||
sudo protonvpn d
|
sudo protonvpn d
|
||||||
|
|
||||||
rebuild:
|
rebuild:
|
||||||
nixos-rebuild switch --use-remote-sudo --flake ~/Files/Projects/dotfiles#jupiter --show-trace
|
nixos-rebuild switch --use-remote-sudo --flake ~/Files/Projects/dotfiles#mars --show-trace
|
||||||
|
|
||||||
elm:
|
elm:
|
||||||
cd ~/Files/Projects/website/frontend; elm-land server
|
cd ~/Files/Projects/website/frontend; elm-land server
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (flake.config.people) user1;
|
inherit (flake.config.people) user1;
|
||||||
inherit (flake.config.machines.devices) callisto;
|
inherit (flake.config.machines.devices) charon;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
|
@ -16,7 +16,7 @@ in
|
||||||
"/boot" = {
|
"/boot" = {
|
||||||
device = "/dev/disk/by-uuid/1703-D452";
|
device = "/dev/disk/by-uuid/1703-D452";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = callisto.boot.options;
|
options = charon.boot.options;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (flake.config.machines.devices)
|
inherit (flake.config.machines.devices)
|
||||||
callisto
|
charon
|
||||||
;
|
;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
networking = {
|
networking = {
|
||||||
hostName = callisto.name;
|
hostName = charon.name;
|
||||||
networkmanager.enable = true;
|
networkmanager.enable = true;
|
||||||
nftables.enable = true;
|
nftables.enable = true;
|
||||||
useDHCP = lib.mkDefault true;
|
useDHCP = lib.mkDefault true;
|
|
@ -9,7 +9,7 @@ let
|
||||||
user1
|
user1
|
||||||
;
|
;
|
||||||
inherit (flake.config.machines.devices)
|
inherit (flake.config.machines.devices)
|
||||||
ganymede
|
deimos
|
||||||
synology
|
synology
|
||||||
ceres
|
ceres
|
||||||
;
|
;
|
||||||
|
@ -63,7 +63,7 @@ in
|
||||||
"/boot" = {
|
"/boot" = {
|
||||||
device = "/dev/disk/by-uuid/C506-9E18";
|
device = "/dev/disk/by-uuid/C506-9E18";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = ganymede.boot.options;
|
options = deimos.boot.options;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
// (builtins.listToAttrs (map synologyMounts synologyDrives))
|
// (builtins.listToAttrs (map synologyMounts synologyDrives))
|
|
@ -5,12 +5,12 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (flake.config.machines.devices)
|
inherit (flake.config.machines.devices)
|
||||||
ganymede
|
deimos
|
||||||
;
|
;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
networking = {
|
networking = {
|
||||||
hostName = ganymede.name;
|
hostName = deimos.name;
|
||||||
networkmanager.enable = true;
|
networkmanager.enable = true;
|
||||||
nftables.enable = true;
|
nftables.enable = true;
|
||||||
useDHCP = lib.mkDefault true;
|
useDHCP = lib.mkDefault true;
|
|
@ -2,7 +2,7 @@
|
||||||
let
|
let
|
||||||
configPath = ./config;
|
configPath = ./config;
|
||||||
|
|
||||||
jupiterImports =
|
deimosImports =
|
||||||
let
|
let
|
||||||
files = builtins.attrNames (builtins.readDir configPath);
|
files = builtins.attrNames (builtins.readDir configPath);
|
||||||
in
|
in
|
||||||
|
@ -11,7 +11,7 @@ let
|
||||||
);
|
);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = jupiterImports;
|
imports = deimosImports;
|
||||||
nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
|
||||||
system.stateVersion = lib.mkForce "24.05";
|
system.stateVersion = lib.mkForce "24.05";
|
||||||
}
|
}
|
|
@ -9,7 +9,7 @@ let
|
||||||
user1
|
user1
|
||||||
;
|
;
|
||||||
inherit (flake.config.machines.devices)
|
inherit (flake.config.machines.devices)
|
||||||
jupiter
|
mars
|
||||||
ceres
|
ceres
|
||||||
synology
|
synology
|
||||||
;
|
;
|
||||||
|
@ -50,11 +50,11 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
storageMounts = storageDrive: {
|
storageMounts = storageDrive: {
|
||||||
name = "${jupiter.${storageDrive}.mount}";
|
name = "${mars.${storageDrive}.mount}";
|
||||||
value = {
|
value = {
|
||||||
device = jupiter.${storageDrive}.device;
|
device = mars.${storageDrive}.device;
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
options = jupiter.${storageDrive}.options;
|
options = mars.${storageDrive}.options;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ in
|
||||||
"/boot" = {
|
"/boot" = {
|
||||||
device = "/dev/disk/by-uuid/F095-17B7";
|
device = "/dev/disk/by-uuid/F095-17B7";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = jupiter.boot.options;
|
options = mars.boot.options;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
// (builtins.listToAttrs (map synologyMounts synologyDrives))
|
// (builtins.listToAttrs (map synologyMounts synologyDrives))
|
||||||
|
@ -91,8 +91,8 @@ in
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
"Z ${config.home-manager.users.${user0}.home.homeDirectory} 0755 ${user0} users -"
|
"Z ${config.home-manager.users.${user0}.home.homeDirectory} 0755 ${user0} users -"
|
||||||
"Z ${config.home-manager.users.${user1}.home.homeDirectory} 0755 ${user1} users -"
|
"Z ${config.home-manager.users.${user1}.home.homeDirectory} 0755 ${user1} users -"
|
||||||
"Z ${jupiter.storage0.mount} 0755 ${user0} users -"
|
"Z ${mars.storage0.mount} 0755 ${user0} users -"
|
||||||
"Z ${jupiter.storage1.mount} 0755 ${user0} users -"
|
"Z ${mars.storage1.mount} 0755 ${user0} users -"
|
||||||
];
|
];
|
||||||
|
|
||||||
services.udisks2.enable = true;
|
services.udisks2.enable = true;
|
|
@ -5,12 +5,12 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (flake.config.machines.devices)
|
inherit (flake.config.machines.devices)
|
||||||
jupiter
|
mars
|
||||||
;
|
;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
networking = {
|
networking = {
|
||||||
hostName = jupiter.name;
|
hostName = mars.name;
|
||||||
networkmanager.enable = true;
|
networkmanager.enable = true;
|
||||||
nftables.enable = true;
|
nftables.enable = true;
|
||||||
useDHCP = lib.mkDefault true;
|
useDHCP = lib.mkDefault true;
|
||||||
|
@ -22,7 +22,8 @@ in
|
||||||
2234 # Soulseek
|
2234 # Soulseek
|
||||||
3131 # Deskreen
|
3131 # Deskreen
|
||||||
1234 # Elm-land server
|
1234 # Elm-land server
|
||||||
55473
|
5037 # ADB Server
|
||||||
|
52006
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
|
@ -2,7 +2,7 @@
|
||||||
let
|
let
|
||||||
configPath = ./config;
|
configPath = ./config;
|
||||||
|
|
||||||
ganymedeImports =
|
marsImports =
|
||||||
let
|
let
|
||||||
files = builtins.attrNames (builtins.readDir configPath);
|
files = builtins.attrNames (builtins.readDir configPath);
|
||||||
in
|
in
|
||||||
|
@ -11,7 +11,7 @@ let
|
||||||
);
|
);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = ganymedeImports;
|
imports = marsImports;
|
||||||
nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
|
||||||
system.stateVersion = lib.mkForce "24.05";
|
system.stateVersion = lib.mkForce "24.05";
|
||||||
}
|
}
|
|
@ -5,7 +5,7 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (flake.config.people) user2;
|
inherit (flake.config.people) user2;
|
||||||
inherit (flake.config.machines.devices) saturn;
|
inherit (flake.config.machines.devices) venus;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [ ];
|
imports = [ ];
|
||||||
|
@ -18,11 +18,11 @@ in
|
||||||
];
|
];
|
||||||
|
|
||||||
storageMounts = storage: {
|
storageMounts = storage: {
|
||||||
name = "${saturn.${storage}.mount}";
|
name = "${venus.${storage}.mount}";
|
||||||
value = {
|
value = {
|
||||||
device = saturn.${storage}.device;
|
device = venus.${storage}.device;
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
options = saturn.${storage}.options;
|
options = venus.${storage}.options;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
@ -34,7 +34,7 @@ in
|
||||||
"/boot" = {
|
"/boot" = {
|
||||||
device = "/dev/disk/by-uuid/22BD-5A25";
|
device = "/dev/disk/by-uuid/22BD-5A25";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = saturn.boot.options;
|
options = venus.boot.options;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
// (builtins.listToAttrs (map storageMounts storageDrives));
|
// (builtins.listToAttrs (map storageMounts storageDrives));
|
||||||
|
@ -45,8 +45,8 @@ in
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
"Z ${config.home-manager.users.${user2}.home.homeDirectory} 0755 ${user2} users -"
|
"Z ${config.home-manager.users.${user2}.home.homeDirectory} 0755 ${user2} users -"
|
||||||
"Z ${saturn.storage0.mount} 0755 ${user2} users -"
|
"Z ${venus.storage0.mount} 0755 ${user2} users -"
|
||||||
"Z ${saturn.storage1.mount} 0755 ${user2} users -"
|
"Z ${venus.storage1.mount} 0755 ${user2} users -"
|
||||||
];
|
];
|
||||||
|
|
||||||
services.udisks2.enable = true;
|
services.udisks2.enable = true;
|
|
@ -4,11 +4,11 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (flake.config.machines.devices) saturn;
|
inherit (flake.config.machines.devices) venus;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
networking = {
|
networking = {
|
||||||
hostName = saturn.name;
|
hostName = venus.name;
|
||||||
networkmanager.enable = true;
|
networkmanager.enable = true;
|
||||||
useDHCP = lib.mkDefault true;
|
useDHCP = lib.mkDefault true;
|
||||||
firewall = {
|
firewall = {
|
|
@ -5,7 +5,7 @@
|
||||||
let
|
let
|
||||||
configPath = ./config;
|
configPath = ./config;
|
||||||
|
|
||||||
saturnImports =
|
venusImports =
|
||||||
let
|
let
|
||||||
files = builtins.attrNames (builtins.readDir configPath);
|
files = builtins.attrNames (builtins.readDir configPath);
|
||||||
in
|
in
|
||||||
|
@ -14,7 +14,7 @@ let
|
||||||
);
|
);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = saturnImports;
|
imports = venusImports;
|
||||||
nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
|
||||||
system.stateVersion = lib.mkForce "24.05";
|
system.stateVersion = lib.mkForce "24.05";
|
||||||
}
|
}
|
Loading…
Add table
Add a link
Reference in a new issue