Merge branch 'b12f' of git.b12f.io:pub-solar/os into b12f
This commit is contained in:
commit
83333fa0d6
27
flake.lock
27
flake.lock
|
@ -242,11 +242,11 @@
|
|||
},
|
||||
"latest": {
|
||||
"locked": {
|
||||
"lastModified": 1623692505,
|
||||
"narHash": "sha256-2WnyKaMBPmkHgWXzyMc73ehsKrIUgumZQ+GuHL2OjSM=",
|
||||
"lastModified": 1623692755,
|
||||
"narHash": "sha256-HYH9MeFye68ntgheDerkmC50PpWY5qoHAaobesQDBLw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "16cd0e70fe5a1b9fdbe8b4d8a3d6b258c5f885da",
|
||||
"rev": "a7ff3fd40e1791d22363775948619e706e1ec665",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -467,11 +467,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1623692505,
|
||||
"narHash": "sha256-2WnyKaMBPmkHgWXzyMc73ehsKrIUgumZQ+GuHL2OjSM=",
|
||||
"lastModified": 1623692755,
|
||||
"narHash": "sha256-HYH9MeFye68ntgheDerkmC50PpWY5qoHAaobesQDBLw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "16cd0e70fe5a1b9fdbe8b4d8a3d6b258c5f885da",
|
||||
"rev": "a7ff3fd40e1791d22363775948619e706e1ec665",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -479,20 +479,6 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1623691985,
|
||||
"narHash": "sha256-ujUDfpOjjK4jvk16kRnsOoHamoh1dg8KOcz+1YoC368=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "633cfde3ed8f7a095a75413c1a214e27f8117f86",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nur",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"pkgs": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
@ -539,7 +525,6 @@
|
|||
"nixos": "nixos",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nur": "nur",
|
||||
"pkgs": "pkgs"
|
||||
}
|
||||
},
|
||||
|
|
|
@ -45,7 +45,6 @@
|
|||
, home
|
||||
, nixos-hardware
|
||||
, agenix
|
||||
, nur
|
||||
, nix-dram
|
||||
, neovim-nightly
|
||||
# , b12f-nix-fonts
|
||||
|
@ -61,7 +60,6 @@
|
|||
overlays = [
|
||||
./pkgs/default.nix
|
||||
pkgs.overlay # for `srcs`
|
||||
nur.overlay
|
||||
agenix.overlay
|
||||
nix-dram.overlay
|
||||
neovim-nightly.overlay
|
||||
|
@ -110,6 +108,7 @@
|
|||
anonymous = pubsolaros ++ [ users.nixos ];
|
||||
b12f = pubsolaros ++ [ users.ben ];
|
||||
biolimo = b12f ++ [ graphical ];
|
||||
chocolatebar = b12f ++ [ graphical virtualisation ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
6
hosts/chocolatebar.nix
Normal file
6
hosts/chocolatebar.nix
Normal file
|
@ -0,0 +1,6 @@
|
|||
{ suites, ... }:
|
||||
{
|
||||
imports = [
|
||||
./chocolatebar
|
||||
] ++ suites.chocolatebar;
|
||||
}
|
95
hosts/chocolatebar/configuration.nix
Normal file
95
hosts/chocolatebar/configuration.nix
Normal file
|
@ -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?
|
||||
|
||||
}
|
|
@ -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;
|
||||
|
||||
|
|
33
hosts/chocolatebar/hardware-configuration.nix
Normal file
33
hosts/chocolatebar/hardware-configuration.nix
Normal file
|
@ -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 = [ ];
|
||||
|
||||
}
|
|
@ -1,5 +1,5 @@
|
|||
[
|
||||
./compat
|
||||
# ./compat
|
||||
./user
|
||||
./x-os
|
||||
./sway
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
6
profiles/virtualisation/default.nix
Normal file
6
profiles/virtualisation/default.nix
Normal file
|
@ -0,0 +1,6 @@
|
|||
{ self, config, lib, pkgs, ... }:
|
||||
let inherit (lib) fileContents;
|
||||
in
|
||||
{
|
||||
pub-solar.virtualisation.enable = true;
|
||||
}
|
Loading…
Reference in a new issue