diff --git a/hosts/morty/files/lockscreen.png b/hosts/morty/files/lockscreen.png new file mode 100644 index 0000000..9fc386f Binary files /dev/null and b/hosts/morty/files/lockscreen.png differ diff --git a/hosts/morty/home-config.nix b/hosts/morty/home-config.nix index 000cb12..1701470 100644 --- a/hosts/morty/home-config.nix +++ b/hosts/morty/home-config.nix @@ -24,6 +24,7 @@ gaming.lutris.enable = true; desktop.sway = { enable = true; + wallpapers.lockscreen = "${./files/lockscreen.png}"; kanshi = true; waybar = { laptop = true; diff --git a/home-manager/hosts/morty.nix b/hosts/morty/includes/home-manager.nix similarity index 52% rename from home-manager/hosts/morty.nix rename to hosts/morty/includes/home-manager.nix index c1b26f1..5d156fd 100644 --- a/home-manager/hosts/morty.nix +++ b/hosts/morty/includes/home-manager.nix @@ -1,19 +1,22 @@ {pkgs, ... }: -{ - 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)" -}; +let + kbd_file = pkgs.writeText "gpdwinmax.kbd" + '' + 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)" + }; ''; - +in +{ + wayland.windowManager.sway.checkConfig = false; wayland.windowManager.sway.config.input = { "1:1:AT_Translated_Set_2_keyboard" = { - xkb_layout = "gpdwinmax"; + xkb_layout = "${kbd_file}"; }; "1046:928:Goodix_Capacitive_TouchScreen" = { map_to_output = "eDP-1"; diff --git a/hosts/morty/nixos-config.nix b/hosts/morty/nixos-config.nix index 8926b11..ce1b727 100644 --- a/hosts/morty/nixos-config.nix +++ b/hosts/morty/nixos-config.nix @@ -1,4 +1,5 @@ { ... }: { + config.modules.desktop.sway.enable = true; config.modules.gaming.steam.enable = true; config.modules.hardware.laptop.enable = true; } diff --git a/hosts/mrmeeseeks/files/lockscreen.png b/hosts/mrmeeseeks/files/lockscreen.png new file mode 100644 index 0000000..5bf3a3f Binary files /dev/null and b/hosts/mrmeeseeks/files/lockscreen.png differ diff --git a/hosts/mrmeeseeks/files/wallpaper.jpg b/hosts/mrmeeseeks/files/wallpaper.jpg new file mode 100644 index 0000000..f46bedb Binary files /dev/null and b/hosts/mrmeeseeks/files/wallpaper.jpg differ diff --git a/hosts/mrmeeseeks/home-config.nix b/hosts/mrmeeseeks/home-config.nix index 29c8e6f..c253bdb 100644 --- a/hosts/mrmeeseeks/home-config.nix +++ b/hosts/mrmeeseeks/home-config.nix @@ -1,11 +1,16 @@ { ... }: { config.modules = { application = { + gnupg.enable = true; zathura.enable = true; foot.enable = true; }; cli = { + direnv.enable = true; + ghq.enable = true; + git.enable = true; neovim.enable = true; + utils.enable = true; vifm.enable = true; zsh.enable = true; }; @@ -20,6 +25,8 @@ desktop.sway = { enable = true; kanshi = false; + wallpapers.lockscreen = "${./files/lockscreen.png}"; + wallpapers.desktop = "${./files/wallpaper.jpg} center #000000"; waybar = { laptop = false; gpuThermal = { diff --git a/home-manager/hosts/mrmeeseeks.nix b/hosts/mrmeeseeks/includes/home-manager.nix similarity index 78% rename from home-manager/hosts/mrmeeseeks.nix rename to hosts/mrmeeseeks/includes/home-manager.nix index 5c4cffc..71e8639 100644 --- a/home-manager/hosts/mrmeeseeks.nix +++ b/hosts/mrmeeseeks/includes/home-manager.nix @@ -1,15 +1,16 @@ _: { + wayland.windowManager.sway.checkConfig = false; wayland.windowManager.sway.config.output = { "Iiyama North America PL2792UH 1166310803122" = { mode = "3840x2160@60Hz"; - position = "1080,0"; - scale = "2"; + position = "1235,0"; + scale = "1.75"; bg = "~/medias/images/wallpapers/desktop.jpg center #000000"; }; "Iiyama North America PL2792UH 1176923201598" = { mode = "3840x2160@60Hz"; position = "0,0"; - scale = "2"; + scale = "1.75"; transform = "270"; bg = "~/medias/images/wallpapers/desktop.jpg center #000000"; }; diff --git a/hosts/mrmeeseeks/nixos-config.nix b/hosts/mrmeeseeks/nixos-config.nix index 2052e1a..6cb7886 100644 --- a/hosts/mrmeeseeks/nixos-config.nix +++ b/hosts/mrmeeseeks/nixos-config.nix @@ -1,4 +1,5 @@ { ... }: { + config.modules.desktop.sway.enable = true; config.modules.gaming.steam = { enable = true; gamemode = true; diff --git a/modules/home-manager/desktop/sway/default.nix b/modules/home-manager/desktop/sway/default.nix index f7d40e0..aad3a3d 100644 --- a/modules/home-manager/desktop/sway/default.nix +++ b/modules/home-manager/desktop/sway/default.nix @@ -21,8 +21,8 @@ in }; desktop = mkOption { type = types.str; - default = ""; - description = "path for desktop wallpaper"; + default = "#000000 solid_color"; + description = "options for desktop wallpaper"; }; };