From cfdf20a39c694d6e3195575c5b398c7c79bef7b9 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 13 Mar 2025 17:24:51 -0500 Subject: [PATCH] feat: restructured some stuff for user1 --- flake.lock | 90 +++++++++--------- flake.nix | 2 +- modules/home/default.nix | 72 +++++++++----- .../media/docs/docViewing/zathura/default.nix | 0 .../desktop/hypr/land/config/bind-user0.nix | 4 +- .../wayland/waybar/config/settings.nix | 27 +++++- .../desktop/wayland/waybar/config/style.nix | 6 ++ .../gui/desktop/wayland/waybar/default.nix | 2 +- .../gui/desktop/wayland/wpaperd/default.nix | 2 +- modules/nixos/core/doas/default.nix | 38 +++++--- modules/nixos/core/ssh/default.nix | 13 ++- modules/nixos/default.nix | 2 + .../nixos/desktop/wayland/greetd/default.nix | 15 ++- .../nixos/desktop/wayland/regreet/default.nix | 2 +- modules/nixos/sops/default.nix | 20 +++- profiles/user0/default.nix | 8 ++ .../user0/files}/get_weather.sh | 0 .../files}/wallpaper/FTDCMyaXoAEUn5h.jpg | Bin .../user0/files}/wallpaper/cat-waves.png | Bin .../wallpaper/juliemao-1741428128332-6023.jpg | Bin .../user0/files}/wallpaper/pinksky.png | Bin .../user0/files}/wallpaper/u6ne2q214dx71.jpg | Bin .../files}/wallpaper/wallhaven-0wj757.jpg | Bin .../files}/wallpaper/wallhaven-2ege2g.jpg | Bin .../files}/wallpaper/wallhaven-4dj2qo.png | Bin .../files}/wallpaper/wallhaven-4xq6vv.png | Bin .../files}/wallpaper/wallhaven-5dyvy3.jpg | Bin .../files}/wallpaper/wallhaven-735xv3.jpg | Bin .../files}/wallpaper/wallhaven-8xe25y.jpg | Bin .../files}/wallpaper/wallhaven-eyrj7o.jpg | Bin .../files}/wallpaper/wallhaven-g8ky73.jpg | Bin .../files}/wallpaper/wallhaven-j8wzvp.jpg | Bin .../files}/wallpaper/wallhaven-nekxjk.png | Bin .../files}/wallpaper/wallhaven-nryz87.jpg | Bin .../files}/wallpaper/wallhaven-r7yey1.jpg | Bin .../files}/wallpaper/wallhaven-vge32m.jpg | Bin .../files}/wallpaper/wallhaven-vgxgem.jpg | Bin .../wallpaperflare.com_wallpaper (1).jpg | Bin .../wallpaperflare.com_wallpaper (10).jpg | Bin .../wallpaperflare.com_wallpaper (11).jpg | Bin .../wallpaperflare.com_wallpaper (12).jpg | Bin .../wallpaperflare.com_wallpaper (13).jpg | Bin .../wallpaperflare.com_wallpaper (14).jpg | Bin .../wallpaperflare.com_wallpaper (15).jpg | Bin .../wallpaperflare.com_wallpaper (16).jpg | Bin .../wallpaperflare.com_wallpaper (17).jpg | Bin .../wallpaperflare.com_wallpaper (19).jpg | Bin .../wallpaperflare.com_wallpaper (2).jpg | Bin .../wallpaperflare.com_wallpaper (20).jpg | Bin .../wallpaperflare.com_wallpaper (21).jpg | Bin .../wallpaperflare.com_wallpaper (22).jpg | Bin .../wallpaperflare.com_wallpaper (23).jpg | Bin .../wallpaperflare.com_wallpaper (24).jpg | Bin .../wallpaperflare.com_wallpaper (26).jpg | Bin .../wallpaperflare.com_wallpaper (27).jpg | Bin .../wallpaperflare.com_wallpaper (28).jpg | Bin .../wallpaperflare.com_wallpaper (29).jpg | Bin .../wallpaperflare.com_wallpaper (3).jpg | Bin .../wallpaperflare.com_wallpaper (30).jpg | Bin .../wallpaperflare.com_wallpaper (31).jpg | Bin .../wallpaperflare.com_wallpaper (32).jpg | Bin .../wallpaperflare.com_wallpaper (34).jpg | Bin .../wallpaperflare.com_wallpaper (35).jpg | Bin .../wallpaperflare.com_wallpaper (37).jpg | Bin .../wallpaperflare.com_wallpaper (38).jpg | Bin .../wallpaperflare.com_wallpaper (4).jpg | Bin .../wallpaperflare.com_wallpaper (5).jpg | Bin .../wallpaperflare.com_wallpaper (6).jpg | Bin .../wallpaperflare.com_wallpaper (7).jpg | Bin .../wallpaperflare.com_wallpaper (8).jpg | Bin .../wallpaperflare.com_wallpaper (9).jpg | Bin .../wallpaperflare.com_wallpaper.jpg | Bin .../files}/wallpaper/yrTphE7NymvE-bSD.mp4 | Bin profiles/user1/default.nix | 8 ++ profiles/user1/files/get_weather.sh | 19 ++++ systems/deimos/config/filesystem.nix | 2 +- 76 files changed, 233 insertions(+), 99 deletions(-) mode change 100644 => 100755 modules/home/gui/apps/media/docs/docViewing/zathura/default.nix rename {modules/home/gui/desktop/wayland/waybar/config/scripts => profiles/user0/files}/get_weather.sh (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/FTDCMyaXoAEUn5h.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/cat-waves.png (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/juliemao-1741428128332-6023.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/pinksky.png (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/u6ne2q214dx71.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallhaven-0wj757.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallhaven-2ege2g.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallhaven-4dj2qo.png (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallhaven-4xq6vv.png (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallhaven-5dyvy3.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallhaven-735xv3.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallhaven-8xe25y.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallhaven-eyrj7o.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallhaven-g8ky73.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallhaven-j8wzvp.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallhaven-nekxjk.png (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallhaven-nryz87.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallhaven-r7yey1.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallhaven-vge32m.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallhaven-vgxgem.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (1).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (10).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (11).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (12).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (13).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (14).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (15).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (16).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (17).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (19).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (2).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (20).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (21).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (22).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (23).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (24).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (26).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (27).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (28).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (29).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (3).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (30).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (31).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (32).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (34).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (35).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (37).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (38).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (4).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (5).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (6).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (7).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (8).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper (9).jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/wallpaperflare.com_wallpaper.jpg (100%) rename {modules/home/gui/desktop/wayland/wpaperd => profiles/user0/files}/wallpaper/yrTphE7NymvE-bSD.mp4 (100%) create mode 100755 profiles/user1/files/get_weather.sh diff --git a/flake.lock b/flake.lock index e44b4aa..ed5e69f 100755 --- a/flake.lock +++ b/flake.lock @@ -59,11 +59,11 @@ }, "crane": { "locked": { - "lastModified": 1739936662, - "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=", + "lastModified": 1741481578, + "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", "owner": "ipetkov", "repo": "crane", - "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7", + "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", "type": "github" }, "original": { @@ -403,11 +403,11 @@ "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1741473443, - "narHash": "sha256-H+rS9UDb1Qd0bTUxppNgiIHLzr4sR/LnDox4VhR5Q1w=", + "lastModified": 1741594465, + "narHash": "sha256-8a/QIgNwV8VGn8JIiACmVVEdue+U3juiMSAO1DEUTC4=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "d3fd2b02e71f3eaecd310b246ee64a26a59b78e3", + "rev": "95daca616db5c24d7bb37fd5a3ac2f8762bb4ead", "type": "github" }, "original": { @@ -490,11 +490,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741370148, - "narHash": "sha256-nzGqv+4teMbOjhylRCfGsqH7XFLt5m+uwJHgGA0YpUQ=", + "lastModified": 1741815977, + "narHash": "sha256-zRPJMgKBvLBNVlPEMpkjEYtd2jKbHE6AlqT9bL5m/yQ=", "owner": "helix-editor", "repo": "helix", - "rev": "dc4761ad3a09a1cc9a3219d75765ff098fb203af", + "rev": "1bd7a3901cf73a9219470dafc65f3c7119e96cc0", "type": "github" }, "original": { @@ -537,11 +537,11 @@ ] }, "locked": { - "lastModified": 1741461731, - "narHash": "sha256-BBQfGvO3GWOV+5tmqH14gNcZrRaQ7Q3tQx31Frzoip8=", + "lastModified": 1741791118, + "narHash": "sha256-4Y427uj0eql4yRU5rely3EcOlB9q457UDbG9omPtXiA=", "owner": "nix-community", "repo": "home-manager", - "rev": "7f4c60a3d6e548dbc13666565c22cb3f8dcdad44", + "rev": "18780912345970e5b546b1b085385789b6935a83", "type": "github" }, "original": { @@ -626,11 +626,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1741461862, - "narHash": "sha256-TNTtpDHoNB+wOEfypkGTu2zC0wHUwbabQo4HyU53Yok=", + "lastModified": 1741788549, + "narHash": "sha256-Ot/AuQGw5KJwHjyTMHWmyaduNkcE58bOCmyitZ4VxEQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "d30cc19d253a3db784ad10c3084f58cbb52d325a", + "rev": "e86d3a14e46d19d8a47f8ceb6410546715d45f10", "type": "github" }, "original": { @@ -988,11 +988,11 @@ "yants": "yants" }, "locked": { - "lastModified": 1741379880, - "narHash": "sha256-DKlMDfJpiqlwb4X4+3BBITNsMa8PvwzxPBexwPdrhCI=", + "lastModified": 1741798076, + "narHash": "sha256-zQh8FysFtZ0QVGNxDkpO50be9N+8lvkUgwpkMua1kK8=", "owner": "ngi-nix", "repo": "ngipkgs", - "rev": "716f0f56604f76aa731b4dd47386028a91a7a0c5", + "rev": "ed15bd021f36f9396e4d60664599de187f267b2f", "type": "github" }, "original": { @@ -1008,11 +1008,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1741432127, - "narHash": "sha256-JrN9MWJLVVEjVYINDX0NHI2U91/7qSywm6m6mGKwB0E=", + "lastModified": 1741691385, + "narHash": "sha256-Zjs3cBTVm4GLjjLgdi9XS/7nEdjjciKPj2EFOLOrNcE=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "bf3d41b9fc89883823ce9fadbec1b44f2cdd1fac", + "rev": "5af413f4e97073783ed2dc11fd134ffc7771414d", "type": "github" }, "original": { @@ -1071,11 +1071,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1741332913, - "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", + "lastModified": 1741600792, + "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20755fa05115c84be00b04690630cb38f0a203ad", + "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", "type": "github" }, "original": { @@ -1103,11 +1103,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -1119,11 +1119,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -1158,11 +1158,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1741473895, - "narHash": "sha256-mWiCOdvGkDVJO6C9OaXDpYuKUJocyeZhtWP7QNqS2Zs=", + "lastModified": 1741827850, + "narHash": "sha256-wTZexZxoIi8pvEvYaE0xfDfvq1KQgzk0/BipXumYv8M=", "owner": "nix-community", "repo": "NUR", - "rev": "3c1d774501d2300c51ce37ea6d1405d5ea12e740", + "rev": "8a38b29f38afb374c33123fd0d0128cab36a1ea4", "type": "github" }, "original": { @@ -1351,11 +1351,11 @@ ] }, "locked": { - "lastModified": 1740882709, - "narHash": "sha256-VC+8GxWK4p08jjIbmsNfeFQajW2lsiOR/XQiOOvqgvs=", + "lastModified": 1741573199, + "narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f4d5a693c18b389f0d58f55b6f7be6ef85af186f", + "rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a", "type": "github" }, "original": { @@ -1415,11 +1415,11 @@ ] }, "locked": { - "lastModified": 1741043164, - "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", + "lastModified": 1741644481, + "narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", + "rev": "e653d71e82575a43fe9d228def8eddb73887b866", "type": "github" }, "original": { @@ -1676,11 +1676,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1741418166, - "narHash": "sha256-9/KZCzO2V2DgNp5225dvNjWFUZDSRNc52wV4a/tU95Y=", + "lastModified": 1741760227, + "narHash": "sha256-5yZ3FQZFG0DSssr8NRa+JWGOojHLDFG2L+icNVnj+tw=", "owner": "sxyazi", "repo": "yazi", - "rev": "31177fd1fd71500e6a30edee60a122f78e5e7424", + "rev": "abfbd1cd9f0dd428d134f257ec89c25dac842b65", "type": "github" }, "original": { @@ -1699,11 +1699,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1741472240, - "narHash": "sha256-STuoLQxDC9b7j26rNSfVNnX19jxI7P2MzoMYqA0Khfs=", + "lastModified": 1741823056, + "narHash": "sha256-/NUosorAbmRSwufdk/cY+8h//43gTNxk2W9cSulJ3pc=", "owner": "zed-industries", "repo": "zed", - "rev": "ed6bf7f161c6af6e10354faacb8b643a55c80b27", + "rev": "0081b816fecf59ae7351a14eb7249e600389d508", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ce5a76d..68607e9 100755 --- a/flake.nix +++ b/flake.nix @@ -98,7 +98,7 @@ deimos = inputs.self.lib.mkLinuxSystem [ ./systems/deimos ./profiles/user0 - ./profiles/user1 + # ./profiles/user1 config.nixosModules.deimos config.nixosModules.core config.nixosModules.mantle diff --git a/modules/home/default.nix b/modules/home/default.nix index fc04e1f..f8870f6 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -114,39 +114,65 @@ in inherit (modules) cli brave - emulators - firefox + floorp tor - code - gaming - media - messaging - sharing - tools - ; - }; - }; - "${deimos.name}-${user1}" = { - imports = builtins.attrValues { - inherit (modules) - cli - brave ghostty + prismLauncher + steam zed - gaming - spotify - docs - mpv + feishin + obsidian + libreOffice + okular + zathura kolourPaint - discord + imageViewing + obsStudio + daVinci + mpv + freetube + dissent + discordCanary + element signal - scrcpy + sharing bitwarden emote - desktop + flameshot + gnomeCalculator + scrcpy + systemMonitor + usbImager + virtManager + hypr + wayland + theming + polychromatic + dolphin ; }; }; + # "${deimos.name}-${user1}" = { + # imports = builtins.attrValues { + # inherit (modules) + # cli + # brave + # ghostty + # zed + # gaming + # spotify + # docs + # mpv + # kolourPaint + # discord + # signal + # scrcpy + # bitwarden + # emote + # desktop + # ; + # }; + # }; "${charon.name}-${user1}" = { imports = builtins.attrValues { inherit (modules) diff --git a/modules/home/gui/apps/media/docs/docViewing/zathura/default.nix b/modules/home/gui/apps/media/docs/docViewing/zathura/default.nix old mode 100644 new mode 100755 diff --git a/modules/home/gui/desktop/hypr/land/config/bind-user0.nix b/modules/home/gui/desktop/hypr/land/config/bind-user0.nix index 485a085..d00b8eb 100755 --- a/modules/home/gui/desktop/hypr/land/config/bind-user0.nix +++ b/modules/home/gui/desktop/hypr/land/config/bind-user0.nix @@ -24,8 +24,6 @@ let "5, workspace, 5" # Windows "Tab, killactive" - "O, splitratio, 0.33" - "F, splitratio, -0.33" # Window Focus "C, movefocus, l" "A, movefocus, u" @@ -45,6 +43,8 @@ let "A, movewindow, u" "E, movewindow, d" "I, movewindow, r" + "equal, splitratio, 0.33" + "minus, splitratio, -0.33" # Quick Action "T, exec, ghostty" "S, exec, flameshot gui" diff --git a/modules/home/gui/desktop/wayland/waybar/config/settings.nix b/modules/home/gui/desktop/wayland/waybar/config/settings.nix index 3cfdf12..295fd19 100755 --- a/modules/home/gui/desktop/wayland/waybar/config/settings.nix +++ b/modules/home/gui/desktop/wayland/waybar/config/settings.nix @@ -1,8 +1,13 @@ -{ flake, ... }: +{ flake, config, ... }: let inherit (flake.config.people) user0 + user1 + user2 ; + + user = config.home.username; + userConfig = flake.config.people.users.${user}; in { mainBar = { @@ -30,6 +35,7 @@ in "disk" "pulseaudio" # "network" + "battery" "clock" ]; @@ -153,12 +159,29 @@ in }; "custom/weather" = { - exec = "/home/${user0}/Files/Projects/dotfiles/modules/home/gui/desktop/wayland/waybar/config/scripts/get_weather.sh Winnipeg"; + exec = "/home/${user}/.config/scripts/get_weather.sh Winnipeg"; return-type = "json"; format = "{}"; tooltip = true; interval = 3600; }; + battery = { + format = "{icon} {capacity}%"; + format-alt = "{icon} {time}"; + format-charging = " {capacity}%"; + format-icons = [ + "" + "" + "" + "" + "" + ]; + format-plugged = " {capacity}%"; + states = { + critical = 15; + warning = 30; + }; + }; }; } # https://unicodes.jessetane.com/ diff --git a/modules/home/gui/desktop/wayland/waybar/config/style.nix b/modules/home/gui/desktop/wayland/waybar/config/style.nix index 60d8169..5ce2783 100755 --- a/modules/home/gui/desktop/wayland/waybar/config/style.nix +++ b/modules/home/gui/desktop/wayland/waybar/config/style.nix @@ -100,6 +100,12 @@ in #clock { } + #battery { + font-size: ${custom.font_size}; + color: #${custom.text_color}; + padding-right: 10px; + } + #custom-launcher { font-size: 20px; color: #${custom.text_color}; diff --git a/modules/home/gui/desktop/wayland/waybar/default.nix b/modules/home/gui/desktop/wayland/waybar/default.nix index 730ad7e..cf8371a 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 flake; }; + settingsPath = import (configPath + /settings.nix) { inherit config flake; }; stylePath = import (configPath + /style.nix) { inherit config flake; }; in { diff --git a/modules/home/gui/desktop/wayland/wpaperd/default.nix b/modules/home/gui/desktop/wayland/wpaperd/default.nix index 2b596f6..2968e9b 100755 --- a/modules/home/gui/desktop/wayland/wpaperd/default.nix +++ b/modules/home/gui/desktop/wayland/wpaperd/default.nix @@ -3,7 +3,7 @@ enable = true; settings = { "default" = { - path = "~/Files/Projects/dotfiles/modules/home/gui/desktop/wayland/wpaperd/wallpaper"; + path = "~/.config/wallpaper"; apply-shadow = true; duration = "1m"; sorting = "random"; diff --git a/modules/nixos/core/doas/default.nix b/modules/nixos/core/doas/default.nix index 7524240..4534d4a 100755 --- a/modules/nixos/core/doas/default.nix +++ b/modules/nixos/core/doas/default.nix @@ -1,4 +1,8 @@ -{ flake, config, ... }: +{ + flake, + config, + ... +}: let inherit (flake.config.people) user0 @@ -11,8 +15,25 @@ let hostname = config.networking.hostName; mars = devices.mars.name; ceres = devices.ceres.name; - venus = devices.venus.names; + venus = devices.venus.name; charon = devices.charon.name; + deimos = devices.deimos.name; + + userLogic = + if + builtins.elem hostname [ + mars + deimos + ceres + ] + then + user0 + else if hostname == charon then + user1 + else if hostname == venus then + user2 + else + ""; in { security = { @@ -23,18 +44,7 @@ in keepEnv = true; noPass = true; users = [ - ( - if hostname == mars then - user0 - else if hostname == ceres then - user0 - else if hostname == charon then - user1 - else if hostname == venus then - user2 - else - "" - ) + userLogic ]; } ]; diff --git a/modules/nixos/core/ssh/default.nix b/modules/nixos/core/ssh/default.nix index f505f1e..964030c 100755 --- a/modules/nixos/core/ssh/default.nix +++ b/modules/nixos/core/ssh/default.nix @@ -17,15 +17,22 @@ let ; hostname = config.networking.hostName; mars = devices.mars.name; + deimos = devices.deimos.name; ceres = devices.ceres.name; venus = devices.venus.name; charon = devices.charon.name; userLogic = - if hostname == mars then - user0 - else if hostname == ceres then + if + builtins.elem hostname [ + mars + deimos + ceres + ] + then user0 + else if hostname == charon then + user1 else if hostname == venus then user2 else diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 0f37717..991eebe 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -34,6 +34,8 @@ in inherit (modules) hypr wayland + # plasma + # sddm flatpak xserver ; diff --git a/modules/nixos/desktop/wayland/greetd/default.nix b/modules/nixos/desktop/wayland/greetd/default.nix index 0441d56..eea5335 100755 --- a/modules/nixos/desktop/wayland/greetd/default.nix +++ b/modules/nixos/desktop/wayland/greetd/default.nix @@ -7,7 +7,14 @@ let inherit (flake.config.people) user0 + user1 + user2 ; + inherit (flake.config.machines) devices; + venus = devices.venus.name; + charon = devices.charon.name; + + host = config.networking.hostName; in { services = { @@ -18,7 +25,13 @@ in let default_session = { command = "${lib.meta.getExe config.programs.hyprland.package}"; - user = user0; + user = + if host == charon then + user1 + else if host == venus then + user2 + else + user0; }; in { diff --git a/modules/nixos/desktop/wayland/regreet/default.nix b/modules/nixos/desktop/wayland/regreet/default.nix index a5351e6..7edcce6 100755 --- a/modules/nixos/desktop/wayland/regreet/default.nix +++ b/modules/nixos/desktop/wayland/regreet/default.nix @@ -11,7 +11,7 @@ let in { programs.regreet = { - enable = true; + enable = false; package = pkgs.greetd.regreet; # settings = { # appearance = { diff --git a/modules/nixos/sops/default.nix b/modules/nixos/sops/default.nix index 6ef123c..868a2a2 100755 --- a/modules/nixos/sops/default.nix +++ b/modules/nixos/sops/default.nix @@ -1,7 +1,12 @@ -{ flake, config, ... }: +{ + flake, + config, + ... +}: let inherit (flake.config.people) user0 + user1 user2 ; inherit (flake.config.machines) @@ -12,12 +17,19 @@ let ceres = devices.ceres.name; venus = devices.venus.name; charon = devices.charon.name; + deimos = devices.deimos.name; userLogic = - if hostname == mars then - user0 - else if hostname == ceres then + if + builtins.elem hostname [ + mars + deimos + ceres + ] + then user0 + else if hostname == charon then + user1 else if hostname == venus then user2 else diff --git a/profiles/user0/default.nix b/profiles/user0/default.nix index 33ba64f..03c09ba 100755 --- a/profiles/user0/default.nix +++ b/profiles/user0/default.nix @@ -62,6 +62,14 @@ in "./.config/vesktop/themes/macchiato-theme.css" = { source = ./files/themes/vesktop/macchiato-theme.css; }; + "./.config/scripts/get_weather.sh" = { + source = ./files/get_weather.sh; + executable = true; + }; + ".config/wallpaper" = { + source = ./files/wallpaper; + recursive = true; + }; }; sessionVariables = { VISUAL = lib.getExe pkgs.zed-editor; diff --git a/modules/home/gui/desktop/wayland/waybar/config/scripts/get_weather.sh b/profiles/user0/files/get_weather.sh similarity index 100% rename from modules/home/gui/desktop/wayland/waybar/config/scripts/get_weather.sh rename to profiles/user0/files/get_weather.sh diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg b/profiles/user0/files/wallpaper/FTDCMyaXoAEUn5h.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg rename to profiles/user0/files/wallpaper/FTDCMyaXoAEUn5h.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/cat-waves.png b/profiles/user0/files/wallpaper/cat-waves.png similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/cat-waves.png rename to profiles/user0/files/wallpaper/cat-waves.png diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/juliemao-1741428128332-6023.jpg b/profiles/user0/files/wallpaper/juliemao-1741428128332-6023.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/juliemao-1741428128332-6023.jpg rename to profiles/user0/files/wallpaper/juliemao-1741428128332-6023.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/pinksky.png b/profiles/user0/files/wallpaper/pinksky.png similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/pinksky.png rename to profiles/user0/files/wallpaper/pinksky.png diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/u6ne2q214dx71.jpg b/profiles/user0/files/wallpaper/u6ne2q214dx71.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/u6ne2q214dx71.jpg rename to profiles/user0/files/wallpaper/u6ne2q214dx71.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-0wj757.jpg b/profiles/user0/files/wallpaper/wallhaven-0wj757.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-0wj757.jpg rename to profiles/user0/files/wallpaper/wallhaven-0wj757.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-2ege2g.jpg b/profiles/user0/files/wallpaper/wallhaven-2ege2g.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-2ege2g.jpg rename to profiles/user0/files/wallpaper/wallhaven-2ege2g.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4dj2qo.png b/profiles/user0/files/wallpaper/wallhaven-4dj2qo.png similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4dj2qo.png rename to profiles/user0/files/wallpaper/wallhaven-4dj2qo.png diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4xq6vv.png b/profiles/user0/files/wallpaper/wallhaven-4xq6vv.png similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4xq6vv.png rename to profiles/user0/files/wallpaper/wallhaven-4xq6vv.png diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-5dyvy3.jpg b/profiles/user0/files/wallpaper/wallhaven-5dyvy3.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-5dyvy3.jpg rename to profiles/user0/files/wallpaper/wallhaven-5dyvy3.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-735xv3.jpg b/profiles/user0/files/wallpaper/wallhaven-735xv3.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-735xv3.jpg rename to profiles/user0/files/wallpaper/wallhaven-735xv3.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-8xe25y.jpg b/profiles/user0/files/wallpaper/wallhaven-8xe25y.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-8xe25y.jpg rename to profiles/user0/files/wallpaper/wallhaven-8xe25y.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-eyrj7o.jpg b/profiles/user0/files/wallpaper/wallhaven-eyrj7o.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-eyrj7o.jpg rename to profiles/user0/files/wallpaper/wallhaven-eyrj7o.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-g8ky73.jpg b/profiles/user0/files/wallpaper/wallhaven-g8ky73.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-g8ky73.jpg rename to profiles/user0/files/wallpaper/wallhaven-g8ky73.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-j8wzvp.jpg b/profiles/user0/files/wallpaper/wallhaven-j8wzvp.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-j8wzvp.jpg rename to profiles/user0/files/wallpaper/wallhaven-j8wzvp.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nekxjk.png b/profiles/user0/files/wallpaper/wallhaven-nekxjk.png similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nekxjk.png rename to profiles/user0/files/wallpaper/wallhaven-nekxjk.png diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nryz87.jpg b/profiles/user0/files/wallpaper/wallhaven-nryz87.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nryz87.jpg rename to profiles/user0/files/wallpaper/wallhaven-nryz87.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-r7yey1.jpg b/profiles/user0/files/wallpaper/wallhaven-r7yey1.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-r7yey1.jpg rename to profiles/user0/files/wallpaper/wallhaven-r7yey1.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vge32m.jpg b/profiles/user0/files/wallpaper/wallhaven-vge32m.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vge32m.jpg rename to profiles/user0/files/wallpaper/wallhaven-vge32m.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vgxgem.jpg b/profiles/user0/files/wallpaper/wallhaven-vgxgem.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vgxgem.jpg rename to profiles/user0/files/wallpaper/wallhaven-vgxgem.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (1).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (1).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (10).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (10).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (11).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (11).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (12).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (12).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (13).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (13).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (14).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (14).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (15).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (15).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (16).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (16).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (17).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (17).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (19).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (19).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (2).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (2).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (20).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (20).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (21).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (21).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (22).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (22).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (23).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (23).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (24).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (24).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (26).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (26).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (27).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (27).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (28).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (28).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (29).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (29).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (3).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (3).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (30).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (30).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (31).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (31).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (32).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (32).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (34).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (34).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (35).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (35).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (37).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (37).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (38).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (38).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (4).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (4).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (5).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (5).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (6).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (6).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (7).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (7).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (8).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (8).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (9).jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper (9).jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg b/profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper.jpg similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg rename to profiles/user0/files/wallpaper/wallpaperflare.com_wallpaper.jpg diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/yrTphE7NymvE-bSD.mp4 b/profiles/user0/files/wallpaper/yrTphE7NymvE-bSD.mp4 similarity index 100% rename from modules/home/gui/desktop/wayland/wpaperd/wallpaper/yrTphE7NymvE-bSD.mp4 rename to profiles/user0/files/wallpaper/yrTphE7NymvE-bSD.mp4 diff --git a/profiles/user1/default.nix b/profiles/user1/default.nix index 2e7afcd..c75cd5f 100755 --- a/profiles/user1/default.nix +++ b/profiles/user1/default.nix @@ -38,6 +38,14 @@ in "./justfile" = { source = ./files/justfile; }; + "./.config/scripts/get_weather.sh" = { + source = ./files/get_weather.sh; + executable = true; + }; + ".config/wallpaper" = { + source = ./files/wallpaper; + recursive = true; + }; }; sessionVariables = { }; }; diff --git a/profiles/user1/files/get_weather.sh b/profiles/user1/files/get_weather.sh new file mode 100755 index 0000000..2aee731 --- /dev/null +++ b/profiles/user1/files/get_weather.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +for i in {1..5} +do + text=$(curl -s "https://wttr.in/$1?format=1") + if [[ $? == 0 ]] + then + text=$(echo "$text" | sed -E "s/\s+/ /g") + tooltip=$(curl -s "https://wttr.in/$1?format=4") + if [[ $? == 0 ]] + then + tooltip=$(echo "$tooltip" | sed -E "s/\s+/ /g") + echo "{\"text\":\"$text\", \"tooltip\":\"$tooltip\"}" + exit + fi + fi + sleep 2 +done +echo "{\"text\":\"error\", \"tooltip\":\"error\"}" \ No newline at end of file diff --git a/systems/deimos/config/filesystem.nix b/systems/deimos/config/filesystem.nix index b8d6cc1..4f02ba9 100755 --- a/systems/deimos/config/filesystem.nix +++ b/systems/deimos/config/filesystem.nix @@ -75,7 +75,7 @@ in systemd.tmpfiles.rules = [ "Z ${config.home-manager.users.${user0}.home.homeDirectory} 0755 ${user0} users -" - "Z ${config.home-manager.users.${user1}.home.homeDirectory} 0755 ${user1} users -" + # "Z ${config.home-manager.users.${user1}.home.homeDirectory} 0755 ${user1} users -" ]; services.udisks2.enable = true;