From 76e49249f3cec7a66b7c6f1263292d3966e6b7b7 Mon Sep 17 00:00:00 2001 From: Akshay Date: Thu, 28 Mar 2024 21:42:26 +0000 Subject: add laurel --- flake.lock | 12 ++--- flake.nix | 12 +++++ hosts/laurel/configuration.nix | 85 +++++++++++++++++++++++++++++++++ hosts/laurel/hardware-configuration.nix | 43 +++++++++++++++++ 4 files changed, 146 insertions(+), 6 deletions(-) create mode 100644 hosts/laurel/configuration.nix create mode 100644 hosts/laurel/hardware-configuration.nix diff --git a/flake.lock b/flake.lock index d46046d..d485422 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1701433070, - "narHash": "sha256-Gf9JStfENaUQ7YWFz3V7x/srIwr4nlnVteqaAxtwpgM=", + "lastModified": 1710532761, + "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a8545f5e737a6338814a4676dc8e18c7f43fc57", + "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", "type": "github" }, "original": { @@ -96,11 +96,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707205916, - "narHash": "sha256-fmRJilYGlB7VCt3XsdYxrA0u8e/K84O5xYucerUY0iM=", + "lastModified": 1710534455, + "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8cc79aa39bbc6eaedaf286ae655b224c71e02907", + "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7a397a2..ff479f9 100644 --- a/flake.nix +++ b/flake.nix @@ -112,6 +112,18 @@ ]; }; + laurel = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ({ config = { nix.registry.nixpkgs.flake = nixpkgs; }; }) + { + imports = [ ./hosts/laurel/configuration.nix ]; + _module.args.self = self; + } + flaresolverr.nixosModules.default + ]; + }; + }; }; diff --git a/hosts/laurel/configuration.nix b/hosts/laurel/configuration.nix new file mode 100644 index 0000000..d0edee3 --- /dev/null +++ b/hosts/laurel/configuration.nix @@ -0,0 +1,85 @@ +# 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 = "nixos"; # 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. + networking.hostName = "laurel"; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + + time.timeZone = "Europe/London"; + i18n.defaultLocale = "en_US.UTF-8"; + + + nixpkgs.config.packageOverrides = pkgs: { + vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; + }; + + # Enable sound. + sound.enable = true; + hardware.pulseaudio.enable = true; + hardware.opengl = { + enable = true; + extraPackages = with pkgs; [ + intel-media-driver + vaapiIntel + vaapiVdpau + libvdpau-va-gl + intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in) + ]; + }; + + environment.systemPackages = with pkgs; [ + vim + wget + curl + ]; + + users.users.op = { + isNormalUser = true; + extraGroups = [ "wheel" "tty" ]; + home = "/home/op"; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG4oThdAy5wQtzCarxDPuzWX6ImYw0c1QfkF0+wZNE6o np@myrtle" + ]; + }; + services.openssh.enable = true; + services.tailscale.enable = true; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + # 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. + # + # 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 = "23.11"; # Did you read the comment? + +} + diff --git a/hosts/laurel/hardware-configuration.nix b/hosts/laurel/hardware-configuration.nix new file mode 100644 index 0000000..142c4a7 --- /dev/null +++ b/hosts/laurel/hardware-configuration.nix @@ -0,0 +1,43 @@ +# 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" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { + device = "/dev/disk/by-uuid/0a4289c5-753f-410a-aca0-0d70b448dffc"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { + device = "/dev/disk/by-uuid/FDC2-EFD1"; + fsType = "vfat"; + }; + + swapDevices = + [{ device = "/dev/disk/by-uuid/22b596ba-93ef-4a41-8e4c-292e5baa36e8"; }]; + + # 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.enp1s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} + -- cgit v1.2.3