Merge branch 'main' of https://labs.scarif.space/chris/nixos

flake.nix

@@ -32,19 +32,7 @@
                     impermanence.nixosModules.impermanence
                     home-manager.nixosModules.home-manager
                     {
-                        environment.persistence."/persist" = {
+                        # nix --extra-experimental-features "nix-command flakes" run github:nix-community/disko/latest#disko-install -- --flake ./#stationette --disk stationette --write-efi-boot-entries /dev/sda
-                            hideMounts = true;
-                            directories = [
-                                "/var/log"
-                                "/var/lib/bluetooth"
-                                "/var/lib/networkmanager"
-                                "/etc/ssh"
-                            ];
-                            files = [
-                                "/etc/machine-id"
-                            ];
-                        };
-                        # nix --extra-experimental-features "nix-command flakes" run github:nix-community/disko/latest#disko-install -- --flake ./#stationette --write-efi-boot-entries --disk stationette /dev/sda
                         disko.devices = {
                             disk = {
                                 stationette = {
@@ -97,6 +85,53 @@
                             systemd-boot.enable = true;
                             efi.canTouchEfiVariables = true;
                         };
+                        environment = {
+                            persistence."/persist" = {
+                                hideMounts = true;
+                                directories = [
+                                    "/var/log"
+                                    "/var/lib/bluetooth"
+                                    "/var/lib/networkmanager"
+                                    "/etc/ssh"
+                                ];
+                                files = [
+                                    "/etc/machine-id"
+                                ];
+                            };
+                            systemPackages = with pkgs; [
+                                #bat
+                                #highlight
+                                #btop
+                                #eza
+                                #fzf
+                                #git
+                                #gnumake
+                                #neofetch
+                                #neovim
+                                #ripgrep
+                                #tldr
+                                #unzip
+                                #openssl
+                                #wget
+                                #zip
+                                #zoxide
+                                #jq
+                                #lazygit
+                                #lazysql
+                                #less
+                                #mlocate
+                                #tree
+                                #tmux
+                                #tmuxinator
+                                #wget
+                                #zenity
+                                #gum
+                                #yazi
+                                #rsync
+                                #p7zip
+                                #impala
+                            ];
+                        };
                         networking = {
                             hostName = "stationette";
                             networkmanager.enable = true;