summaryrefslogtreecommitdiff
path: root/hosts
diff options
context:
space:
mode:
Diffstat (limited to 'hosts')
-rw-r--r--hosts/kaworu/default.nix28
-rw-r--r--hosts/kaworu/hardware.nix7
-rw-r--r--hosts/shinji/default.nix41
-rw-r--r--hosts/shinji/hardware.nix18
-rw-r--r--hosts/shinji/sops.nix25
-rw-r--r--hosts/shinji/wireguard.nix27
-rw-r--r--hosts/thinkpad/default.nix9
-rw-r--r--hosts/thinkpad/hardware.nix17
-rw-r--r--hosts/thinkpad/sops.nix25
-rw-r--r--hosts/thinkpad/wireguard.nix27
10 files changed, 42 insertions, 182 deletions
diff --git a/hosts/kaworu/default.nix b/hosts/kaworu/default.nix
index 940f3fc..25c16c7 100644
--- a/hosts/kaworu/default.nix
+++ b/hosts/kaworu/default.nix
@@ -1,24 +1,23 @@
# Kaworu
# System configuration for my desktop
-_: {
+{lib, ...}: {
imports = [
./hardware.nix
];
# options
hostName = "kaworu";
- monitors = [
- {
- name = "HDMI-A-1";
- scale = 1.0;
- }
+ monitors = with lib.monitors; [
+ asus
+ acer
];
# modules
apps = {
- astal.enable = true;
+ caelestia.enable = true;
hyprlock.enable = true;
kitty.enable = true;
+ obs.enable = true;
};
browsers = {
firefox.enable = true;
@@ -28,18 +27,19 @@ _: {
hyprland.enable = true;
ly.enable = true;
};
- development = {
- c.enable = true;
- rust.enable = true;
- web.enable = true;
- };
gaming = {
+ enable = true;
+ openrgb.enable = true;
homestuck.enable = true;
minecraft.enable = true;
steam.enable = true;
};
+ bootloader = {
+ limine.enable = true;
+ };
# modules
- bluetooth = true;
- network = true;
+ amdgpu.enable = true;
+ bluetooth.enable = true;
+ network.enable = true;
}
diff --git a/hosts/kaworu/hardware.nix b/hosts/kaworu/hardware.nix
index c3c9a57..0f2d277 100644
--- a/hosts/kaworu/hardware.nix
+++ b/hosts/kaworu/hardware.nix
@@ -1,11 +1,4 @@
_: {
- # bootloader
- boot.loader.systemd-boot.enable = true;
- boot.loader.efi = {
- canTouchEfiVariables = true;
- efiSysMountPoint = "/boot/efi";
- };
-
# kernel modules
boot.initrd.availableKernelModules = [
"xhci_pci"
diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix
index 0750d29..e22ee91 100644
--- a/hosts/shinji/default.nix
+++ b/hosts/shinji/default.nix
@@ -1,16 +1,17 @@
# Shinji
# System configuration for my laptop
-{pkgs, ...}: {
+{
+ pkgs,
+ lib,
+ ...
+}: {
imports = [
./hardware.nix
- ./sops.nix
- ./wireguard.nix
];
# options
hostName = "shinji";
- cores = 16;
- monitors = [
+ monitors = with lib.monitors; [
{
port = "eDP-1";
laptop = true;
@@ -18,22 +19,8 @@
bitdepth = 10;
}
# desktop when docked
- {
- desc = "ASUSTek COMPUTER INC ASUS VA24E LALMTF215939";
- position = {
- enabled = true;
- x = 2048;
- y = 240;
- };
- }
- {
- desc = "Acer Technologies EB321HQU 0x00000698";
- position = {
- enabled = true;
- x = 3968;
- y = 0;
- };
- }
+ asus
+ acer
];
# set power btn to suspend
@@ -92,8 +79,20 @@
docker.enable = true;
qemu.enable = true;
};
+ vpn = {
+ enable = true;
+ ip = "10.3.0.3/32";
+ };
+ bootloader = {
+ limine = {
+ enable = true;
+ secureBoot.enable = true;
+ };
+ plymouth.enable = true;
+ };
# modules
+ amdgpu.enable = true;
battery.enable = true;
bluetooth.enable = true;
network.enable = true;
diff --git a/hosts/shinji/hardware.nix b/hosts/shinji/hardware.nix
index b0933f0..1edae37 100644
--- a/hosts/shinji/hardware.nix
+++ b/hosts/shinji/hardware.nix
@@ -8,24 +8,6 @@
inputs.nixos-hardware.nixosModules.lenovo-yoga-7-slim-gen8
];
- # bootloader
- boot.loader = {
- efi.canTouchEfiVariables = true;
- limine = {
- enable = true;
- efiSupport = true;
- secureBoot.enable = true;
- maxGenerations = 10;
- style = {
- backdrop = config.theme.colors.base;
- wallpapers = [config.theme.wallpaper];
- };
- };
-
- grub.enable = false;
- systemd-boot.enable = false;
- };
-
# kernel modules
boot.initrd.availableKernelModules = [
"nvme"
diff --git a/hosts/shinji/sops.nix b/hosts/shinji/sops.nix
deleted file mode 100644
index 9169bbc..0000000
--- a/hosts/shinji/sops.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- config,
- pkgs,
- inputs,
- ...
-}: {
- imports = [
- inputs.sops-nix.nixosModules.sops
- ];
-
- environment.systemPackages = with pkgs; [
- sops
- ];
-
- sops = {
- defaultSopsFile = ./secrets.yaml;
-
- gnupg.home = config.homePath + "/.local/share/gnupg";
- gnupg.sshKeyPaths = [];
-
- secrets = {
- freyanetWg = {};
- };
- };
-}
diff --git a/hosts/shinji/wireguard.nix b/hosts/shinji/wireguard.nix
deleted file mode 100644
index 8e42f9d..0000000
--- a/hosts/shinji/wireguard.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- config,
- pkgs,
- ...
-}: {
- environment.systemPackages = with pkgs; [
- wireguard-tools
- ];
-
- networking.wg-quick.interfaces = {
- freyanet = {
- address = ["10.3.0.3/32"];
- dns = ["10.2.0.1"];
- privateKeyFile = config.sops.secrets.freyanetWg.path;
- autostart = false;
-
- peers = [
- {
- publicKey = "x0ykwakpYCvI/pG+nR83lNUyeOE9m54thnX3bvZ+FUk=";
- allowedIPs = ["10.0.0.0/8"];
- endpoint = "freya.cat:3000";
- persistentKeepalive = 25;
- }
- ];
- };
- };
-}
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index 11b5bcb..e57214d 100644
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -3,8 +3,6 @@
_: {
imports = [
./hardware.nix
- ./sops.nix
- ./wireguard.nix
];
# options
@@ -35,6 +33,13 @@ _: {
homestuck.enable = true;
minecraft.enable = true;
};
+ vpn = {
+ enable = true;
+ ip = "10.3.0.5/32";
+ };
+ bootloader = {
+ grub.enable = true;
+ };
# modules
battery.enable = true;
diff --git a/hosts/thinkpad/hardware.nix b/hosts/thinkpad/hardware.nix
index a012cbc..9d58333 100644
--- a/hosts/thinkpad/hardware.nix
+++ b/hosts/thinkpad/hardware.nix
@@ -1,24 +1,9 @@
-{
- config,
- inputs,
- ...
-}: {
+{inputs, ...}: {
# external defaults
imports = [
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-7th-gen
];
- # bootloader
- boot.loader = {
- efi.canTouchEfiVariables = true;
- grub = {
- enable = true;
- efiSupport = true;
- device = "nodev";
- splashImage = config.theme.wallpaper;
- };
- };
-
# kernel modules
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [];
diff --git a/hosts/thinkpad/sops.nix b/hosts/thinkpad/sops.nix
deleted file mode 100644
index 9169bbc..0000000
--- a/hosts/thinkpad/sops.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- config,
- pkgs,
- inputs,
- ...
-}: {
- imports = [
- inputs.sops-nix.nixosModules.sops
- ];
-
- environment.systemPackages = with pkgs; [
- sops
- ];
-
- sops = {
- defaultSopsFile = ./secrets.yaml;
-
- gnupg.home = config.homePath + "/.local/share/gnupg";
- gnupg.sshKeyPaths = [];
-
- secrets = {
- freyanetWg = {};
- };
- };
-}
diff --git a/hosts/thinkpad/wireguard.nix b/hosts/thinkpad/wireguard.nix
deleted file mode 100644
index 72eb113..0000000
--- a/hosts/thinkpad/wireguard.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- config,
- pkgs,
- ...
-}: {
- environment.systemPackages = with pkgs; [
- wireguard-tools
- ];
-
- networking.wg-quick.interfaces = {
- freyanet = {
- address = ["10.3.0.5/32"];
- dns = ["10.2.0.1"];
- privateKeyFile = config.sops.secrets.freyanetWg.path;
- autostart = false;
-
- peers = [
- {
- publicKey = "x0ykwakpYCvI/pG+nR83lNUyeOE9m54thnX3bvZ+FUk=";
- allowedIPs = ["10.0.0.0/8"];
- endpoint = "freya.cat:3000";
- persistentKeepalive = 25;
- }
- ];
- };
- };
-}
generated by cgit v1.3.1-freya (git 2.54.0) at 2026-05-27 06:10:58 +0000