From 900a38cb36112bf9f31209a18fa59fb1eedd3e09 Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Wed, 15 Jan 2025 11:41:35 -0500 Subject: [PATCH] push thinkcenter disk config --- hosts/WCE-Overseer/thinkcenter-disks.nix | 33 ++++++++++++++++++++++++ modules/options.nix | 2 +- modules/software/usershell.nix | 9 +++---- modules/users/crow/configs/direnv.nix | 8 +++--- modules/users/live/default.nix | 5 ++-- shell.nix | 10 +++---- 6 files changed, 50 insertions(+), 17 deletions(-) create mode 100644 hosts/WCE-Overseer/thinkcenter-disks.nix diff --git a/hosts/WCE-Overseer/thinkcenter-disks.nix b/hosts/WCE-Overseer/thinkcenter-disks.nix new file mode 100644 index 0000000..936d0ef --- /dev/null +++ b/hosts/WCE-Overseer/thinkcenter-disks.nix @@ -0,0 +1,33 @@ +{ + disko.devices = { + disk = { + disk0 = { + device = "/dev/sda"; + type = "disk"; + content = { + type = "gpt"; + partitions = { + ESP = { + label = "boot"; + type = "EF00"; + size = "500M"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = ["umask=0077"]; + }; + }; + root = { + size = "100%"; + content = { + type = "zfs"; + pool = "zpool"; + }; + }; + }; + }; + }; + }; + }; +} diff --git a/modules/options.nix b/modules/options.nix index 7cc29fc..9ee635a 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -35,7 +35,7 @@ }; live = { enable = lib.mkEnableOption "enable live disk user"; - }; + }; }; desktop = { diff --git a/modules/software/usershell.nix b/modules/software/usershell.nix index bd4c8bc..35d3656 100644 --- a/modules/software/usershell.nix +++ b/modules/software/usershell.nix @@ -48,12 +48,11 @@ format = "[[  $time ](fg:#a0a9cb bg:#1d2230)]($style)"; }; nix_shell = { - disabled = false; - symbol = ""; - format = "via [(\($symbol-$name\))]($style) "; - style = "bold blue"; + disabled = false; + symbol = ""; + format = "via [(\($symbol-$name\))]($style) "; + style = "bold blue"; }; - }; }; users.defaultUserShell = pkgs.zsh; diff --git a/modules/users/crow/configs/direnv.nix b/modules/users/crow/configs/direnv.nix index 6e3b6c9..2b51c9d 100644 --- a/modules/users/crow/configs/direnv.nix +++ b/modules/users/crow/configs/direnv.nix @@ -1,6 +1,6 @@ { - programs.direnv = { - enable = true; - nix-direnv.enable = true; - }; + programs.direnv = { + enable = true; + nix-direnv.enable = true; + }; } diff --git a/modules/users/live/default.nix b/modules/users/live/default.nix index 6a06e95..e3f6828 100644 --- a/modules/users/live/default.nix +++ b/modules/users/live/default.nix @@ -3,13 +3,14 @@ lib, config, ... -}: lib.mkIf config.user.live.enable { +}: +lib.mkIf config.user.live.enable { config.users.users.live = { isNormalUser = true; initialPassword = "live"; extraGroups = ["wheel" "networkmanager" "audio" "plugdev"]; openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCccZhYmAIdbBv0vuvhKvnD0sm6dphdngef1jFwDhcUexoEZq8sXB3N69gsQV+ievv++T5SfEwLPEJSgVEwtwYHTCwxnGscD+thYXOacoMr3++1toCKgFHLIWrbma8jSzSDp8ERuVcbeYo/xckxCL3+axlUmyQw6TXsDbOJTYhGuJdCMlHJNl0EftwgnJZ4e+WqW/5jmG9Nu3KDgpyjYVA4v6xtkjS+NCVA3jOdDs0JPFemhb2b5ItAGe60IH65PaX63QFysxMWil0+EF04L+23sYwRMMfz9F/AX62uonemzROTAIu78grUWgjHqGQ2yOhdnOwNT0wox1KhG+r/lvFX" + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCccZhYmAIdbBv0vuvhKvnD0sm6dphdngef1jFwDhcUexoEZq8sXB3N69gsQV+ievv++T5SfEwLPEJSgVEwtwYHTCwxnGscD+thYXOacoMr3++1toCKgFHLIWrbma8jSzSDp8ERuVcbeYo/xckxCL3+axlUmyQw6TXsDbOJTYhGuJdCMlHJNl0EftwgnJZ4e+WqW/5jmG9Nu3KDgpyjYVA4v6xtkjS+NCVA3jOdDs0JPFemhb2b5ItAGe60IH65PaX63QFysxMWil0+EF04L+23sYwRMMfz9F/AX62uonemzROTAIu78grUWgjHqGQ2yOhdnOwNT0wox1KhG+r/lvFX" ]; }; } diff --git a/shell.nix b/shell.nix index 6dcbd9c..5fd2372 100644 --- a/shell.nix +++ b/shell.nix @@ -2,11 +2,11 @@ default = pkgs.mkShell { NIX_CONFIG = "extra-experimental-features = nix-command flakes"; nativeBuildInputs = with pkgs; [ - git - vim - nix - alejandra - nixos-generators + git + vim + nix + alejandra + nixos-generators ]; }; }