diff --git a/home-manager/cli/zsh.nix b/home-manager/cli/zsh.nix index 39799c3..3f14b12 100644 --- a/home-manager/cli/zsh.nix +++ b/home-manager/cli/zsh.nix @@ -6,10 +6,10 @@ defaultKeymap = "viins"; enableCompletion = true; history = { - expireDuplicatesFirst = true; + ignoreAllDups = true; save = 10000; share = true; - path = ".local/share/zsh/history"; + path = "$HOME/.local/share/zsh/history"; }; historySubstringSearch = { enable = true; diff --git a/home-manager/desktop/sway/sway.nix b/home-manager/desktop/sway/sway.nix index 33f5edd..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 = { - "*" = { + "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/desktop/sway/swayidle.nix b/home-manager/desktop/sway/swayidle.nix index 34d7c8f..b93cdab 100644 --- a/home-manager/desktop/sway/swayidle.nix +++ b/home-manager/desktop/sway/swayidle.nix @@ -9,8 +9,8 @@ } { timeout = 600; - command = "swaymsg 'output * dpms off'"; - resumeCommand = "swaymsg 'output * dpms on'"; + command = ''${pkgs.sway}/bin/swaymsg "output * power off''; + resumeCommand = ''${pkgs.sway}/bin/swaymsg "output * power on"''; } ]; events = [ 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; }; };