mirror of
https://github.com/buckley310/nixos-config.git
synced 2024-11-09 18:47:02 +00:00
move graphical.nix into profiles.nix
This commit is contained in:
parent
eef8136258
commit
6a01c1c95a
2 changed files with 77 additions and 75 deletions
|
@ -1,61 +0,0 @@
|
|||
{ pkgs, config, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
brave
|
||||
gimp
|
||||
ffmpeg
|
||||
mpv
|
||||
tdesktop
|
||||
element-desktop
|
||||
pavucontrol
|
||||
gnome3.dconf-editor
|
||||
glxinfo
|
||||
steam-run
|
||||
|
||||
(vscode-with-extensions.override {
|
||||
vscode = vscodium;
|
||||
vscodeExtensions = with pkgs.vscode-extensions; [
|
||||
bbenoist.Nix
|
||||
ms-python.python
|
||||
ms-vscode.cpptools
|
||||
ms-azuretools.vscode-docker
|
||||
];
|
||||
})
|
||||
|
||||
(wrapFirefox firefox-unwrapped {
|
||||
extraPolicies = {
|
||||
CaptivePortal = false;
|
||||
DisablePocket = true;
|
||||
DisableFirefoxStudies = true;
|
||||
OfferToSaveLogins = false;
|
||||
DisableFormHistory = true;
|
||||
SearchSuggestEnabled = false;
|
||||
Preferences = {
|
||||
"extensions.formautofill.available" = { Status = "locked"; Value = "off"; };
|
||||
"browser.contentblocking.category" = { Status = "locked"; Value = "strict"; };
|
||||
"network.IDN_show_punycode" = { Status = "locked"; Value = true; };
|
||||
"browser.zoom.siteSpecific" = { Status = "locked"; Value = false; };
|
||||
};
|
||||
};
|
||||
})
|
||||
|
||||
];
|
||||
|
||||
services.xserver.deviceSection = ''
|
||||
Option "VariableRefresh" "true"
|
||||
'';
|
||||
|
||||
programs.steam.enable = true;
|
||||
|
||||
virtualisation.docker = { enable = true; enableOnBoot = false; };
|
||||
|
||||
hardware.pulseaudio.enable = false;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
pulse.enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
};
|
||||
|
||||
boot.loader.timeout = null;
|
||||
}
|
|
@ -2,24 +2,87 @@
|
|||
with lib;
|
||||
let
|
||||
cfg = config.sconfig.profile;
|
||||
|
||||
|
||||
desktop-config = {
|
||||
environment.systemPackages = with pkgs; [
|
||||
brave
|
||||
gimp
|
||||
ffmpeg
|
||||
mpv
|
||||
tdesktop
|
||||
element-desktop
|
||||
pavucontrol
|
||||
gnome3.dconf-editor
|
||||
glxinfo
|
||||
steam-run
|
||||
|
||||
(vscode-with-extensions.override {
|
||||
vscode = vscodium;
|
||||
vscodeExtensions = with pkgs.vscode-extensions; [
|
||||
bbenoist.Nix
|
||||
ms-python.python
|
||||
ms-vscode.cpptools
|
||||
ms-azuretools.vscode-docker
|
||||
];
|
||||
})
|
||||
|
||||
(wrapFirefox firefox-unwrapped {
|
||||
extraPolicies = {
|
||||
CaptivePortal = false;
|
||||
DisablePocket = true;
|
||||
DisableFirefoxStudies = true;
|
||||
OfferToSaveLogins = false;
|
||||
DisableFormHistory = true;
|
||||
SearchSuggestEnabled = false;
|
||||
Preferences = {
|
||||
"extensions.formautofill.available" = { Status = "locked"; Value = "off"; };
|
||||
"browser.contentblocking.category" = { Status = "locked"; Value = "strict"; };
|
||||
"network.IDN_show_punycode" = { Status = "locked"; Value = true; };
|
||||
"browser.zoom.siteSpecific" = { Status = "locked"; Value = false; };
|
||||
};
|
||||
};
|
||||
})
|
||||
|
||||
];
|
||||
|
||||
services.xserver.deviceSection = ''
|
||||
Option "VariableRefresh" "true"
|
||||
'';
|
||||
|
||||
programs.steam.enable = true;
|
||||
|
||||
virtualisation.docker = { enable = true; enableOnBoot = false; };
|
||||
|
||||
hardware.pulseaudio.enable = false;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
pulse.enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
};
|
||||
|
||||
boot.loader.timeout =
|
||||
if config.boot.loader.systemd-boot.enable
|
||||
then null else lib.mkOverride 9999 99;
|
||||
};
|
||||
|
||||
|
||||
server-config = {
|
||||
services.openssh.enable = true;
|
||||
documentation.nixos.enable = false;
|
||||
nix.gc = {
|
||||
automatic = true;
|
||||
options = "--delete-older-than 30d";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
in
|
||||
{
|
||||
options.sconfig.profile = mkOption {
|
||||
type = types.enum [ "server" "desktop" ];
|
||||
};
|
||||
|
||||
config = mkMerge [
|
||||
|
||||
(mkIf (cfg == "server") {
|
||||
services.openssh.enable = true;
|
||||
documentation.nixos.enable = false;
|
||||
nix.gc = {
|
||||
automatic = true;
|
||||
options = "--delete-older-than 30d";
|
||||
};
|
||||
})
|
||||
|
||||
(mkIf (cfg == "desktop") (import ./graphical.nix { inherit pkgs config; }))
|
||||
|
||||
];
|
||||
config = { inherit desktop server; }."${cfg}-config";
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue