nyancat/flake
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nixos: profiles: simplify

Browse source
This commit is contained in:
Guanran Wang 2024-01-10 02:13:52 +08:00
parent 33a42f5f82
commit 2323bfcc3e
Signed by: nyancat
SSH key fingerprint: SHA256:8oWGKciPALWut/6WA27oFKofX+6Wtc0gQnsefXLQx/8
9 changed files with 46 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/profiles/common/core/default.nix
View file

@ -32,6 +32,7 @@
boot.initrd.systemd.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.enable = lib.mkDefault true; # mkDefault for Lanzaboote
boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_zen; # mkDefault for server
### Default Programs
environment.defaultPackages = [];

37
nixos/profiles/common/graphical/default.nix
View file

@ -1,7 +1,32 @@
{...}: {
imports = [
./gnome-keyring.nix
./display-server.nix
./polkit.nix
];
{pkgs, ...}: {
# plymouth
boot.plymouth.enable = true;
# xserver
services.xserver = {
enable = true;
excludePackages = with pkgs; [xterm];
displayManager.startx.enable = true;
};
# gnome keyring
services.gnome.gnome-keyring.enable = true;
programs.seahorse.enable = true;
# polkit
security.polkit.enable = true;
environment.systemPackages = with pkgs; [polkit_gnome];
systemd.user.services.polkit-gnome-authentication-agent-1 = {
description = "polkit-gnome-authentication-agent-1";
wantedBy = ["graphical-session.target"];
wants = ["graphical-session.target"];
after = ["graphical-session.target"];
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
Restart = "on-failure";
RestartSec = 1;
TimeoutStopSec = 10;
};
};
}

15
nixos/profiles/common/graphical/display-server.nix
View file

@ -1,15 +0,0 @@
{pkgs, ...}: {
services.xserver = {
enable = true;
excludePackages = with pkgs; [xterm];
displayManager = {
startx.enable = true;
};
desktopManager = {
#plasma5.enable = true;
};
windowManager = {
#bspwm.enable = true;
};
};
}

5
nixos/profiles/common/graphical/gnome-keyring.nix
View file

@ -1,5 +0,0 @@
_: {
# gnome keyring
services.gnome.gnome-keyring.enable = true;
programs.seahorse.enable = true;
}

21
nixos/profiles/common/graphical/polkit.nix
View file

@ -1,21 +0,0 @@
{pkgs, ...}: {
security.polkit.enable = true;
environment.systemPackages = with pkgs; [polkit_gnome];
# polkit_gnome autostart for wms
systemd = {
user.services.polkit-gnome-authentication-agent-1 = {
description = "polkit-gnome-authentication-agent-1";
wantedBy = ["graphical-session.target"];
wants = ["graphical-session.target"];
after = ["graphical-session.target"];
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
Restart = "on-failure";
RestartSec = 1;
TimeoutStopSec = 10;
};
};
};
}

6
nixos/profiles/common/physical/default.nix Normal file
View file

@ -0,0 +1,6 @@
_: {
networking.stevenblack.enable = true;
services.system76-scheduler.enable = true;
services.power-profiles-daemon.enable = true;
services.thermald.enable = true;
}

11
nixos/profiles/desktop/default.nix
View file

@ -1,14 +1,7 @@
{pkgs, ...}: {
{...}: {
imports = [
../common/core
../common/graphical
../common/physical
];
boot.kernelPackages = pkgs.linuxPackages_zen;
boot.plymouth.enable = true;
networking.stevenblack.enable = true;
services.system76-scheduler.enable = true;
services.power-profiles-daemon.enable = true;
services.thermald.enable = true;
#services.printing.enable = true;
}

4
nixos/profiles/laptop/default.nix
View file

@ -1,5 +1,7 @@
{...}: {
imports = [
../desktop
../common/core
../common/graphical
../common/physical
];
}

4
nixos/profiles/server/default.nix
View file

@ -1,7 +1,9 @@
{...}:
{pkgs, ...}:
# no i dont actually own a server
{
imports = [
../common/minimal
];
boot.kernelPackages = pkgs.linuxPackages; # mkDefault for server
}