cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

module fixup, xserver, graphics etc

Browse Source
This commit is contained in:
cnst
2024-10-01 17:32:05 +02:00
parent 98f42a3ecd
commit c33bd61836
13 changed files with 108 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/modules/default.nix
View File

@@ -27,9 +27,7 @@
"${systemModules}/sysd/security/gnome-keyring"
"${systemModules}/sysd/session/dbus"
"${systemModules}/sysd/session/dconf"
"${systemModules}/sysd/session/xserver/amd"
"${systemModules}/sysd/session/xserver/amd/hhkbse"
"${systemModules}/sysd/session/xserver/nvidia"
"${systemModules}/sysd/session/xserver"
"${systemModules}/sysd/system/fwupd"
"${systemModules}/sysd/system/greetd"
"${systemModules}/sysd/system/gvfs"

1
system/modules/hardware/graphics/amd/default.nix
View File

@@ -11,7 +11,6 @@ in {
modules.hardware.graphics.amd.enable = mkEnableOption "Enables AMD graphics";
};
config = mkIf cfg.enable {
services.xserver.videoDrivers = ["amdgpu"];
hardware = {
graphics = {
enable = true;

4
system/modules/hardware/graphics/nvidia/default.nix
View File

@@ -29,10 +29,6 @@ in {
};
config = mkIf cfg.enable {
services.xserver = {
videoDrivers = ["nvidia"];
xkb.layout = "se";
};
environment.systemPackages = with pkgs; [
egl-wayland
];

10
system/modules/hardware/network/default.nix
View File

@@ -32,15 +32,11 @@ in {
description = "Network interface configurations.";
};
nm-applet = {
enable = mkEnableOption {
enable = mkEnableOption "Enables the nm-applet service.";
indicator = mkOption {
type = types.bool;
default = false;
description = "Enables the nm-applet service.";
};
indicator = mkEnableOption {
type = types.bool;
default = false;
description = "Enables the nm-applet indicator";
description = "Enables the nm-applet indicator.";
};
};
};

29
system/modules/sysd/session/xserver/amd/default.nix
View File

@@ -1,29 +0,0 @@
{
config,
lib,
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.session.xserver.amd;
in {
options = {
modules.sysd.session.xserver.amd.enable = mkEnableOption "Enables xserver with amdgpu";
};
config = mkIf cfg.enable {
services.xserver = {
enable = true;
videoDrivers = ["amdgpu"];
# xkb = {
# extraLayouts.hhkbse = {
# description = "HHKBse by cnst";
# languages = ["se"];
# symbolsFile = /home/cnst/.nix-config/nixos/hosts/cnix/xkb/symbols/hhkbse;
# };
# layout = "hhkbse";
# # dir = "/home/cnst/.nix-config/nixos/xkb";
# variant = "";
# options = "lv3:rwin_switch";
# };
};
};
}

27
system/modules/sysd/session/xserver/amd/hhkbse/README.md
View File

@@ -1,27 +0,0 @@
```
┌─────┐
│ 2 4 │ 2 = SHIFT, 4 = LV3 + SHIFT
│ 1 3 │ 1 = NORMAL, 3 = LV3
└─────┘
╭─────────────────────────────────────────────────────────────────────────────────────────────╮
│ HHKB Professional HYBRID • Type-S │
│ ┏━━━━━┳━━━━━┳━━━━━┳━━━━━┳━━━━━┳━━━━━┳━━━━━┳━━━━━┳━━━━━┳━━━━━┳━━━━━┳━━━━━┳━━━━━┳━━━━━┳━━━━━┓ │▒▒
│ ┃ ┃ ! ½ ┃ " ┃ # ˝ ┃ $ ¼ ┃ % ˇ ┃ & √ ┃ / ┃ ( ┃ ) ┃ = ┃ ? ¯ ┃ { ˛ ┃ } ┃ * ¦ ┃ │▒▒
│ ┃Esc ┃ 1 ¶ ┃ 2 @ ┃ 3 £ ┃ 4 § ┃ 5 € ┃ 6 ¥ ┃ 7 ┃ 8 [ ┃ 9 ] ┃ 0 \ ┃ + – ┃ ↓ ← ┃ ↑ → ┃ ⌦ | ┃ │▒▒
│ ┣━━━━━┻━━┳━━┻━━┳━━┻━━┳━━┻━━┳━━┻━━┳━━┻━━┳━━┻━━┳━━┻━━┳━━┻━━┳━━┻━━┳━━┻━━┳━━┻━━┳━━┻━━┳━━┻━━━━━┫ │▒▒
│ ┃ ┃ Q ┃ W ┃ E ┃ R ┃ T ┃ Y ┃ U ┃ I ┃ O ┃ P ┃ Å ┃ ^ ┃ ┃ │▒▒
│ ┃Tab ↹ ┃ q ┃ w ┃ e € ┃ r ┃ t ┃ y ┃ u ┃ i ┃ o ┃ p ↑ ┃ å ┃ ' ~ ┃BKSP ⌫ ┃ │▒▒
│ ┣━━━━━━━━┻┳━━━━┻┳━━━━┻┳━━━━┻┳━━━━┻┳━━━━┻┳━━━━┻┳━━━━┻┳━━━━┻┳━━━━┻┳━━━━┻┳━━━━┻┳━━━━┻━━━━━━━━┫ │▒▒
│ ┃ ┃ A ┃ S ┃ D ┃ F ┃ G ┃ H ┃ J ┃ K ┃ L ┃ Ö ┃ Ä ┃ ┃ │▒▒
│ ┃Control ┃ a ┃ s ┃ d ┃ f ┃ g ┃ h ┃ j ┃ k ┃ l ← ┃ ö ↓ ┃ ä → ┃Enter ⏎ ┃ │▒▒
│ ┣━━━━━━━━━┻━━━┳━┻━━━┳━┻━━━┳━┻━━━┳━┻━━━┳━┻━━━┳━┻━━━┳━┻━━━┳━┻━━━┳━┻━━━┳━┻━━━┳━┻━━━━━━━┳━━━━━┫ │▒▒
│ ┃ ┃ Z ┃ X ┃ C ┃ V ┃ B ┃ N ┃ M ┃ ; „ ┃ : … ┃ _ ┃ ┃ ┃ │▒▒
│ ┃Shift ⇧ ┃ z < ┃ x > ┃ c ┃ v ┃ b ┃ n ┃ m ┃ , ‚ ┃ . · ┃ - – ┃Shift ⇧ ┃Fn ┃ │▒▒
│ ┗━━━━━━━━┳━━━━┻┳━━━━┻━━━┳━┻━━━━━┻━━━━━┻━━━━━┻━━━━━┻━━━━━┻━━━┳━┻━━━━━┻┳━━━━┻┳━━━━━━━━┻━━━━━┛ │▒▒
│ ┃ ┃ ┃ ␣ ⍽ ┃ ┃ ┃ │▒▒
│ ┃Alt ┃ <> ┃ ␣ Space ⍽ ┃ <> ┃Alt ┃ │▒▒
│ ┗━━━━━┻━━━━━━━━┻━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┻━━━━━━━━┻━━━━━┛ │▒▒
╰─────────────────────────────────────────────────────────────────────────────────────────────╯▒▒
▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒
▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒
```

30
system/modules/sysd/session/xserver/amd/hhkbse/default.nix
View File

@@ -1,30 +0,0 @@
{
config,
lib,
hostConfig,
...
}: let
path = "${hostConfig}/cnix/xkb/symbols";
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.session.xserver.amd.hhkbse;
in {
options = {
modules.sysd.session.xserver.amd.hhkbse.enable = mkEnableOption "Enables xserver for amdgpu with HHKBSE";
};
config = mkIf cfg.enable {
services.xserver = {
enable = true;
videoDrivers = ["amdgpu"];
xkb = {
extraLayouts.hhkbse = {
description = "HHKBse by cnst";
languages = ["se"];
symbolsFile = "${path}/hhkbse";
};
layout = "hhkbse";
variant = "";
options = "lv3:rwin_switch";
};
};
};
}

29
system/modules/sysd/session/xserver/default.nix Normal file
View File

@@ -0,0 +1,29 @@
{
config,
lib,
...
}: let
inherit (lib) mkOption types;
cfg = config.modules.sysd.session.xserver;
in {
options = {
modules.sysd.session.xserver = {
videoDrivers = mkOption {
type = types.listOf (types.enum ["amdgpu" "nvidia"]);
default = ["amdgpu"];
description = "The names of the video drivers the configuration supports";
};
xkbLayout = mkOption {
type = types.str;
default = "se";
description = "X keyboard layout, or multiple keyboard layouts separated by commas.";
};
};
};
config = {
services.xserver = {
videoDrivers = cfg.videoDrivers;
xkb.layout = cfg.xkbLayout;
};
};
}

19
system/modules/sysd/session/xserver/nvidia/default.nix
View File

@@ -1,19 +0,0 @@
{
config,
lib,
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.session.xserver.nvidia;
in {
options = {
modules.sysd.session.xserver.nvidia.enable = mkEnableOption "Enables xserver with nvidia";
};
config = mkIf cfg.enable {
services.xserver = {
enable = true;
videoDrivers = ["nvidia"];
xkb.layout = "se";
};
};
}