From 290d2f0c3db3310c7c2b87bb84109ed55b6d3be3 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Mon, 11 Sep 2023 00:12:48 +0200 Subject: [PATCH] Each host have nix file for home manager To put specific host parameters --- home-manager/desktop/sway/sway.nix | 17 ++--------------- home-manager/hosts/morty.nix | 30 ++++++++++++++++++++++++++++++ home-manager/hosts/mrmeeseeks.nix | 15 +++++++++++++++ nixos/default.nix | 5 ++++- 4 files changed, 51 insertions(+), 16 deletions(-) create mode 100644 home-manager/hosts/morty.nix create mode 100644 home-manager/hosts/mrmeeseeks.nix diff --git a/home-manager/desktop/sway/sway.nix b/home-manager/desktop/sway/sway.nix index 559b9b5..63ef6e6 100644 --- a/home-manager/desktop/sway/sway.nix +++ b/home-manager/desktop/sway/sway.nix @@ -11,26 +11,13 @@ down = "j"; up = "k"; right = "l"; + bars= []; input = { - "type:keyboard" = { + "1003:8258:MNT_Reform_Keyboard" = { xkb_layout = "us"; xkb_variant = "altgr-intl"; - }; - }; - output = { - "Iiyama North America PL2792UH 1166310803122" = { - mode = "3840x2160@60Hz"; - position = "0,0"; - scale = "2"; - }; - "Iiyama North America PL2792UH 1176923201598" = { - mode = "3840x2160@60Hz"; - position = "1920,0"; - scale = "2"; - transform = "90"; }; }; - bars= []; keybindings = let mod = config.wayland.windowManager.sway.config.modifier; inherit (config.wayland.windowManager.sway.config) diff --git a/home-manager/hosts/morty.nix b/home-manager/hosts/morty.nix new file mode 100644 index 0000000..a7fbeb0 --- /dev/null +++ b/home-manager/hosts/morty.nix @@ -0,0 +1,30 @@ +_: { + home.file.".xkb/symbols/gpdwinmax".text = '' +default partial alphanumeric_keys +xkb_symbols "us-intl-winmax" { + name[group1] = "GPD Win Max us-inlt"; + include "us(altgr-intl)" + key { [ Multi_key ] }; + key { [ Tab ] }; + # include "level3(ralt_switch)" +}; + ''; + + wayland.windowManager.sway.config.input = { + "1:1:AT_Translated_Set_2_keyboard" = { + xkb_layout = "gpdwinmax"; + }; + "1046:928:Goodix_Capacitive_TouchScreen" = { + map_to_output = "eDP-1"; + }; + "2362:597:HTIX5288:00_093A:0255_Touchpad" = { + "tap" = "enable"; + "pointer_accel" = "0.3"; + }; + }; + wayland.windowManager.sway.config.output = { + "eDP-1" = { + transform = "90"; + }; + }; +} diff --git a/home-manager/hosts/mrmeeseeks.nix b/home-manager/hosts/mrmeeseeks.nix new file mode 100644 index 0000000..3c04cd3 --- /dev/null +++ b/home-manager/hosts/mrmeeseeks.nix @@ -0,0 +1,15 @@ +_: { + wayland.windowManager.sway.config.output = { + "Iiyama North America PL2792UH 1166310803122" = { + mode = "3840x2160@60Hz"; + position = "0,0"; + scale = "2"; + }; + "Iiyama North America PL2792UH 1176923201598" = { + mode = "3840x2160@60Hz"; + position = "1920,0"; + scale = "2"; + transform = "90"; + }; + }; +} diff --git a/nixos/default.nix b/nixos/default.nix index f12c6d1..27b8934 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -60,6 +60,7 @@ useUserPackages = true; extraSpecialArgs = { inherit hostConfig; + inherit hostname; }; users.${username} = { home.stateVersion = stateVersion; @@ -80,7 +81,9 @@ if hostConfig.gaming then [ ../home-manager/lutris.nix ] else [] - ); + ) ++ lib.optional ( + builtins.pathExists ../home-manager/hosts/${hostname}.nix + ) ../home-manager/hosts/${hostname}.nix; }; };