From c33bd61836991ae968c5f3739df957af8ba05b3f Mon Sep 17 00:00:00 2001 From: cnst Date: Tue, 1 Oct 2024 17:32:05 +0200 Subject: [PATCH] module fixup, xserver, graphics etc --- flake.lock | 138 +++++++++--------- hosts/cnix/modules.nix | 11 +- hosts/cnixpad/modules.nix | 5 +- hosts/toothpc/modules.nix | 5 +- system/modules/default.nix | 4 +- .../modules/hardware/graphics/amd/default.nix | 1 - .../hardware/graphics/nvidia/default.nix | 4 - system/modules/hardware/network/default.nix | 10 +- .../sysd/session/xserver/amd/default.nix | 29 ---- .../sysd/session/xserver/amd/hhkbse/README.md | 27 ---- .../session/xserver/amd/hhkbse/default.nix | 30 ---- .../modules/sysd/session/xserver/default.nix | 29 ++++ .../sysd/session/xserver/nvidia/default.nix | 19 --- 13 files changed, 108 insertions(+), 204 deletions(-) delete mode 100644 system/modules/sysd/session/xserver/amd/default.nix delete mode 100644 system/modules/sysd/session/xserver/amd/hhkbse/README.md delete mode 100644 system/modules/sysd/session/xserver/amd/hhkbse/default.nix create mode 100644 system/modules/sysd/session/xserver/default.nix delete mode 100644 system/modules/sysd/session/xserver/nvidia/default.nix diff --git a/flake.lock b/flake.lock index ef950b56..ee68ac47 100644 --- a/flake.lock +++ b/flake.lock @@ -99,12 +99,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1727292492, - "narHash": "sha256-vKkVoZJB35xOb1kmAH6i74ziuP0ZGKnzM6+NVi/OhD8=", - "rev": "9b30ea4a39c8c5a2b6a6519f85da38f72b7f29f0", - "revCount": 1425, + "lastModified": 1727734424, + "narHash": "sha256-COHPdJb8goIemave9L8kBKkQKEPHuilXZqR3nIBcQsM=", + "rev": "fed2d39a7c4614311e25a4281d056a7a2d36a6c8", + "revCount": 1433, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1425%2Brev-9b30ea4a39c8c5a2b6a6519f85da38f72b7f29f0/01922abb-23af-73f5-a87e-d0b31320c106/source.tar.gz?rev=9b30ea4a39c8c5a2b6a6519f85da38f72b7f29f0&revCount=1425" + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1433%2Brev-fed2d39a7c4614311e25a4281d056a7a2d36a6c8/01924502-e524-7276-aff9-2934049c2265/source.tar.gz?rev=fed2d39a7c4614311e25a4281d056a7a2d36a6c8&revCount=1433" }, "original": { "type": "tarball", @@ -205,11 +205,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1726900127, - "narHash": "sha256-v3r7yJY8YE4HAzD5DXOxLkzj8YZKQ0xuccp9yppGW1U=", + "lastModified": 1727591515, + "narHash": "sha256-ar9oGR8kT3S5K3b0EJrcZp1LjfYQdzWl/bBLCp2o50Y=", "owner": "nix-community", "repo": "fenix", - "rev": "18eefba7fd0bf03e115785948758a44125a9fd68", + "rev": "c31647aab5e8a16087da6283ef9b2e6a9aae6772", "type": "github" }, "original": { @@ -226,11 +226,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1727591515, - "narHash": "sha256-ar9oGR8kT3S5K3b0EJrcZp1LjfYQdzWl/bBLCp2o50Y=", + "lastModified": 1727764514, + "narHash": "sha256-tvN9v5gTxLI5zOKsNvYl1aUxIitHm8Nj3vKdXNfJo50=", "owner": "nix-community", "repo": "fenix", - "rev": "c31647aab5e8a16087da6283ef9b2e6a9aae6772", + "rev": "a9d2e5fa8d77af05240230c9569bbbddd28ccfaf", "type": "github" }, "original": { @@ -250,11 +250,11 @@ ] }, "locked": { - "lastModified": 1727565658, - "narHash": "sha256-5Q6RboJwDP9H1zdzLxZh0RqpocfJrttXNcPM+XGsYJ8=", + "lastModified": 1727792253, + "narHash": "sha256-IZ0GC5DHkSkY3A0nj93ZxjyKSCTWNDSqPoDaxtNceMc=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "bbf0ccd57a37b1d755f70d3dcccfc9624c47a511", + "rev": "8c0147744bfcf1b0cbdbff1d7b67c9768973c6e7", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "hardware": { "locked": { - "lastModified": 1727595438, - "narHash": "sha256-bAvkJYuZKeDwW/J/Ga/axplEbYbQhq6jdQBVdGcpuO8=", + "lastModified": 1727665282, + "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "8e8c6cbad12ef805268b4e380a7298fbc275898d", + "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", "type": "github" }, "original": { @@ -599,11 +599,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1727524329, - "narHash": "sha256-cSm1hktXvw1l1Doqr+LHSLR6X+7F6BShQI0DbygtmSI=", + "lastModified": 1727744745, + "narHash": "sha256-10PtZHgDq7S5n8ez0iT9eLWvAlEDtEi572yFzidLW/0=", "owner": "helix-editor", "repo": "helix", - "rev": "82dd96369302f60a9c83a2d54d021458f82bcd36", + "rev": "57ec3b7330de3f5a7b37e766a758f13fdf3c0da5", "type": "github" }, "original": { @@ -686,11 +686,11 @@ ] }, "locked": { - "lastModified": 1726902823, - "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "14929f7089268481d86b83ed31ffd88713dcd415", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", "type": "github" }, "original": { @@ -715,11 +715,11 @@ ] }, "locked": { - "lastModified": 1722623071, - "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", + "lastModified": 1727532803, + "narHash": "sha256-ZaZ7h7PY8mQc4vtGmVqWLAq9CAO02gHMyNR5yY8zDmM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "912d56025f03d41b1ad29510c423757b4379eb1c", + "rev": "b98726e431d4d3ed58bd58bee1047cdb81cec69f", "type": "github" }, "original": { @@ -774,11 +774,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1727549598, - "narHash": "sha256-esywx7x3PvsLepRNTP1hYL96oJAWe0lUE9u5u9TAyfI=", + "lastModified": 1727714556, + "narHash": "sha256-l4cPDA3xGtGdQmdSCAO2VyWg9xwW6//KwDYefdWtovQ=", "ref": "refs/heads/main", - "rev": "d73c14751ad40fd54d93baac2226f550142b0e74", - "revCount": 5275, + "rev": "5c6c300abfea2539ffad9bcbf857325eec5ab765", + "revCount": 5285, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -911,11 +911,11 @@ ] }, "locked": { - "lastModified": 1727254580, - "narHash": "sha256-JPms9Xhgr2R76vWEGmCvsBAoM0JUd4cQ2zl4pie+XAM=", + "lastModified": 1727695344, + "narHash": "sha256-lQYfVILqK+b+XPwaQeGSA0tAKDajVqUoP719ZifIEh8=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "9ea804788ca5b4852d7e045d7a57f8d413852ca0", + "rev": "d9c2a5e0b790bfd1bdc7ab39ce188bcc5519b1b4", "type": "github" }, "original": { @@ -1042,11 +1042,11 @@ ] }, "locked": { - "lastModified": 1726902390, - "narHash": "sha256-ESAD6AkxsQdV/j5ZBcO4Vg94J7Xd0nfpiEZpJtwSEhg=", + "lastModified": 1727453186, + "narHash": "sha256-nZRCfVEZ9osWXsCD0xCpU66M8JkabMTukBzPRrD/CTA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "faf4c746c068dd8e41b1fa5f18beeabd34d4064c", + "rev": "3390ff2632d0d8a14c92473db60fa52bf881f979", "type": "github" }, "original": { @@ -1065,11 +1065,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1725379389, - "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", + "lastModified": 1727792571, + "narHash": "sha256-KBzRQVE1j2vrSg8WfYJ+vEvFBC25+2VsFSK7VL2kc1M=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", + "rev": "e2365a1d8dccdcf4bca5111672e80df67d90957d", "type": "github" }, "original": { @@ -1084,11 +1084,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1727007123, - "narHash": "sha256-B2WqDa4Sd7EVrGfxnVSCL39yOKWqn14vhhTGlbtd+48=", + "lastModified": 1727710043, + "narHash": "sha256-NpTnTg8oOVvntlTi/t8BUe5msrMmkiZFiOW22fc7B+g=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "e4bb2b4962e79814c38862dce5eca90af3de6a3c", + "rev": "d03a5f88a345d26ca13918071d42dcc960233183", "type": "github" }, "original": { @@ -1237,11 +1237,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1726966855, - "narHash": "sha256-25ByioeOBFcnitO5lM/Mufnv/u7YtHEHEM8QFuiS40k=", + "lastModified": 1727571693, + "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "575704ff85d3a41dc5bfef7b55380cbc7b87f3c2", + "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1", "type": "github" }, "original": { @@ -1252,11 +1252,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1727552795, - "narHash": "sha256-IZJVvM+8Jwk8RgWygbfAZ7mnLk0DxGI/2HBDSNxCIio=", + "lastModified": 1727781656, + "narHash": "sha256-U50eBuNb3LToPx8ny5q8oVwu1IqV6VtuGcexKCpxpcQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "602fb03c3a4aaeb33ea15ae1c921325c593531b1", + "rev": "bd22e978f12cced6956318a7e013d9b7f9538788", "type": "github" }, "original": { @@ -1316,11 +1316,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { @@ -1364,11 +1364,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1727122398, - "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -1411,11 +1411,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { @@ -1427,11 +1427,11 @@ }, "nur": { "locked": { - "lastModified": 1727596560, - "narHash": "sha256-222fcWG6s13RXuAK711nbrHs6wOb3UORXJ/vt3rCM60=", + "lastModified": 1727795932, + "narHash": "sha256-qfHikL1eQ5C7n5n+vk6bE0T3QjxcoGO20ePgKfpsVCc=", "owner": "nix-community", "repo": "NUR", - "rev": "6acf80f88c3f8fbf4f95f5df7a936a488a7bca12", + "rev": "6df3e5a1ccb28201bbd6a4f3d9bf03343ca0b720", "type": "github" }, "original": { @@ -1501,11 +1501,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1726443025, - "narHash": "sha256-nCmG4NJpwI0IoIlYlwtDwVA49yuspA2E6OhfCOmiArQ=", + "lastModified": 1727465975, + "narHash": "sha256-jrr8r2CT9jsi6XDTTX+E39/CakTcQ9RYRp6rWGzLkk0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "94b526fc86eaa0e90fb4d54a5ba6313aa1e9b269", + "rev": "546339a7be357b3e95fc4b79a8816dce540d477b", "type": "github" }, "original": { @@ -1518,11 +1518,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1727465975, - "narHash": "sha256-jrr8r2CT9jsi6XDTTX+E39/CakTcQ9RYRp6rWGzLkk0=", + "lastModified": 1727706011, + "narHash": "sha256-xxgUHwwJ+1xQQoUWvLDo807IZ0MDldkfr9N1G4fvNJU=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "546339a7be357b3e95fc4b79a8816dce540d477b", + "rev": "28830ff2f1158ee92f4852ef3ec35af0935d1562", "type": "github" }, "original": { @@ -1858,11 +1858,11 @@ ] }, "locked": { - "lastModified": 1727109343, - "narHash": "sha256-1PFckA8Im7wMSl26okwOKqBZeCFLD3LvZZFaxswDhbY=", + "lastModified": 1727524473, + "narHash": "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "4adb6c4c41ee5014bfe608123bfeddb26e5f5cea", + "rev": "7e500e679ede40e79cf2d89b5f5fa3e34923bd26", "type": "github" }, "original": { diff --git a/hosts/cnix/modules.nix b/hosts/cnix/modules.nix index d6ebb632..653e462c 100644 --- a/hosts/cnix/modules.nix +++ b/hosts/cnix/modules.nix @@ -129,15 +129,8 @@ enable = true; }; xserver = { - amd = { - enable = false; - hhkbse = { - enable = false; - }; - }; - nvidia = { - enable = false; - }; + videoDrivers = ["amdgpu"]; + xkbLayout = "se"; }; }; system = { diff --git a/hosts/cnixpad/modules.nix b/hosts/cnixpad/modules.nix index 2d9744ea..219b584d 100644 --- a/hosts/cnixpad/modules.nix +++ b/hosts/cnixpad/modules.nix @@ -129,9 +129,8 @@ enable = true; }; xserver = { - amd = { - enable = false; - }; + videoDrivers = ["amdgpu"]; + xkbLayout = "se"; }; }; system = { diff --git a/hosts/toothpc/modules.nix b/hosts/toothpc/modules.nix index 5951d2cd..0943b73d 100644 --- a/hosts/toothpc/modules.nix +++ b/hosts/toothpc/modules.nix @@ -130,9 +130,8 @@ enable = true; }; xserver = { - nvidia = { - enable = false; - }; + videoDrivers = ["nvidia"]; + xkbLayout = "se"; }; }; system = { diff --git a/system/modules/default.nix b/system/modules/default.nix index ddd6dab7..d9b78100 100644 --- a/system/modules/default.nix +++ b/system/modules/default.nix @@ -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" diff --git a/system/modules/hardware/graphics/amd/default.nix b/system/modules/hardware/graphics/amd/default.nix index 1cc9dcce..b303b487 100644 --- a/system/modules/hardware/graphics/amd/default.nix +++ b/system/modules/hardware/graphics/amd/default.nix @@ -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; diff --git a/system/modules/hardware/graphics/nvidia/default.nix b/system/modules/hardware/graphics/nvidia/default.nix index 19fa230e..0e9cd47c 100644 --- a/system/modules/hardware/graphics/nvidia/default.nix +++ b/system/modules/hardware/graphics/nvidia/default.nix @@ -29,10 +29,6 @@ in { }; config = mkIf cfg.enable { - services.xserver = { - videoDrivers = ["nvidia"]; - xkb.layout = "se"; - }; environment.systemPackages = with pkgs; [ egl-wayland ]; diff --git a/system/modules/hardware/network/default.nix b/system/modules/hardware/network/default.nix index 8c37e8de..7ff7999e 100644 --- a/system/modules/hardware/network/default.nix +++ b/system/modules/hardware/network/default.nix @@ -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."; }; }; }; diff --git a/system/modules/sysd/session/xserver/amd/default.nix b/system/modules/sysd/session/xserver/amd/default.nix deleted file mode 100644 index f3e16c8f..00000000 --- a/system/modules/sysd/session/xserver/amd/default.nix +++ /dev/null @@ -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"; - # }; - }; - }; -} diff --git a/system/modules/sysd/session/xserver/amd/hhkbse/README.md b/system/modules/sysd/session/xserver/amd/hhkbse/README.md deleted file mode 100644 index 73ae2a0d..00000000 --- a/system/modules/sysd/session/xserver/amd/hhkbse/README.md +++ /dev/null @@ -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 ┃ │▒▒ - │ ┗━━━━━┻━━━━━━━━┻━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┻━━━━━━━━┻━━━━━┛ │▒▒ - ╰─────────────────────────────────────────────────────────────────────────────────────────────╯▒▒ - ▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ - ▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -``` diff --git a/system/modules/sysd/session/xserver/amd/hhkbse/default.nix b/system/modules/sysd/session/xserver/amd/hhkbse/default.nix deleted file mode 100644 index 59dea166..00000000 --- a/system/modules/sysd/session/xserver/amd/hhkbse/default.nix +++ /dev/null @@ -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"; - }; - }; - }; -} diff --git a/system/modules/sysd/session/xserver/default.nix b/system/modules/sysd/session/xserver/default.nix new file mode 100644 index 00000000..ab63b309 --- /dev/null +++ b/system/modules/sysd/session/xserver/default.nix @@ -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; + }; + }; +} diff --git a/system/modules/sysd/session/xserver/nvidia/default.nix b/system/modules/sysd/session/xserver/nvidia/default.nix deleted file mode 100644 index 3a1e720f..00000000 --- a/system/modules/sysd/session/xserver/nvidia/default.nix +++ /dev/null @@ -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"; - }; - }; -}