From 8d5db4dfb2262255d7f22cedd4d56f7d77760f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= Date: Tue, 1 Jun 2021 10:55:02 +0200 Subject: [PATCH] Add chocolatebar --- flake.lock | 36 +++---- flake.nix | 3 +- hosts/chocolatebar.nix | 6 ++ hosts/chocolatebar/configuration.nix | 95 +++++++++++++++++++ hosts/chocolatebar/default.nix | 5 +- hosts/chocolatebar/hardware-configuration.nix | 33 +++++++ modules/module-list.nix | 2 +- profiles/gaming/default.nix | 5 +- profiles/virtualisation/default.nix | 6 ++ 9 files changed, 166 insertions(+), 25 deletions(-) create mode 100644 hosts/chocolatebar.nix create mode 100644 hosts/chocolatebar/configuration.nix create mode 100644 hosts/chocolatebar/hardware-configuration.nix create mode 100644 profiles/virtualisation/default.nix diff --git a/flake.lock b/flake.lock index 56d0bcaf..41661bbd 100644 --- a/flake.lock +++ b/flake.lock @@ -5,18 +5,18 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1622483595, - "narHash": "sha256-h3x/N2m6hqdaHyHRQh3celkg9A+0Zn+8U/IGnq6rugQ=", + "lastModified": 1622501268, + "narHash": "sha256-wITrQEsJ5zWEl9yGUUPOUUpBN08Sva7MaB7uwYHmX7s=", "ref": "main", - "rev": "2d0f4e56712c01d8a31aacbc58f2bba2a160e9b6", - "revCount": 3, + "rev": "51f94ad589c096e7fbb6a1f58f3b07037ef035bd", + "revCount": 4, "type": "git", - "url": "https://git.b12f.io/b12f/nix-fonts" + "url": "ssh://git@git.b12f.io/b12f/nix-fonts.git" }, "original": { "ref": "main", "type": "git", - "url": "https://git.b12f.io/b12f/nix-fonts" + "url": "ssh://git@git.b12f.io/b12f/nix-fonts.git" } }, "ci-agent": { @@ -112,11 +112,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1622093678, - "narHash": "sha256-WLD1RXE351WlYTwGmadXH7EGLGNOpnqgUFuJgYuhbQk=", + "lastModified": 1622484894, + "narHash": "sha256-n3Vn4H1muqDcoMtXS59c0ZZthSJ11gFAodfo1LSQvj8=", "owner": "divnix", "repo": "digga", - "rev": "1b366811824635d249befa8bb046ac4c5f9f3494", + "rev": "0cbc8bd4defee8fddc0c582556267bd2c1c02704", "type": "github" }, "original": { @@ -240,11 +240,11 @@ }, "latest": { "locked": { - "lastModified": 1622480250, - "narHash": "sha256-uYUEKsTE9Dm2mml7icr0zgdgFDo9NbiiFjX/II7Ifik=", + "lastModified": 1622501264, + "narHash": "sha256-80i3931mvNzj7zn4WG8ErE3YGdQes3XsKLlJ+UiIswM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4335222fd5119562f37028ad18df05cc94329222", + "rev": "78f495f7244f2b9ba077d2360008849fc4592ffb", "type": "github" }, "original": { @@ -480,11 +480,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1622480250, - "narHash": "sha256-uYUEKsTE9Dm2mml7icr0zgdgFDo9NbiiFjX/II7Ifik=", + "lastModified": 1622501264, + "narHash": "sha256-80i3931mvNzj7zn4WG8ErE3YGdQes3XsKLlJ+UiIswM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4335222fd5119562f37028ad18df05cc94329222", + "rev": "78f495f7244f2b9ba077d2360008849fc4592ffb", "type": "github" }, "original": { @@ -494,11 +494,11 @@ }, "nur": { "locked": { - "lastModified": 1622483169, - "narHash": "sha256-uEHHS2pZRcyXBRUtynugr5FPhiRW4IVNaEbWqPI7tC0=", + "lastModified": 1622499658, + "narHash": "sha256-Yuprz5GmXMfY0knlyXqPVEa1+REV6fRTpg37HM39O64=", "owner": "nix-community", "repo": "NUR", - "rev": "3022dd625fbdaee8cfa7aeb5a4fdff345b2738c6", + "rev": "7934f6d9ff00aac628d54ed3921207de23b80208", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c531585a..20f9e39c 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ neovim-nightly.url = "github:nix-community/neovim-nightly-overlay"; # b12f additions - b12f-nix-fonts.url = "git+https://git.b12f.io/b12f/nix-fonts?ref=main"; + b12f-nix-fonts.url = "git+ssh://git@git.b12f.io/b12f/nix-fonts.git?ref=main"; }; outputs = @@ -102,6 +102,7 @@ anonymous = [ pubsolaros users.nixos ]; b12f = [ pubsolaros users.ben ]; biolimo = [ b12f graphical ]; + chocolatebar = [ b12f graphical virtualisation ]; }; }; diff --git a/hosts/chocolatebar.nix b/hosts/chocolatebar.nix new file mode 100644 index 00000000..43c30835 --- /dev/null +++ b/hosts/chocolatebar.nix @@ -0,0 +1,6 @@ +{ suites, ... }: +{ + imports = [ + ./chocolatebar + ] ++ suites.chocolatebar; +} diff --git a/hosts/chocolatebar/configuration.nix b/hosts/chocolatebar/configuration.nix new file mode 100644 index 00000000..55457be8 --- /dev/null +++ b/hosts/chocolatebar/configuration.nix @@ -0,0 +1,95 @@ +# 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; + + # networking.hostName = "nixos"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Set your time zone. + # time.timeZone = "Europe/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"; + # }; + + # Enable the X11 windowing system. + # services.xserver.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; + + # 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.jane = { + # 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; [ + # wget vim + # 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.05"; # Did you read the comment? + +} diff --git a/hosts/chocolatebar/default.nix b/hosts/chocolatebar/default.nix index 8f25b802..76175878 100644 --- a/hosts/chocolatebar/default.nix +++ b/hosts/chocolatebar/default.nix @@ -6,11 +6,14 @@ let in { imports = [ + ./configuration.nix ./virtualisation ]; config = { - pub-solar.virtualisation.enable = true; + pub-solar.x-os.keyfile = "/etc/nixos/hosts/chocolatebar/secrets/keyfile.bin"; + + pub-solar.virtualisation.isolateGPU = "rx550x"; hardware.cpu.amd.updateMicrocode = true; diff --git a/hosts/chocolatebar/hardware-configuration.nix b/hosts/chocolatebar/hardware-configuration.nix new file mode 100644 index 00000000..0c623c23 --- /dev/null +++ b/hosts/chocolatebar/hardware-configuration.nix @@ -0,0 +1,33 @@ +# 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 = [ "nvme" "xhci_pci" "ahci" "usbcore" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { + device = "/dev/disk/by-uuid/a3a74208-b244-4268-b374-e58265810fce"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/afcde41f-9811-4ac8-bb7b-a683844acc5c"; + + fileSystems."/boot/efi" = + { + device = "/dev/disk/by-uuid/12FD-62A8"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + +} diff --git a/modules/module-list.nix b/modules/module-list.nix index 35cf4abe..d17797a6 100644 --- a/modules/module-list.nix +++ b/modules/module-list.nix @@ -1,5 +1,5 @@ [ - ./compat + # ./compat ./user ./x-os ./sway diff --git a/profiles/gaming/default.nix b/profiles/gaming/default.nix index a833f192..efecf571 100644 --- a/profiles/gaming/default.nix +++ b/profiles/gaming/default.nix @@ -3,7 +3,4 @@ let inherit (lib) fileContents; in { pub-solar.gaming.enable = true; - pub-solar.docker.enable = true; - pub-solar.docker.enable = true; - pub-solar.docker.enable = true; -}; +} diff --git a/profiles/virtualisation/default.nix b/profiles/virtualisation/default.nix new file mode 100644 index 00000000..4f42071b --- /dev/null +++ b/profiles/virtualisation/default.nix @@ -0,0 +1,6 @@ +{ self, config, lib, pkgs, ... }: +let inherit (lib) fileContents; +in +{ + pub-solar.virtualisation.enable = true; +}