From 2df56a07f2e599901f57fce4e91f529a9932a25c Mon Sep 17 00:00:00 2001
From: Xe Iaso <xe@tailscale.com>
Date: Fri, 9 Dec 2022 12:33:44 -0500
Subject: [PATCH] luxray -> froslass

Signed-off-by: Xe Iaso <xe@tailscale.com>
---
 .DS_Store                                     | Bin 0 -> 6148 bytes
 flake.nix                                     |  10 +-
 hardware/.DS_Store                            | Bin 0 -> 6148 bytes
 hosts/.DS_Store                               | Bin 0 -> 6148 bytes
 hosts/froslass/default.nix                    | 124 ++++++++++++++++++
 .../hardware-configuration.nix                |  22 +---
 hosts/luxray/default.nix                      |  20 ---
 7 files changed, 138 insertions(+), 38 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 hardware/.DS_Store
 create mode 100644 hosts/.DS_Store
 create mode 100644 hosts/froslass/default.nix
 rename hosts/{luxray => froslass}/hardware-configuration.nix (68%)
 delete mode 100644 hosts/luxray/default.nix

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..213169e187b022d80805ecfc974938fd71111504
GIT binary patch
literal 6148
zcmeHK%Z}496us_rI_XqMU4R4&q)2Q>r2`14*pxCX*b)Q_KqYAc6Ezc8NlHLfrS9Py
z_yyMd2>-$g&b5t{q=VR1F!HVJ<HtRAa(ZpYL?kB5@R+DiL=F;T`w-bV#{HbOtYum*
z0fibvQu-v3vmlYdmbY!N3RngHH3fL>c4$VD&hV?RU)~fRA`N~jQ;*)EkRn=80^g67
zwa&g@8@`A17Jfd>!5ApUjOKNYxZdD&Yn+r~`p{r}YB1V#iaEAN{?YJrlwXGDFX5k2
zR3EqX?r;7<nJ>)F_AOW>ab66E-$iS$z27--4xFCz+B=n{SNO#;pZM8Ju04}734WLT
z;CURC)Bfd0GA;Z#jWR`u!w4>~Uc_lA%ZXg3VXnBI?r^$JciO+US{>gX4v*Z?z0vx}
zU5##`eCPJv^}6d^xpDKs)9E}pOC^f~6WETG@!wmu&!}t(@!reQM5ZhN^Y$T>q?`)M
z>k_G8_)-amiswZUr}9b-Svrs;LYyITsAveokzW<2SM^1CK<7m=$9|QC>Q2oBiPPKZ
ztadW1fK}jsP=NOb7m0CfaHCOe9mv!b0N6&eGL-pKfH|(gvB8Z-^uUCs0yR~bD~8Z?
zw7bS{Y;dDd(@B`ihcGh>b3+koc8u>TcM@ZbHn$2`1?mdy>1v<P|Hps6|JO;jW)-js
zTqp%Z`@}n$;FZkTy7h8=*1AY<kl5I7qft?ind4X$_$a=Lqzrv77l31f8;xjz*$)9F
LgUzf0J5}Hp3VQ#N

literal 0
HcmV?d00001

diff --git a/flake.nix b/flake.nix
index 7d5abc3..d66adbc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -190,14 +190,18 @@
         };
 
         # work VM
-        luxray = let
+        froslass = let
         pkgs = nixpkgs.legacyPackages."aarch64-linux"; in nixpkgs.lib.nixosSystem rec {
           system = "aarch64-linux";
           modules = [
             home-manager.nixosModules.home-manager
 
             ({ ... } :{
-              imports = [./hosts/luxray];
+              imports = [./hosts/froslass ./hardware/macos-rosetta];
+              fileSystems."/host" = {
+                device = "share";
+                fsType = "virtiofs";
+              };
             })
 
             ({ config, ... }: {
@@ -206,7 +210,7 @@
 
               nixpkgs.overlays = [ emacs-overlay.overlay ];
 
-              networking.hostName = "luxray";
+              networking.hostName = "froslass";
               networking.nameservers = [ "100.100.100.100" ];
               networking.search = [ "shark-harmonic.ts.net" ];
 
diff --git a/hardware/.DS_Store b/hardware/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..e8549c1b51e4a5a8ca6b315e9f4d4ed3bd0ae41b
GIT binary patch
literal 6148
zcmeHK!EVz)5S>j!>Zq#70VH~;WQl8m6c7+`F`*o|Vgv_3!A`7V;qF$p(;T8mzL$UD
z%#ZYU+Bdr!L=r%p5JEH3>|2lD^Tux-ua}6_a5_08>Jd?ZWNdZO{3Q51=SH-Ar2|y<
z8Wq(q3o}j&lWwr3@Gm;RbJwAS3Mwh1)%oLx;u-Spr49S@uY;LWN@r+Gs_70LL#L4?
zD&rq!pVeR2)B)6n#u%>#+mK%6tNk_pE}eio2D8FQrNs=|nvyl;`JXG(S#|24&~NE!
zkymxUf1z4i?Q5OwU_00eKE$8QEUuG!S`Cx(9Ur|mrbw6lBz==-vr+HHbEE4d*I8)=
z`6L77{o7nm%xq|;dQw?!>`nyTpgZdA&F6<t`u&4&@OZE|2<L<Q=s$e$XtC%9H*ep2
z`fBvKIMIf02cht{va#!N3186pjX7s=sSBfz!CGEnsT33k!~t;t4)|9?up@4W1LA-<
zu;u{2A3`K!<gsyRUma-d768~r*#`Rj;m4ZLW8|@Mh%*S~q(CQCev6@;9QDxiB9Dzj
zCnx1MAIguc{0>Fg(Q*CI(n&=Qr4<LnfmH{#++mN`{};dB|F4SVNE{Fc{woJm`zSsd
z;+Fi{x^Z*7)`rNBNDk&T4!=v#u}d+yycFL;+CV+z4lwfAI79^@9|G0}X~coQ>cADL
C?TSAD

literal 0
HcmV?d00001

diff --git a/hosts/.DS_Store b/hosts/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a086f1e06eed036688c074ee760683e60314af0b
GIT binary patch
literal 6148
zcmeHK%Z}496us`GZORC#3y_!vQY5wmbN~Srn@kxNYzcw|pps0>Of+d+CGB)jRVjP;
z27ZAxKf=GTf^%&n<w3;`A@Hs2<Hxx-^|52eL?lMb$pKNHh+HH_=Mu7C8258(Sj)6r
z1`3YxG?B+qA|uo}pf#(2Rp9SdfZtt*LOR1w*52Pk^xgWdObwz($8<^=y{8-=3B{Dx
zJU-Vv+Vl>rj814-Ws2)HrVD095|I<c&g+rIhu`s|RX#U+&zESP#Q9<{_$pdEPP@}}
zyY8<0CODO=U=c2s`6$d@aqYR3N%XTEMla&&YTUo_Sf-0GPN$i2h$mA}UcZdfiCm53
zGM(hgH_#n!&+U!-d+YVV!@*$R8$K9r_PzD+4$AlL-rsC`?$sN&A3YnNC9_oWAYcNU
zr7{-3Y#&i+2yq@{X(H1T^s!$Df-WG?5)&5JME!>T@`QDHQo+4RGsY^r#SzQwHl&xB
zss@vIA$%$=gf=)S{za3?3!u#G&>YMu{_Tvy>hskSD090i;svIE4v&i(o3$&mTXasd
z8i&VU=AdeAy8>nzy1Uycw#O=975GmT;QhfvV)P9b8r9Z;OkDwh4w{vrtUmpL9yb7e
zgM~)4z=U=MYFA;d7{c5fgmy>2Z}^2q?M^~H8F9>$g}I>!bMX+KqLc77+T1E&6{sq(
zqpN*B|DSBX|5u%C%_?9O_@@*Q&QWkQ!jR0_+87+4wI0%2BsS(18kGw&a~!JzAH~;@
bl%db#0?;>DXhaLleh4TTY-SbsqYC^0V;<L*

literal 0
HcmV?d00001

diff --git a/hosts/froslass/default.nix b/hosts/froslass/default.nix
new file mode 100644
index 0000000..68efc73
--- /dev/null
+++ b/hosts/froslass/default.nix
@@ -0,0 +1,124 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+  # Enable network manager applet
+  programs.nm-applet.enable = true;
+
+  # Set your time zone.
+  time.timeZone = "America/Toronto";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_CA.UTF-8";
+
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  # Enable the MATE Desktop Environment.
+  services.xserver.displayManager.lightdm.enable = true;
+  services.xserver.desktopManager.mate.enable = true;
+
+  # Configure keymap in X11
+  services.xserver = {
+    layout = "us";
+    xkbVariant = "";
+  };
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    #jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.xe = {
+    isNormalUser = true;
+    description = "Xe IAso";
+    extraGroups = [ "networkmanager" "wheel" ];
+    packages = with pkgs; [
+      firefox
+    #  thunderbird
+    ];
+  };
+
+  # Enable automatic login for the user.
+  services.xserver.displayManager.autoLogin.enable = true;
+  services.xserver.displayManager.autoLogin.user = "xe";
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  #  wget
+  ];
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "22.11"; # Did you read the comment?
+
+}
diff --git a/hosts/luxray/hardware-configuration.nix b/hosts/froslass/hardware-configuration.nix
similarity index 68%
rename from hosts/luxray/hardware-configuration.nix
rename to hosts/froslass/hardware-configuration.nix
index 542ef21..f2af3a6 100644
--- a/hosts/luxray/hardware-configuration.nix
+++ b/hosts/froslass/hardware-configuration.nix
@@ -4,33 +4,24 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [ ];
 
-  boot.initrd.availableKernelModules = [ "virtio_pci" "xhci_pci" "usb_storage" "usbhid" ];
+  boot.initrd.availableKernelModules = [ "virtio_pci" "xhci_pci" "usbhid" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/4ddba4e5-4abc-439d-834c-f15b7ea5df40";
+    { device = "/dev/disk/by-uuid/d089a853-2017-4373-805a-7b9e99a60a38";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/138D-A341";
+  fileSystems."/boot/efi" =
+    { device = "/dev/disk/by-uuid/A13D-95A6";
       fsType = "vfat";
     };
 
-  fileSystems."/host" =
-    { device = "share";
-      fsType = "virtiofs";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/608a1096-5d5b-4206-ab86-2acf9e2c70bf"; }
-    ];
+  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -39,4 +30,5 @@
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp0s1.useDHCP = lib.mkDefault true;
 
+  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
 }
diff --git a/hosts/luxray/default.nix b/hosts/luxray/default.nix
deleted file mode 100644
index 3482dad..0000000
--- a/hosts/luxray/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [
-      ./hardware-configuration.nix
-      ../../hardware/macos-rosetta
-    ];
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  networking.hostName = "luxray"; # Define your hostname.
-  services.openssh.enable = true;
-  networking.firewall.enable = false;
-  system.copySystemConfiguration = true;
-  system.stateVersion = "22.05";
-}
-
-