From da4f05d36095324e60e46664052e08293597a882 Mon Sep 17 00:00:00 2001 From: Emma Thorpe Date: Thu, 29 May 2025 16:36:13 +0100 Subject: [PATCH] feat: get X1 Carbon working --- emmathorpe/shell.nix | 31 ----- flake.nix | 28 ++-- system/machine/X1/configuration.nix | 139 +++++++++++++++++++ system/machine/X1/hardware-configuration.nix | 42 ++++++ 4 files changed, 201 insertions(+), 39 deletions(-) delete mode 100644 emmathorpe/shell.nix create mode 100644 system/machine/X1/configuration.nix create mode 100644 system/machine/X1/hardware-configuration.nix diff --git a/emmathorpe/shell.nix b/emmathorpe/shell.nix deleted file mode 100644 index d447d0c..0000000 --- a/emmathorpe/shell.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - #programs.zsh = { - # enable = true; - # ohMyZsh = { - # enable = true; - # plugins = [ "git" "man" "history-substring-search" ]; - # theme = "robbyrussell"; - # }; - # syntaxHighlighting.enable = true; - # autosuggestions.enable = true; - #}; - #programs.tmux = { - # enable = true; - # reverseSplit = true; - # terminal = "tmux-direct"; - # newSession = true; - # keyMode = "vi"; - # historyLimit = 50000; - # extraConfig = '' - # # Enable mouse support - # set -g mouse on - # # Set pane navigation - # bind -n M-Left select-pane -L - # bind -n M-Right select-pane -R - # bind -n M-Up select-pane -U - # bind -n M-Down select-pane -D - # ''; - #}; -} diff --git a/flake.nix b/flake.nix index 83b3f84..e188b6a 100644 --- a/flake.nix +++ b/flake.nix @@ -7,12 +7,10 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = inputs @ { self, nixpkgs, home-manager, ... }: - let system = "aarch64-linux"; in { - nixosConfigurations = { - emmathorpe-mbp = nixpkgs.lib.nixosSystem { - inherit system; - specialArgs = { inherit inputs; }; + outputs = inputs @ { self, nixpkgs, home-manager, ... }: { + nixosConfigurations.emmathorpe-mbp = nixpkgs.lib.nixosSystem { + system = "aarch64-linux"; + specialArgs = { inherit inputs; }; modules = [ ./system/machine/MBP-Asahi/configuration.nix ./emmathorpe/user.nix @@ -25,6 +23,20 @@ } ]; }; - }; - }; + nixosConfigurations.emmathorpe-x1c = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ + ./system/machine/X1/configuration.nix + ./emmathorpe/user.nix + ./emmathorpe/swaywm.nix + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.emmathorpe = import ./emmathorpe/home.nix; + } + ]; + }; + }; } diff --git a/system/machine/X1/configuration.nix b/system/machine/X1/configuration.nix new file mode 100644 index 0000000..6efe63f --- /dev/null +++ b/system/machine/X1/configuration.nix @@ -0,0 +1,139 @@ +# 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 + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "X1-NixOS"; # Define your hostname. + networking.domain = "client.cbg.emmaisvery.gay"; + features.swayDesktop.enable = true; + # Pick only one of the below networking options. + networking.wireless.iwd = { + enable = true; + settings.General.EnableNetworkConfiguration = true; + }; + # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # Set your time zone. + time.timeZone = "Europe/London"; + + # 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_GB.UTF-8"; + console = { + font = "Lat2-Terminus16"; + keyMap = "dvorak"; + # 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; [ + # 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. + git + neofetch + # wget + ]; + nixpkgs.config.allowUnfree = true; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + # 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? + + + # TODO: Move to fprint security module to import anywhere + services.fprintd.enable = true; + security.pam.services.swaylock = { + fprintAuth = true; + }; + +} + diff --git a/system/machine/X1/hardware-configuration.nix b/system/machine/X1/hardware-configuration.nix new file mode 100644 index 0000000..e713bf6 --- /dev/null +++ b/system/machine/X1/hardware-configuration.nix @@ -0,0 +1,42 @@ +# 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 = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/a7145534-b122-4899-a75a-3d2e78474d6b"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/1338-3D4F"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/79426a6d-06fa-482b-8a7e-f7e5946fc7f5"; } + ]; + + # 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.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; + # networking.interfaces.wwan0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}