diff --git a/config/instances/config/postfix.nix b/config/instances/config/postfix.nix new file mode 100755 index 0000000..399b7f4 --- /dev/null +++ b/config/instances/config/postfix.nix @@ -0,0 +1,27 @@ +{ instancesFunctions }: +let + inherit (instancesFunctions) + domain3 + servicePath + sslPath + sopsPath + ; + + postfixLabel = "Postfix"; + postfixName = "postfix"; +in +{ + label = postfixLabel; + name = postfixName; + sops = { + path0 = "${sopsPath}/${postfixName}"; + }; + subdomain = postfixName; + paths = { + path0 = "${servicePath}/${postfixLabel}"; + }; + ssl = { + cert = "${sslPath}/${domain3}/fullchain.pem"; + key = "${sslPath}/${domain3}/key.pem"; + }; +} diff --git a/config/instances/config/smtp.nix b/config/instances/config/smtp.nix old mode 100644 new mode 100755 diff --git a/flake.nix b/flake.nix index d8808a2..4c7036c 100755 --- a/flake.nix +++ b/flake.nix @@ -84,7 +84,7 @@ ./profiles/user0 ./profiles/user1 config.nixosModules.desktop - config.nixosModules.hyprland + config.nixosModules.gnome config.nixosModules.personal config.nixosModules.shared config.nixosModules.sops diff --git a/home/default.nix b/home/default.nix index eee8197..efe8fd3 100755 --- a/home/default.nix +++ b/home/default.nix @@ -50,7 +50,7 @@ in messaging sharing tools - desktop + gnome ; }; }; diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix index b9f26fd..33086ba 100755 --- a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix +++ b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix @@ -64,16 +64,16 @@ in ]; keyword = instances.forgejo.label; } - { - name = instances.hledger.label; - url = "http://localhost.${builtins.toString instances.hledger.ports.port0}"; - tags = [ - instances.hledger.name - "hledger" - "finances" - ]; - keyword = instances.hledger.label; - } + # { + # name = instances.hledger.label; + # url = "http://localhost.${builtins.toString instances.hledger.ports.port0}"; + # tags = [ + # instances.hledger.name + # "hledger" + # "finances" + # ]; + # keyword = instances.hledger.label; + # } { name = "${instances.jellyfin.label} (Internet)"; url = "https://${instances.jellyfin.name}.${instances.web.domains.url0}"; diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix index 6216df7..c7662d5 100755 --- a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix +++ b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix @@ -2,9 +2,18 @@ name = "Tools"; toolbar = false; bookmarks = [ + { + name = "Mullvad"; + url = "https://mullvad.net"; + tags = [ + "mullvad" + "vpn" + ]; + keyword = "Mull"; + } { name = "Cyanophage Layout Analyzer"; - url = "https://cyanophage.github.io/"; + url = "https://cyanophage.github.io"; tags = [ "cyanophage" "keyboard" @@ -12,6 +21,15 @@ ]; keyword = "Layout"; } + { + name = "Smtp2Go"; + url = "https://app-us.smtp2go.com/dashboard/main"; + tags = [ + "smtp" + "email" + ]; + keyword = "Smtp"; + } { name = "Oryx"; url = "https://configure.zsa.io/moonlander"; diff --git a/home/modules/gui/apps/media/llms/alpaca/default.nix b/home/modules/gui/apps/media/llms/alpaca/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/desktop/gtk/config/cursorTheme.nix b/home/modules/gui/apps/tools/gtk/config/cursorTheme.nix similarity index 100% rename from home/modules/gui/desktop/gtk/config/cursorTheme.nix rename to home/modules/gui/apps/tools/gtk/config/cursorTheme.nix diff --git a/home/modules/gui/desktop/gtk/config/gtk3.nix b/home/modules/gui/apps/tools/gtk/config/gtk3.nix similarity index 100% rename from home/modules/gui/desktop/gtk/config/gtk3.nix rename to home/modules/gui/apps/tools/gtk/config/gtk3.nix diff --git a/home/modules/gui/desktop/gtk/config/homeCursor.nix b/home/modules/gui/apps/tools/gtk/config/homeCursor.nix similarity index 100% rename from home/modules/gui/desktop/gtk/config/homeCursor.nix rename to home/modules/gui/apps/tools/gtk/config/homeCursor.nix diff --git a/home/modules/gui/desktop/gtk/config/iconTheme.nix b/home/modules/gui/apps/tools/gtk/config/iconTheme.nix similarity index 100% rename from home/modules/gui/desktop/gtk/config/iconTheme.nix rename to home/modules/gui/apps/tools/gtk/config/iconTheme.nix diff --git a/home/modules/gui/desktop/gtk/config/theme.nix b/home/modules/gui/apps/tools/gtk/config/theme.nix similarity index 100% rename from home/modules/gui/desktop/gtk/config/theme.nix rename to home/modules/gui/apps/tools/gtk/config/theme.nix diff --git a/home/modules/gui/desktop/gtk/default.nix b/home/modules/gui/apps/tools/gtk/default.nix similarity index 100% rename from home/modules/gui/desktop/gtk/default.nix rename to home/modules/gui/apps/tools/gtk/default.nix diff --git a/home/modules/gui/desktop/catppuccin/default.nix b/home/modules/gui/apps/tools/mullvad/default.nix similarity index 62% rename from home/modules/gui/desktop/catppuccin/default.nix rename to home/modules/gui/apps/tools/mullvad/default.nix index b79eb74..27636ef 100755 --- a/home/modules/gui/desktop/catppuccin/default.nix +++ b/home/modules/gui/apps/tools/mullvad/default.nix @@ -5,8 +5,9 @@ { home.packages = builtins.attrValues { inherit (pkgs) - catppuccin - catppuccin-gtk + # mullvad + mullvad-closest + mullvad-vpn ; }; } diff --git a/home/modules/gui/desktop/gnome/default.nix b/home/modules/gui/desktop/gnome/default.nix new file mode 100644 index 0000000..9b649bc --- /dev/null +++ b/home/modules/gui/desktop/gnome/default.nix @@ -0,0 +1,23 @@ +{ pkgs, ... }: +{ + home.packages = builtins.attrValues { + inherit (pkgs) + gnome-connections + gnome-tweaks + gnome-shell-extensions + gnome-remote-desktop + ; + inherit (pkgs.gnomeExtensions) + tiling-shell + keep-awake + notification-banner-reloaded + no-overview + wallpaper-slideshow + dash-to-panel + just-perfection + appindicator + tiling-assistant + start-overlay-in-application-view + ; + }; +} diff --git a/home/modules/gui/desktop/hypr/default.nix b/home/modules/gui/desktop/hypr/default.nix new file mode 100755 index 0000000..f106bc5 --- /dev/null +++ b/home/modules/gui/desktop/hypr/default.nix @@ -0,0 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in +{ + imports = importList; +} diff --git a/home/modules/gui/desktop/dunst/config/settings.nix b/home/modules/gui/desktop/hypr/dunst/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/dunst/config/settings.nix rename to home/modules/gui/desktop/hypr/dunst/config/settings.nix diff --git a/home/modules/gui/desktop/dunst/default.nix b/home/modules/gui/desktop/hypr/dunst/default.nix similarity index 100% rename from home/modules/gui/desktop/dunst/default.nix rename to home/modules/gui/desktop/hypr/dunst/default.nix diff --git a/home/modules/gui/desktop/easyEffects/default.nix b/home/modules/gui/desktop/hypr/easyEffects/default.nix similarity index 100% rename from home/modules/gui/desktop/easyEffects/default.nix rename to home/modules/gui/desktop/hypr/easyEffects/default.nix diff --git a/home/modules/gui/desktop/gammastep/default.nix b/home/modules/gui/desktop/hypr/gammastep/default.nix similarity index 100% rename from home/modules/gui/desktop/gammastep/default.nix rename to home/modules/gui/desktop/hypr/gammastep/default.nix diff --git a/home/modules/gui/desktop/hypridle/config/settings.nix b/home/modules/gui/desktop/hypr/hypridle/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/hypridle/config/settings.nix rename to home/modules/gui/desktop/hypr/hypridle/config/settings.nix diff --git a/home/modules/gui/desktop/hypridle/default.nix b/home/modules/gui/desktop/hypr/hypridle/default.nix similarity index 100% rename from home/modules/gui/desktop/hypridle/default.nix rename to home/modules/gui/desktop/hypr/hypridle/default.nix diff --git a/home/modules/gui/desktop/hyprland/config/animations.nix b/home/modules/gui/desktop/hypr/hyprland/config/animations.nix similarity index 100% rename from home/modules/gui/desktop/hyprland/config/animations.nix rename to home/modules/gui/desktop/hypr/hyprland/config/animations.nix diff --git a/home/modules/gui/desktop/hyprland/config/bind.nix b/home/modules/gui/desktop/hypr/hyprland/config/bind.nix similarity index 100% rename from home/modules/gui/desktop/hyprland/config/bind.nix rename to home/modules/gui/desktop/hypr/hyprland/config/bind.nix diff --git a/home/modules/gui/desktop/hyprland/config/bindl.nix b/home/modules/gui/desktop/hypr/hyprland/config/bindl.nix similarity index 100% rename from home/modules/gui/desktop/hyprland/config/bindl.nix rename to home/modules/gui/desktop/hypr/hyprland/config/bindl.nix diff --git a/home/modules/gui/desktop/hyprland/config/bindm.nix b/home/modules/gui/desktop/hypr/hyprland/config/bindm.nix similarity index 100% rename from home/modules/gui/desktop/hyprland/config/bindm.nix rename to home/modules/gui/desktop/hypr/hyprland/config/bindm.nix diff --git a/home/modules/gui/desktop/hyprland/config/binds.nix b/home/modules/gui/desktop/hypr/hyprland/config/binds.nix similarity index 100% rename from home/modules/gui/desktop/hyprland/config/binds.nix rename to home/modules/gui/desktop/hypr/hyprland/config/binds.nix diff --git a/home/modules/gui/desktop/hyprland/config/decoration.nix b/home/modules/gui/desktop/hypr/hyprland/config/decoration.nix similarity index 100% rename from home/modules/gui/desktop/hyprland/config/decoration.nix rename to home/modules/gui/desktop/hypr/hyprland/config/decoration.nix diff --git a/home/modules/gui/desktop/hyprland/config/dwindle.nix b/home/modules/gui/desktop/hypr/hyprland/config/dwindle.nix similarity index 100% rename from home/modules/gui/desktop/hyprland/config/dwindle.nix rename to home/modules/gui/desktop/hypr/hyprland/config/dwindle.nix diff --git a/home/modules/gui/desktop/hyprland/config/exec-once.nix b/home/modules/gui/desktop/hypr/hyprland/config/exec-once.nix similarity index 100% rename from home/modules/gui/desktop/hyprland/config/exec-once.nix rename to home/modules/gui/desktop/hypr/hyprland/config/exec-once.nix diff --git a/home/modules/gui/desktop/hyprland/config/general.nix b/home/modules/gui/desktop/hypr/hyprland/config/general.nix similarity index 100% rename from home/modules/gui/desktop/hyprland/config/general.nix rename to home/modules/gui/desktop/hypr/hyprland/config/general.nix diff --git a/home/modules/gui/desktop/hyprland/config/input.nix b/home/modules/gui/desktop/hypr/hyprland/config/input.nix similarity index 100% rename from home/modules/gui/desktop/hyprland/config/input.nix rename to home/modules/gui/desktop/hypr/hyprland/config/input.nix diff --git a/home/modules/gui/desktop/hyprland/config/misc.nix b/home/modules/gui/desktop/hypr/hyprland/config/misc.nix similarity index 100% rename from home/modules/gui/desktop/hyprland/config/misc.nix rename to home/modules/gui/desktop/hypr/hyprland/config/misc.nix diff --git a/home/modules/gui/desktop/hyprland/config/windowrulev2.nix b/home/modules/gui/desktop/hypr/hyprland/config/windowrulev2.nix similarity index 100% rename from home/modules/gui/desktop/hyprland/config/windowrulev2.nix rename to home/modules/gui/desktop/hypr/hyprland/config/windowrulev2.nix diff --git a/home/modules/gui/desktop/hyprland/config/xwayland.nix b/home/modules/gui/desktop/hypr/hyprland/config/xwayland.nix similarity index 100% rename from home/modules/gui/desktop/hyprland/config/xwayland.nix rename to home/modules/gui/desktop/hypr/hyprland/config/xwayland.nix diff --git a/home/modules/gui/desktop/hyprland/default.nix b/home/modules/gui/desktop/hypr/hyprland/default.nix similarity index 100% rename from home/modules/gui/desktop/hyprland/default.nix rename to home/modules/gui/desktop/hypr/hyprland/default.nix diff --git a/home/modules/gui/desktop/network/default.nix b/home/modules/gui/desktop/hypr/network/default.nix similarity index 100% rename from home/modules/gui/desktop/network/default.nix rename to home/modules/gui/desktop/hypr/network/default.nix diff --git a/home/modules/gui/desktop/nwgLook/default.nix b/home/modules/gui/desktop/hypr/nwgLook/default.nix similarity index 100% rename from home/modules/gui/desktop/nwgLook/default.nix rename to home/modules/gui/desktop/hypr/nwgLook/default.nix diff --git a/home/modules/gui/desktop/plasmaNm/default.nix b/home/modules/gui/desktop/hypr/plasmaNm/default.nix similarity index 100% rename from home/modules/gui/desktop/plasmaNm/default.nix rename to home/modules/gui/desktop/hypr/plasmaNm/default.nix diff --git a/home/modules/gui/desktop/swaylock/config/settings.nix b/home/modules/gui/desktop/hypr/swaylock/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/swaylock/config/settings.nix rename to home/modules/gui/desktop/hypr/swaylock/config/settings.nix diff --git a/home/modules/gui/desktop/swaylock/default.nix b/home/modules/gui/desktop/hypr/swaylock/default.nix similarity index 100% rename from home/modules/gui/desktop/swaylock/default.nix rename to home/modules/gui/desktop/hypr/swaylock/default.nix diff --git a/home/modules/gui/desktop/tofi/config/settings.nix b/home/modules/gui/desktop/hypr/tofi/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/tofi/config/settings.nix rename to home/modules/gui/desktop/hypr/tofi/config/settings.nix diff --git a/home/modules/gui/desktop/tofi/default.nix b/home/modules/gui/desktop/hypr/tofi/default.nix similarity index 100% rename from home/modules/gui/desktop/tofi/default.nix rename to home/modules/gui/desktop/hypr/tofi/default.nix diff --git a/home/modules/gui/desktop/udiskie/default.nix b/home/modules/gui/desktop/hypr/udiskie/default.nix similarity index 100% rename from home/modules/gui/desktop/udiskie/default.nix rename to home/modules/gui/desktop/hypr/udiskie/default.nix diff --git a/home/modules/gui/desktop/wallet/default.nix b/home/modules/gui/desktop/hypr/wallet/default.nix similarity index 100% rename from home/modules/gui/desktop/wallet/default.nix rename to home/modules/gui/desktop/hypr/wallet/default.nix diff --git a/home/modules/gui/desktop/waybar/config/scripts/get_weather.sh b/home/modules/gui/desktop/hypr/waybar/config/scripts/get_weather.sh similarity index 100% rename from home/modules/gui/desktop/waybar/config/scripts/get_weather.sh rename to home/modules/gui/desktop/hypr/waybar/config/scripts/get_weather.sh diff --git a/home/modules/gui/desktop/waybar/config/settings.nix b/home/modules/gui/desktop/hypr/waybar/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/waybar/config/settings.nix rename to home/modules/gui/desktop/hypr/waybar/config/settings.nix diff --git a/home/modules/gui/desktop/waybar/config/style.nix b/home/modules/gui/desktop/hypr/waybar/config/style.nix similarity index 100% rename from home/modules/gui/desktop/waybar/config/style.nix rename to home/modules/gui/desktop/hypr/waybar/config/style.nix diff --git a/home/modules/gui/desktop/waybar/default.nix b/home/modules/gui/desktop/hypr/waybar/default.nix similarity index 100% rename from home/modules/gui/desktop/waybar/default.nix rename to home/modules/gui/desktop/hypr/waybar/default.nix diff --git a/home/modules/gui/desktop/wlClipboard/default.nix b/home/modules/gui/desktop/hypr/wlClipboard/default.nix similarity index 100% rename from home/modules/gui/desktop/wlClipboard/default.nix rename to home/modules/gui/desktop/hypr/wlClipboard/default.nix diff --git a/home/modules/gui/desktop/wpaperd/default.nix b/home/modules/gui/desktop/hypr/wpaperd/default.nix similarity index 100% rename from home/modules/gui/desktop/wpaperd/default.nix rename to home/modules/gui/desktop/hypr/wpaperd/default.nix diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/pinksky.png b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/pinksky.png similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/pinksky.png rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/pinksky.png diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/u6ne2q214dx71.jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/u6ne2q214dx71.jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/u6ne2q214dx71.jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/u6ne2q214dx71.jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-0wj757.jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-0wj757.jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-0wj757.jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-0wj757.jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-2ege2g.jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-2ege2g.jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-2ege2g.jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-2ege2g.jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-4dj2qo.png b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-4dj2qo.png similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-4dj2qo.png rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-4dj2qo.png diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-4xq6vv.png b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-4xq6vv.png similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-4xq6vv.png rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-4xq6vv.png diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-5dyvy3.jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-5dyvy3.jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-5dyvy3.jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-5dyvy3.jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-735xv3.jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-735xv3.jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-735xv3.jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-735xv3.jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-8xe25y.jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-8xe25y.jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-8xe25y.jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-8xe25y.jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-g8ky73.jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-g8ky73.jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-g8ky73.jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-g8ky73.jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-j8wzvp.jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-j8wzvp.jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-j8wzvp.jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-j8wzvp.jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-nekxjk.png b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-nekxjk.png similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-nekxjk.png rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-nekxjk.png diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-nryz87.jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-nryz87.jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-nryz87.jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-nryz87.jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-r7yey1.jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-r7yey1.jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-r7yey1.jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-r7yey1.jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-vge32m.jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-vge32m.jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-vge32m.jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-vge32m.jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-vgxgem.jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-vgxgem.jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallhaven-vgxgem.jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallhaven-vgxgem.jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg diff --git a/home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg b/home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg similarity index 100% rename from home/modules/gui/desktop/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg rename to home/modules/gui/desktop/hypr/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg diff --git a/nixos/default.nix b/nixos/default.nix index 50cb6a7..e487c96 100755 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -58,6 +58,7 @@ in desktop = { imports = builtins.attrValues { inherit (modules) + mullvad syncthing ollama ; diff --git a/nixos/modules/mullvad.nix b/nixos/modules/mullvad.nix new file mode 100755 index 0000000..28c51b7 --- /dev/null +++ b/nixos/modules/mullvad.nix @@ -0,0 +1,6 @@ +{ + services.mullvad-vpn = { + enable = true; + enableExcludeWrapper = false; + }; +}