b12f/os
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: Make chocolatebar work with the new config

Browse source
This commit is contained in:
Benjamin Bädorf 2021-06-14 23:23:30 +02:00
parent 17a2833a89
commit a9e025c4f9
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C
4 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitignore vendored
View file

@ -3,12 +3,12 @@ up
hosts/up-* hosts/up-*
.direnv .direnv
doc/index.html doc/index.html
<<<<<<< HEAD
tags
=======
# Result of flk commands # Result of flk commands
vm vm
iso iso
doi doi
>>>>>>> devos/core
# PubSolarOS
tags
/owners

6
hosts/chocolatebar.nix
View file

@ -1,6 +0,0 @@
{ suites, ... }:
{
imports = [
./chocolatebar
] ++ suites.chocolatebar;
}

31
hosts/chocolatebar/base.nix Normal file
View file

@ -0,0 +1,31 @@
{ config, pkgs, lib, ... }:
with lib;
let
psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
in
{
imports = [
./configuration.nix
./virtualisation
];
config = {
pub-solar.x-os.keyfile = "/etc/nixos/hosts/chocolatebar/secrets/keyfile.bin";
pub-solar.virtualisation.isolateGPU = "rx550x";
hardware.cpu.amd.updateMicrocode = true;
hardware.opengl.extraPackages = with pkgs; [
rocm-opencl-icd
rocm-opencl-runtime
];
home-manager.users."${psCfg.user.name}".xdg.configFile = mkIf psCfg.sway.enable {
"sway/config.d/10-autostart.conf".source = ./.config/sway/config.d/autostart.conf;
"sway/config.d/10-input-defaults.conf".source = ./.config/sway/config.d/input-defaults.conf;
"sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf;
};
};
}

31
hosts/chocolatebar/default.nix
View file

@ -1,31 +1,6 @@
{ config, pkgs, lib, ... }: { suites, ... }:
with lib;
let
psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
in
{ {
imports = [ imports = [
./configuration.nix ./base.nix
./virtualisation ] ++ suites.chocolatebar;
];
config = {
pub-solar.x-os.keyfile = "/etc/nixos/hosts/chocolatebar/secrets/keyfile.bin";
pub-solar.virtualisation.isolateGPU = "rx550x";
hardware.cpu.amd.updateMicrocode = true;
hardware.opengl.extraPackages = with pkgs; [
rocm-opencl-icd
rocm-opencl-runtime
];
home-manager.users."${psCfg.user.name}".xdg.configFile = mkIf psCfg.sway.enable {
"sway/config.d/10-autostart.conf".source = ./.config/sway/config.d/autostart.conf;
"sway/config.d/10-input-defaults.conf".source = ./.config/sway/config.d/input-defaults.conf;
"sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf;
};
};
} }