diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix index 9581c40a..85fa3ab7 100644 --- a/hosts/petalburg/default.nix +++ b/hosts/petalburg/default.nix @@ -77,8 +77,7 @@ in { desktopConfig = { enable = true; - windowManagers.hyprland.enable = false; - desktopEnvironments.gnome.enable = true; + windowManagers.hyprland.enable = true; }; systemConfig = { diff --git a/hosts/petalburg/home.nix b/hosts/petalburg/home.nix index 9f1530aa..1b8e0e35 100644 --- a/hosts/petalburg/home.nix +++ b/hosts/petalburg/home.nix @@ -12,16 +12,13 @@ desktopEnv.hyprland.enable = true; }; - userConfig.dustin.enable = true; - home-manager.users.dustin = { - imports = [ ../../homeManagerModules ]; - home.username = "dustin"; - home.homeDirectory = "/home/dustin"; + # userConfig.dustin.enable = true; + # home-manager.users.dustin = { + # imports = [ ../../homeManagerModules ]; + # home.username = "dustin"; + # home.homeDirectory = "/home/dustin"; - home.stateVersion = "23.11"; - programs.home-manager.enable = true; - - desktopEnv.hyprland.enable = false; - desktopEnv.gnome.enable = true; - }; + # home.stateVersion = "23.11"; + # programs.home-manager.enable = true; + # }; } diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix index 44842b58..e3d6ca3b 100644 --- a/hosts/rustboro/default.nix +++ b/hosts/rustboro/default.nix @@ -13,32 +13,32 @@ # Bootloader. loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; - - initrd.postDeviceCommands = lib.mkAfter '' - mkdir /btrfs_tmp - mount /dev/sda2 /btrfs_tmp - if [[ -e /btrfs_tmp/rootfs ]]; then - mkdir -p /btrfs_tmp/old_roots - timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/rootfs)" "+%Y-%m-%-d_%H:%M:%S") - mv /btrfs_tmp/rootfs "/btrfs_tmp/old_roots/$timestamp" - fi - - delete_subvolume_recursively() { - IFS=$'\n' - for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do - delete_subvolume_recursively "/btrfs_tmp/$i" - done - btrfs subvolume delete "$1" - } - - for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +5); do - delete_subvolume_recursively "$i" - done - - btrfs subvolume create /btrfs_tmp/rootfs - umount /btrfs_tmp - ''; }; + # initrd.postDeviceCommands = lib.mkAfter '' + # mkdir /btrfs_tmp + # mount /dev/sda2 /btrfs_tmp + # if [[ -e /btrfs_tmp/rootfs ]]; then + # mkdir -p /btrfs_tmp/old_roots + # timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/rootfs)" "+%Y-%m-%-d_%H:%M:%S") + # mv /btrfs_tmp/rootfs "/btrfs_tmp/old_roots/$timestamp" + # fi + + # delete_subvolume_recursively() { + # IFS=$'\n' + # for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do + # delete_subvolume_recursively "/btrfs_tmp/$i" + # done + # btrfs subvolume delete "$1" + # } + + # for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +5); do + # delete_subvolume_recursively "$i" + # done + + # btrfs subvolume create /btrfs_tmp/rootfs + # umount /btrfs_tmp + # ''; + # }; networking.hostName = "rustboro"; # Define your hostname. @@ -62,19 +62,16 @@ steam.enable = false; }; - users.users.aly.hashedPassword = - "$y$j9T$VdtiEyMOegHpcUwgmCVFD0$K8Ne6.zk//VJNq2zxVQ0xE0Wg3LohvAQd3Xm9aXdM15"; - - environment.persistence."/persist" = { - hideMounts = true; - directories = [ - "/etc/NetworkManager/system-connections" - "/etc/ssh" - ]; - files = [ - "/etc/machine-id" - ]; - }; + # environment.persistence."/persist" = { + # hideMounts = true; + # directories = [ + # "/etc/NetworkManager/system-connections" + # "/etc/ssh" + # ]; + # files = [ + # "/etc/machine-id" + # ]; + # }; system.stateVersion = "23.11"; # Did you read the comment? } diff --git a/hosts/rustboro/home.nix b/hosts/rustboro/home.nix index 29937bb7..32684ec5 100644 --- a/hosts/rustboro/home.nix +++ b/hosts/rustboro/home.nix @@ -1,6 +1,23 @@ { inputs, config, pkgs, lib, ... }: { + userConfig.dustin.enable = true; + + users.users.dustin.hashedPassword = + "$y$j9T$OXQYhj4IWjRJWWYsSwcqf.$lCcdq9S7m0EAdej9KMHWj9flH8K2pUb2gitNhLTlLG/"; + + home-manager.users.dustin = { + imports = [ ../../homeManagerModules ]; + home.username = "dustin"; + home.homeDirectory = "/home/dustin"; + + home.stateVersion = "23.11"; + programs.home-manager.enable = true; + }; + + users.users.aly.hashedPassword = + "$y$j9T$VdtiEyMOegHpcUwgmCVFD0$K8Ne6.zk//VJNq2zxVQ0xE0Wg3LohvAQd3Xm9aXdM15"; + home-manager.users.aly = { imports = [ ../../homeManagerModules ]; home.username = "aly";