diff --git a/configuration.nix b/configuration.nix index 43cea1d..aa7ead7 100644 --- a/configuration.nix +++ b/configuration.nix @@ -45,11 +45,11 @@ # Define user accounts users.users.aaronh = { - description = "Aaron Honeycutt"; - home = "/home/aaronh"; - extraGroups = [ "wheel" "networkmanager" "adm"]; - isNormalUser = true; - hashedPassword = "$6$aAcbLtqiqzySifls$jdKMOQjoWITHD/dWNNZVUH/qNc6aoJ7v4zYofi0U7IJSVTbmOfChS3mzaJbp57AodjdPNKPrnrip8Nlh2Qanx."; + description = "Aaron Honeycutt"; + home = "/home/aaronh"; + extraGroups = [ "wheel" "networkmanager" "adm"]; + isNormalUser = true; + hashedPassword = "$6$aAcbLtqiqzySifls$jdKMOQjoWITHD/dWNNZVUH/qNc6aoJ7v4zYofi0U7IJSVTbmOfChS3mzaJbp57AodjdPNKPrnrip8Nlh2Qanx."; }; @@ -58,29 +58,25 @@ # Install some packages environment.systemPackages = - with pkgs; - [ - avahi - dmidecode - fira - firefox - git - git-lfs - helix - libcamera - lshw - restic - roboto-slab - syncthing - nvd - unzip - wget - xz - zlib - - # Packages from Flake Inputs - #inputs.nix-software-center.packages.${system}.nix-software-center - ]; + with pkgs; + [ + avahi + dmidecode + fira + firefox + git + git-lfs + helix + libcamera + lshw + restic + roboto-slab + nvd + unzip + wget + xz + zlib + ]; # Enable/Disable hardware ## Turn off PulseAudio diff --git a/flake.nix b/flake.nix index b3959f7..8718246 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,7 @@ # Add Disko for disk management disko.nixosModules.disko ./disko-config.nix + ./gnome.nix ./configuration.nix ./hardware-configuration.nix ]; diff --git a/partitions/luks-lvm.nix b/partitions/luks-lvm.nix new file mode 100644 index 0000000..5b107b9 --- /dev/null +++ b/partitions/luks-lvm.nix @@ -0,0 +1,72 @@ +{ + disko.devices = { + disk = { + main = { + type = "disk"; + device = "/dev/sda"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "1G"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ "umask=0077" ]; + }; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "crypted"; + extraOpenArgs = [ ]; + settings = { + # if you want to use the key for interactive login be sure there is no trailing newline + # for example use `echo -n "password" > /tmp/secret.key` + #keyFile = "/tmp/secret.key"; + allowDiscards = true; + }; + content = { + type = "lvm_pv"; + vg = "pool"; + }; + }; + }; + }; + }; + }; + }; + lvm_vg = { + pool = { + type = "lvm_vg"; + lvs = { + root = { + size = "100%"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + mountOptions = [ + "defaults" + ]; + }; + }; + home = { + size = "10M"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/home"; + }; + }; + raw = { + size = "10M"; + }; + }; + }; + }; + }; +} \ No newline at end of file