From 03727d99846a4c389fc88d1b359a8bb6f7e8c216 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Tue, 19 Apr 2022 20:46:33 +0000 Subject: [PATCH] Add x1c1 base configuration --- flake.lock | 24 +++--- flake.nix | 17 +++++ nki-x1c1/configuration.nix | 113 ++++++++++++++++++++++++++++ nki-x1c1/hardware-configuration.nix | 36 +++++++++ 4 files changed, 178 insertions(+), 12 deletions(-) create mode 100644 nki-x1c1/configuration.nix create mode 100644 nki-x1c1/hardware-configuration.nix diff --git a/flake.lock b/flake.lock index 366577c..d29cef6 100644 --- a/flake.lock +++ b/flake.lock @@ -134,11 +134,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1648040419, - "narHash": "sha256-tq+6VYs7HAKocKzDZqHfmxqXe+tUiPs5gylfhDVgBrI=", + "lastModified": 1649980339, + "narHash": "sha256-rTo9VDeIQbNyGGeW0kw21AI8Q6QPv/9B6cmlOCyTHwQ=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "0552752da722aca36e40ef664e9c4a0928756e4e", + "rev": "047157f641c27dec6f32f64b57776131e74a2176", "type": "github" }, "original": { @@ -165,11 +165,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1648219316, - "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "lastModified": 1650194139, + "narHash": "sha256-kurZsqeOw5fpqA/Ig+8tHvbjwzs5P9AE6WUKOX1m6qM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "rev": "bd4dffcdb7c577d74745bd1eff6230172bd176d5", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1647966636, - "narHash": "sha256-JmxMJmdwNDgVZGG09j7XHr/zEiKKym0qEB5R3ZHXvoQ=", + "lastModified": 1649978285, + "narHash": "sha256-QXLFVP46o5kf5tA90mQAmy+1fSnDKEcNwo+5EB95smQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "209598e67e940ba3e42f878c407ecf96b4948615", + "rev": "38cf4f11411b95b333719c0f4236877be68aa51a", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1649490789, - "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=", + "lastModified": 1650244918, + "narHash": "sha256-DsS5nxjTpnoUC4pNXJI1rit7TnDTij8vQDa5PtcDCD0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75", + "rev": "7b38b03d76ab71bdc8dc325e3f6338d984cc35ca", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 41c11cb..eb7469c 100644 --- a/flake.nix +++ b/flake.nix @@ -94,6 +94,23 @@ (overlayForSystem "x86_64-linux") ]; }; + # x1c1 configuration + nixosConfigurations."nki-x1c1" = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./modules/my-tinc + sops-nix.nixosModules.sops + ./nki-x1c1/configuration.nix + nixpkgsAsRegistry + # home-manager.nixosModules.home-manager + # { + # home-manager.useGlobalPkgs = true; + # home-manager.useUserPackages = true; + # home-manager.users.nki = import ./home/kagami-pc-home.nix; + # } + (overlayForSystem "x86_64-linux") + ]; + }; # DigitalOcean node nixosConfigurations."nki-personal-do" = nixpkgs.lib.nixosSystem { diff --git a/nki-x1c1/configuration.nix b/nki-x1c1/configuration.nix new file mode 100644 index 0000000..df2fece --- /dev/null +++ b/nki-x1c1/configuration.nix @@ -0,0 +1,113 @@ +# 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 + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # Enable nix commands and nix flakes + nix.package = pkgs.nixFlakes; + nix.extraOptions = '' + experimental-features = nix-command flakes + ''; + + networking.hostName = "nki-x1c1"; # Define your hostname. + networking.wireless.iwd.enable = true; # Enables wireless support via iwd. + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + + # The global useDHCP flag is deprecated, therefore explicitly set to false here. + # Per-interface useDHCP will be mandatory in the future, so this generated config + # replicates the default behaviour. + networking.useDHCP = false; + networking.interfaces.wlan0.useDHCP = true; + + # 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"; + # }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + + # Enable the Plasma 5 Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + + + # Configure keymap in X11 + # services.xserver.layout = "us"; + # services.xserver.xkbOptions = "eurosign:e"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + sound.enable = true; + hardware.pulseaudio.enable = true; + hardware.pulseaudio.package = pkgs.pulseaudioFull; + + # Enable bluetooth + hardware.bluetooth.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.nki = { + isNormalUser = true; + extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + kakoune # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + firefox + ]; + + # 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 = "21.11"; # Did you read the comment? + +} diff --git a/nki-x1c1/hardware-configuration.nix b/nki-x1c1/hardware-configuration.nix new file mode 100644 index 0000000..676adc1 --- /dev/null +++ b/nki-x1c1/hardware-configuration.nix @@ -0,0 +1,36 @@ +# 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" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/bc8b0807-c3d6-4893-bcc2-02f059a51a80"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/885D-D058"; + fsType = "vfat"; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/a981870f-db1d-4441-81da-f1bab1ecc37c"; + fsType = "btrfs"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/2694d189-2ff6-4719-a449-367c52ed3ad6"; } + ]; + + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}