summaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
Diffstat (limited to 'nixos')
-rw-r--r--nixos/kusanagi-old.nix105
-rw-r--r--nixos/kusanagi.nix140
-rw-r--r--nixos/zinzin.nix93
3 files changed, 169 insertions, 169 deletions
diff --git a/nixos/kusanagi-old.nix b/nixos/kusanagi-old.nix
new file mode 100644
index 0000000..4b75489
--- /dev/null
+++ b/nixos/kusanagi-old.nix
@@ -0,0 +1,105 @@
+# Do not modify this file! It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations. Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+ imports = [
+ (modulesPath + "/installer/scan/not-detected.nix")
+ ./common.nix
+ #./kde.nix
+ ./icewm.nix
+ #./gnome.nix
+ ];
+
+ networking.hostName = "kusanagi";
+
+ # Use systemd-boot
+ boot.loader.systemd-boot.enable = true;
+ boot.loader.efi.canTouchEfiVariables = true;
+
+ boot.initrd.availableKernelModules =
+ [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+ boot.initrd.kernelModules = [ "dm-snapshot" ];
+ boot.kernelModules = [ "kvm-intel" ];
+ boot.extraModulePackages = [ ];
+
+ specialisation = {
+ # Old computer challenge
+ tiny.configuration = {
+ boot.kernelParams = [
+ "maxcpus=1"
+ "mem=512M"
+ ];
+ powerManagement.cpuFreqGovernor = "powersave";
+ };
+ };
+
+ boot.initrd.luks.devices = {
+ crypted = {
+ device = "/dev/disk/by-uuid/e3271725-effb-4b00-a5d4-8a7a64f55420";
+ allowDiscards = true;
+ };
+ };
+
+ fileSystems."/" = {
+ device = "/dev/disk/by-uuid/2f606c6b-8009-4158-b367-2e0cf1a57ade";
+ fsType = "ext4";
+ options = [ "discard" ];
+ };
+
+ fileSystems."/boot" = {
+ device = "/dev/disk/by-uuid/0143-7D54";
+ fsType = "vfat";
+ };
+
+ fileSystems."/home" = {
+ device = "/dev/disk/by-uuid/f955ce34-f25e-4abf-8732-bcf17465f78c";
+ fsType = "ext4";
+ options = [ "discard" ];
+ };
+
+ swapDevices =
+ [{ device = "/dev/disk/by-uuid/c78cfb77-75ee-4aae-9b24-b91f8eebb7c2"; }];
+
+ # Nix-serve for friends on local network
+ services.nix-serve = {
+ enable = true;
+ secretKeyFile = "/var/lib/nix-serve/cache-priv-key.pem";
+ };
+ services.nginx = {
+ enable = true;
+ recommendedProxySettings = true;
+ virtualHosts = {
+ "adnab.local" = {
+ locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
+ };
+ };
+ };
+ networking.extraHosts = ''
+ 127.0.0.1 adnab.local
+ '';
+
+ # Docker
+ virtualisation.docker.enable = true;
+ users.users.lx.extraGroups = [ "docker" ];
+ environment.systemPackages = with pkgs; [
+ docker-compose
+ ];
+
+ # Printer
+ services.printing.drivers = [ pkgs.cups-brother-hl1210w ];
+
+ networking.firewall.allowedTCPPorts = [
+ 80 # nginx
+ 57890 # troop
+ ];
+ networking.firewall.allowedUDPPorts = [
+ 57890 # troop
+ ];
+
+ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+ #powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+ hardware.cpu.intel.updateMicrocode =
+ lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/nixos/kusanagi.nix b/nixos/kusanagi.nix
index 4b75489..59d0eee 100644
--- a/nixos/kusanagi.nix
+++ b/nixos/kusanagi.nix
@@ -4,102 +4,90 @@
{ config, lib, pkgs, modulesPath, ... }:
{
- imports = [
- (modulesPath + "/installer/scan/not-detected.nix")
- ./common.nix
- #./kde.nix
- ./icewm.nix
- #./gnome.nix
- ];
+ imports =
+ [
+ (modulesPath + "/installer/scan/not-detected.nix")
+ ./common.nix
+ ./icewm.nix
+ ];
networking.hostName = "kusanagi";
+ networking.hostId = "b807fe35";
- # Use systemd-boot
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
- boot.initrd.availableKernelModules =
- [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
- boot.initrd.kernelModules = [ "dm-snapshot" ];
+ boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+ boot.initrd.kernelModules = [ ];
+ boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
- specialisation = {
- # Old computer challenge
- tiny.configuration = {
- boot.kernelParams = [
- "maxcpus=1"
- "mem=512M"
- ];
- powerManagement.cpuFreqGovernor = "powersave";
- };
- };
-
boot.initrd.luks.devices = {
- crypted = {
- device = "/dev/disk/by-uuid/e3271725-effb-4b00-a5d4-8a7a64f55420";
+ lukszfs = {
+ device = "/dev/disk/by-uuid/90f30f15-3ee3-4a15-bab6-36fb31630e2a";
allowDiscards = true;
};
};
+ # ---- standard filesystems ----
+
+ fileSystems."/boot" =
+ { device = "/dev/disk/by-uuid/E2FA-FB92";
+ fsType = "vfat";
+ };
+
+ fileSystems."/home" =
+ { device = "kusanagi/nixos/home";
+ fsType = "zfs";
+ neededForBoot = true; # because contains password files used below
+ };
+
+ fileSystems."/nix" =
+ { device = "kusanagi/nixos/nix";
+ fsType = "zfs";
+ };
+
+ swapDevices = [ ];
+
+ # ---- tmpfs root filesystem with special persisted directory ----
+
fileSystems."/" = {
- device = "/dev/disk/by-uuid/2f606c6b-8009-4158-b367-2e0cf1a57ade";
- fsType = "ext4";
- options = [ "discard" ];
+ device = "none";
+ fsType = "tmpfs";
+ options = [ "defaults" "size=4G" "mode=755" ];
};
- fileSystems."/boot" = {
- device = "/dev/disk/by-uuid/0143-7D54";
- fsType = "vfat";
- };
+ fileSystems."/persist" =
+ { device = "kusanagi/nixos/persist";
+ fsType = "zfs";
+ neededForBoot = true; # because contains /var/log
+ };
- fileSystems."/home" = {
- device = "/dev/disk/by-uuid/f955ce34-f25e-4abf-8732-bcf17465f78c";
- fsType = "ext4";
- options = [ "discard" ];
- };
+ environment.etc."machine-id".source = "/persist/etc/machine-id";
- swapDevices =
- [{ device = "/dev/disk/by-uuid/c78cfb77-75ee-4aae-9b24-b91f8eebb7c2"; }];
+ fileSystems."/etc/NetworkManager/system-connections" =
+ { device = "/persist/etc/NetworkManager/system-connections";
+ fsType = "none";
+ depends = [ "/persist" "/mnt-root/persist" ];
+ options = [ "bind" ];
+ };
- # Nix-serve for friends on local network
- services.nix-serve = {
- enable = true;
- secretKeyFile = "/var/lib/nix-serve/cache-priv-key.pem";
- };
- services.nginx = {
- enable = true;
- recommendedProxySettings = true;
- virtualHosts = {
- "adnab.local" = {
- locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
- };
- };
- };
- networking.extraHosts = ''
- 127.0.0.1 adnab.local
- '';
-
- # Docker
- virtualisation.docker.enable = true;
- users.users.lx.extraGroups = [ "docker" ];
- environment.systemPackages = with pkgs; [
- docker-compose
- ];
-
- # Printer
- services.printing.drivers = [ pkgs.cups-brother-hl1210w ];
-
- networking.firewall.allowedTCPPorts = [
- 80 # nginx
- 57890 # troop
- ];
- networking.firewall.allowedUDPPorts = [
- 57890 # troop
- ];
+ fileSystems."/var/log" =
+ { device = "/persist/var/log";
+ fsType = "none";
+ depends = [ "/persist" "/mnt-root/persist" ];
+ options = [ "bind" ];
+ };
+
+ # ---- immutable user config for tmpfs root ----
+
+ users.mutableUsers = false;
+ users.users.lx.passwordFile = "/home/lx/.password";
+
+ # ----
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
- #powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
- hardware.cpu.intel.updateMicrocode =
- lib.mkDefault config.hardware.enableRedistributableFirmware;
+ powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+ hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}
diff --git a/nixos/zinzin.nix b/nixos/zinzin.nix
deleted file mode 100644
index 12e3d1f..0000000
--- a/nixos/zinzin.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-# Do not modify this file! It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations. Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
- imports =
- [
- (modulesPath + "/installer/scan/not-detected.nix")
- ./common.nix
- ./icewm.nix
- ];
-
- networking.hostName = "zinzin";
- networking.hostId = "304a68ef";
-
- boot.loader.systemd-boot.enable = true;
- boot.loader.efi.canTouchEfiVariables = true;
-
- boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
- boot.initrd.kernelModules = [ ];
- boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
- boot.kernelModules = [ "kvm-intel" ];
- boot.extraModulePackages = [ ];
-
- boot.initrd.luks.devices = {
- lukszfs = {
- device = "/dev/disk/by-uuid/f75e45a4-dc1e-4f38-b2d8-3336ec3790ef";
- allowDiscards = true;
- };
- };
-
- # ---- standard filesystems ----
-
- fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/3BC8-460B";
- fsType = "vfat";
- };
-
- fileSystems."/home" =
- { device = "zinzin/nixos/home";
- fsType = "zfs";
- neededForBoot = true; # because contains password files used below
- };
-
- fileSystems."/nix" =
- { device = "zinzin/nixos/nix";
- fsType = "zfs";
- };
-
- swapDevices = [ ];
-
- # ---- tmpfs root filesystem with special persisted directory ----
-
- fileSystems."/" = {
- device = "none";
- fsType = "tmpfs";
- options = [ "defaults" "size=4G" "mode=755" ];
- };
-
- fileSystems."/persist" =
- { device = "zinzin/nixos/persist";
- fsType = "zfs";
- neededForBoot = true; # because contains /var/log
- };
-
- environment.etc."machine-id".source = "/persist/etc/machine-id";
-
- fileSystems."/etc/NetworkManager/system-connections" =
- { device = "/persist/etc/NetworkManager/system-connections";
- fsType = "none";
- depends = [ "/persist" "/mnt-root/persist" ];
- options = [ "bind" ];
- };
-
- fileSystems."/var/log" =
- { device = "/persist/var/log";
- fsType = "none";
- depends = [ "/persist" "/mnt-root/persist" ];
- options = [ "bind" ];
- };
-
- # ---- immutable user config for tmpfs root ----
-
- users.mutableUsers = false;
- users.users.lx.passwordFile = "/home/lx/.password";
-
- # ----
-
- nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
- powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
- hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 06:52:44 +0000