diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..213169e Binary files /dev/null and b/.DS_Store differ 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 0000000..e8549c1 Binary files /dev/null and b/hardware/.DS_Store differ diff --git a/hosts/.DS_Store b/hosts/.DS_Store new file mode 100644 index 0000000..a086f1e Binary files /dev/null and b/hosts/.DS_Store differ 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"; -} - -