diff options
| -rw-r--r-- | configuration.nix | 13 | ||||
| -rw-r--r-- | hardware-configuration.nix | 68 | ||||
| -rw-r--r-- | home/home.nix | 6 | ||||
| -rw-r--r-- | home/sway_config | 2 |
4 files changed, 46 insertions, 43 deletions
diff --git a/configuration.nix b/configuration.nix index 6ac1f89..5e4704b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,11 +1,7 @@ {lib, ...}: { boot.loader = { efi.canTouchEfiVariables = true; - limine = { - enable = true; - efiSupport = true; - }; - timeout = lib.mkDefault 2; + systemd-boot.enable = true; }; environment.persistence."/persist" = { enable = true; @@ -17,8 +13,14 @@ "/var/lib/systemd/coredump" "/etc/NetworkManager/system-connections" ]; + files = [ + "/etc/machine-id" + "/etc/shadow" + "/etc/shadow-" + ]; users."mtgmonkey" = { directories = [ + "conf" "Downloads" ".backups" ".ssh" @@ -66,6 +68,7 @@ users.users."mtgmonkey" = { isNormalUser = true; description = "mtgmonkey"; + initialPassword = "password"; extraGroups = [ "networkmanager" "wheel" diff --git a/hardware-configuration.nix b/hardware-configuration.nix index aa58733..7d2b1aa 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,47 +1,47 @@ # 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") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + config, + lib, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/6546ea32-a94f-4d2d-8949-fe5f7009bd22"; - fsType = "ext4"; - }; + boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" "sdhci_pci"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/038cd71d-c0c6-4e3b-950c-2b239d67670b"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "none"; + fsType = "tmpfs"; + options = ["defaults" "size=50%" "mode=755"]; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/5AEC-83B7"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/107D-CA99"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; - fileSystems."/home" = - { device = "/dev/disk/by-uuid/bc77f555-144f-4c8c-86cb-e2785783c49a"; - fsType = "ext4"; - }; + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/1a8ff2e3-8bed-4acb-9f03-45583f1d651d"; + fsType = "btrfs"; + }; - fileSystems."/home/mtgmonkey/tmp" = - { device = "/dev/mmcblk0p1"; - fsType = "ext4"; - }; + fileSystems."/persist" = { + device = "/dev/disk/by-label/NIXPERSIST"; + neededForBoot = true; + fsType = "btrfs"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/394f46fe-65c3-4e35-acf8-44d81ed5a674"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/18c2ef9b-1568-41e4-b67a-96155822ae02";} + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/home/home.nix b/home/home.nix index 6147f5f..cb87097 100644 --- a/home/home.nix +++ b/home/home.nix @@ -12,7 +12,7 @@ in { wayland.windowManager.sway.enable = true; home = { username = "mtgmonkey"; - homeDirectory = "/home/mtgmonkey"; + homeDirectory = "/home/${config.home.username}"; stateVersion = "26.05"; packages = [ pkgs.acpi @@ -41,8 +41,8 @@ in { enable = true; shellAliases = { neofetch = "fastfetch"; - ls = "lsd"; - ll = "lsd -l"; + ls = lib.mkForce "lsd"; + ll = lib.mkForce "lsd -l"; l = "lsd -la"; cd = "z"; gg = "git log --oneline --abbrev-commit --all --graph --decorate --color"; diff --git a/home/sway_config b/home/sway_config index d1d7868..f7bd32d 100644 --- a/home/sway_config +++ b/home/sway_config @@ -9,7 +9,7 @@ set $screenshot grim -g "$(slurp)" floating_modifier $mod normal workspace_layout stacking -output * bg /home/mtgmonkey/.dotfiles/home/stylix/nix-wallpaper-gear.png fill +output * bg /home/mtgmonkey/conf/home/nix-wallpaper-gear.png fill # launch programs bindsym $mod+Shift+Return exec $term |