diff --git a/modules/home/default.nix b/modules/home/default.nix index 6833e74..22b2efe 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -152,27 +152,30 @@ in ; }; }; - # "${deimos.name}-${user1}" = { - # imports = builtins.attrValues { - # inherit (modules) - # cli - # brave - # ghostty - # zed - # gaming - # spotify - # docs - # mpv - # kolourPaint - # discord - # signal - # scrcpy - # bitwarden - # emote - # desktop - # ; - # }; - # }; + "${deimos.name}-${user1}" = { + imports = builtins.attrValues { + inherit (modules) + cli + brave + ghostty + zed + gaming + spotify + docs + mpv + kolourPaint + discord + signal + scrcpy + bitwarden + emote + desktop + hypr + wayland + theming + ; + }; + }; "${charon.name}-${user1}" = { imports = builtins.attrValues { inherit (modules) @@ -186,13 +189,13 @@ in mpv jellyfin kolourPaint + systemMonitor discord signal scrcpy bitwarden emote - hypr - wayland + gnome theming ; }; diff --git a/modules/home/gui/desktop/hypr/land/config/monitor.nix b/modules/home/gui/desktop/hypr/land/config/monitor.nix new file mode 100755 index 0000000..fbd1df1 --- /dev/null +++ b/modules/home/gui/desktop/hypr/land/config/monitor.nix @@ -0,0 +1,6 @@ +let + monitorSettings = [ + "eDP-1,highres@highrr,0x0,1" + ]; +in +monitorSettings diff --git a/modules/home/gui/desktop/hypr/land/default.nix b/modules/home/gui/desktop/hypr/land/default.nix index c33e346..5a82a37 100755 --- a/modules/home/gui/desktop/hypr/land/default.nix +++ b/modules/home/gui/desktop/hypr/land/default.nix @@ -23,6 +23,7 @@ let misc = import (configPath + /misc.nix); windowrulev2 = import (configPath + /windowrulev2.nix); xwayland = import (configPath + /xwayland.nix); + monitor = import (configPath + /monitor.nix); bind = let bindConfig = diff --git a/modules/home/gui/desktop/wayland/waybar/config/settings.nix b/modules/home/gui/desktop/wayland/waybar/config/settings.nix index 02c6ec7..fa44ac3 100755 --- a/modules/home/gui/desktop/wayland/waybar/config/settings.nix +++ b/modules/home/gui/desktop/wayland/waybar/config/settings.nix @@ -1,13 +1,6 @@ -{ flake, config, ... }: +{ config, ... }: let - inherit (flake.config.people) - user0 - user1 - user2 - ; - user = config.home.username; - userConfig = flake.config.people.users.${user}; in { mainBar = { diff --git a/modules/home/gui/desktop/wayland/waybar/default.nix b/modules/home/gui/desktop/wayland/waybar/default.nix index cf8371a..4ecf198 100755 --- a/modules/home/gui/desktop/wayland/waybar/default.nix +++ b/modules/home/gui/desktop/wayland/waybar/default.nix @@ -6,7 +6,7 @@ }: let configPath = ./config; - settingsPath = import (configPath + /settings.nix) { inherit config flake; }; + settingsPath = import (configPath + /settings.nix) { inherit config; }; stylePath = import (configPath + /style.nix) { inherit config flake; }; in { diff --git a/modules/nixos/core/homeManager/default.nix b/modules/nixos/core/homeManager/default.nix index 4ac060a..e460ee5 100755 --- a/modules/nixos/core/homeManager/default.nix +++ b/modules/nixos/core/homeManager/default.nix @@ -3,7 +3,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - backupFileExtension = "backup"; + backupFileExtension = "backup3"; extraSpecialArgs = { inherit flake diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index fa8ea3d..2aa44d5 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -34,6 +34,8 @@ in inherit (modules) hypr wayland + # plasma + # sddm flatpak xserver ; @@ -43,8 +45,7 @@ in charon = { imports = builtins.attrValues { inherit (modules) - hypr - wayland + gnome flatpak xserver ; diff --git a/profiles/user1/files/wallpaper/0v1YQLSg6MTHNJwDdky4Igcc6nTTbMctPS8DhT_iGww.webp b/profiles/user1/files/wallpaper/0v1YQLSg6MTHNJwDdky4Igcc6nTTbMctPS8DhT_iGww.webp new file mode 100755 index 0000000..d2a4fa8 Binary files /dev/null and b/profiles/user1/files/wallpaper/0v1YQLSg6MTHNJwDdky4Igcc6nTTbMctPS8DhT_iGww.webp differ diff --git a/profiles/user1/files/wallpaper/9402963.jpg b/profiles/user1/files/wallpaper/9402963.jpg old mode 100644 new mode 100755 diff --git a/profiles/user1/files/wallpaper/f.jpg b/profiles/user1/files/wallpaper/f.jpg old mode 100644 new mode 100755 diff --git a/profiles/user1/files/wallpaper/murder-drones-action-scene-2hplnpxoeolfor3a.jpg b/profiles/user1/files/wallpaper/murder-drones-action-scene-2hplnpxoeolfor3a.jpg old mode 100644 new mode 100755 diff --git a/profiles/user1/files/wallpaper/murder-drones-wallpapers-8.jpg b/profiles/user1/files/wallpaper/murder-drones-wallpapers-8.jpg old mode 100644 new mode 100755