diff --git a/flake.nix b/flake.nix index ef8b9b0..c7da2a5 100755 --- a/flake.nix +++ b/flake.nix @@ -79,18 +79,18 @@ system = "x86_64-linux"; modules = [ ./hosts/callisto - ./modules/nixos/secureboot.nix - ./modules/nixos/gaming.nix - ./modules/nixos/audio.nix - ./modules/nixos/nvidia.nix - ./modules/nixos/networking.nix - ./modules/common/fonts.nix + # ./modules/nixos/secureboot.nix + # ./modules/nixos/gaming.nix + # ./modules/nixos/audio.nix + # ./modules/nixos/nvidia.nix + # ./modules/nixos/networking.nix + # ./modules/common/fonts.nix catppuccin.nixosModules.catppuccin - lix-module.nixosModules.default + # lix-module.nixosModules.default - lanzaboote.nixosModules.lanzaboote + # lanzaboote.nixosModules.lanzaboote home-manager.nixosModules.home-manager { @@ -99,11 +99,11 @@ home-manager.backupFileExtension = "backup"; home-manager.users.youwen = { imports = [ - ./users/youwen/linux/linux-home.nix - ./users/youwen/linux/desktop.nix - ./users/youwen/linux/programs.nix - ./users/youwen/common/core.nix - ./users/youwen/linux/catppuccin.nix + # ./users/youwen/linux/linux-home.nix + # ./users/youwen/linux/desktop.nix + # ./users/youwen/linux/programs.nix + # ./users/youwen/common/core.nix + # ./users/youwen/linux/catppuccin.nix inputs.catppuccin.homeManagerModules.catppuccin ]; }; diff --git a/hosts/callisto/default.nix b/hosts/callisto/default.nix index 24ff9ab..eef9510 100755 --- a/hosts/callisto/default.nix +++ b/hosts/callisto/default.nix @@ -7,23 +7,19 @@ { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + ./apple-silicon-support ]; - # Bootloader. - boot.loader = { - efi.canTouchEfiVariables = true; - timeout = 15; - systemd-boot = { - enable = true; - consoleMode = "auto"; - }; - }; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchVariables = false; - networking.hostName = "nixos"; # Define your hostname. + networking.hostName = "callisto"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - # select kernel - boot.kernelPackages = pkgs.linuxPackages_zen; + networking.wireless.iwd = { + enable = true; + settings.General.EnableNetworkConfiguration = true; + }; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; @@ -50,8 +46,6 @@ LC_TIME = "en_US.UTF-8"; }; - systemd.services = { NetworkManager-wait-online.enable = false; }; - # Enable the X11 windowing system. # You can disable this if you're only using the Wayland session. services.xserver.enable = false; diff --git a/hosts/callisto/default.nix.bak b/hosts/callisto/default.nix.bak new file mode 100644 index 0000000..139ee7c --- /dev/null +++ b/hosts/callisto/default.nix.bak @@ -0,0 +1,94 @@ +# Edit this configuration file to define what should be installed on your system. Help is available in the configuration.nix(5) man page, on https://search.nixos.org/options and in +# the NixOS manual (`nixos-help`). + +{ config, lib, pkgs, ... }: + +{ imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ./apple-silicon-support + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = false; + + hardware.asahi.peripheralFirmwareDirectory = ./firmware; + + boot.extraModprobeConfig = '' + options hid_apple iso_layout=0 + ''; + + networking.wireless.iwd = { + enable = true; + settings.General.EnableNetworkConfiguration = true; + }; + + networking.hostName = "callisto"; # Define your hostname. Pick only one of the below networking options. networking.wireless.enable = true; # Enables wireless support via + # wpa_supplicant. networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + Set your time zone. time.timeZone = "America/Amsterdam"; + + # Configure network proxy if necessary networking.proxy.default = "http://user:password@proxy:port/"; networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; keyMap = "us"; useXkbConfig = true; # use xkb.options in tty. + # }; + + # Enable the X11 windowing system. services.xserver.enable = true; + + + + + # Configure keymap in X11 services.xserver.xkb.layout = "us"; services.xserver.xkb.options = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. services.printing.enable = true; + + # Enable sound. hardware.pulseaudio.enable = true; OR services.pipewire = { + # enable = true; pulse.enable = true; + # }; + + # Enable touchpad support (enabled default in most desktopManager). services.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. users.users.alice = { + # isNormalUser = true; extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. packages = with pkgs; [ + # firefox tree + # ]; + # }; + + # 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; + + # Copy the NixOS configuration file and link it from the resulting system (/run/current-system/configuration.nix). This is useful in case you accidentally delete + # configuration.nix. system.copySystemConfiguration = true; + + # This option defines the first version of NixOS you have installed on this particular machine, and is used to maintain compatibility with application data (e.g. databases) + # created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, so changing it will NOT upgrade your system - see + # https://nixos.org/manual/nixos/stable/#sec-upgrading for how to actually do that. + # + # This value being lower than the current NixOS release does NOT mean your system is out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "24.11"; # Did you read the comment? + +} + diff --git a/hosts/callisto/firmware/all_firmware.tar.gz b/hosts/callisto/firmware/all_firmware.tar.gz new file mode 100755 index 0000000..b0687dc Binary files /dev/null and b/hosts/callisto/firmware/all_firmware.tar.gz differ diff --git a/hosts/callisto/firmware/kernelcache.release.mac13j b/hosts/callisto/firmware/kernelcache.release.mac13j new file mode 100755 index 0000000..71881bf Binary files /dev/null and b/hosts/callisto/firmware/kernelcache.release.mac13j differ diff --git a/hosts/callisto/hardware-configuration.nix b/hosts/callisto/hardware-configuration.nix new file mode 100644 index 0000000..1d0cdb3 --- /dev/null +++ b/hosts/callisto/hardware-configuration.nix @@ -0,0 +1,37 @@ +# 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 = [ "usb_storage" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/bc88058e-6e3a-4987-b78e-e19cb5611608"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/852F-07F1"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + 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 + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; +}