diff --git a/flake.nix b/flake.nix index ce5a76d..6b73805 100755 --- a/flake.nix +++ b/flake.nix @@ -74,6 +74,7 @@ ./systems/mars ./profiles/user0 ./profiles/user1 + ./profiles/user3 config.nixosModules.mars config.nixosModules.core config.nixosModules.mantle @@ -99,6 +100,7 @@ ./systems/deimos ./profiles/user0 ./profiles/user1 + ./profiles/user2 config.nixosModules.deimos config.nixosModules.core config.nixosModules.mantle diff --git a/modules/config/devices/config/synology.nix b/modules/config/devices/config/synology.nix index a704f92..b1f21b1 100755 --- a/modules/config/devices/config/synology.nix +++ b/modules/config/devices/config/synology.nix @@ -4,13 +4,16 @@ let sambaPermissions userIdForUser0 userIdForUser1 + userIdForUser3 synologyIP ; user0 = "nick"; user1 = "garnet"; + user3 = "streaming"; user0Name = "Nick"; user1Name = "Garnet"; + user3Name = "Streaming"; synologyName = "synology"; in { @@ -41,4 +44,10 @@ in device = "//${synologyIP}/homes/${user1Name}/Minecraft"; options = sambaPermissions ++ userIdForUser1; }; + # Streaming Folder + folder3 = { + mount = "/mnt/media/${synologyName}/${user3}"; + device = "//${synologyIP}/homes/${user0Name}"; + options = sambaPermissions ++ userIdForUser3; + }; } diff --git a/modules/config/devices/default.nix b/modules/config/devices/default.nix index b39f772..b1bdf85 100755 --- a/modules/config/devices/default.nix +++ b/modules/config/devices/default.nix @@ -31,6 +31,9 @@ let userIdForUser1 = [ "uid=1001" ]; + userIdForUser3 = [ + "uid=1002" + ]; dummy = [ ]; ceresIP = "192.168.50.140"; diff --git a/modules/config/users/config/user3.nix b/modules/config/users/config/user3.nix new file mode 100755 index 0000000..c3bba16 --- /dev/null +++ b/modules/config/users/config/user3.nix @@ -0,0 +1,20 @@ +{ user3 }: +let + inherit + user3 + ; +in +{ + name = "Streaming"; + aliases = { + }; + email = { + address0 = "nick@upRootNutrition.com"; + }; + paths = { + path0 = "/home/${user3}/Files/Projects"; # Git path + }; + sshKeys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBF9TmImDoYDpsW5VMFbOcuK3aH4TWRtx/xGxT3yUtEN nick@desktop" + ]; +} diff --git a/modules/config/users/default.nix b/modules/config/users/default.nix index 4ce7721..60996ff 100755 --- a/modules/config/users/default.nix +++ b/modules/config/users/default.nix @@ -4,16 +4,19 @@ let user0 = "nick"; user1 = "garnet"; user2 = "fallaryn"; + user3 = "streaming"; in { inherit user0 user1 user2 + user3 ; users = { "${user0}" = import (configPath + /user0.nix) { inherit user0; }; "${user1}" = import (configPath + /user1.nix) { inherit user1; }; "${user2}" = import (configPath + /user2.nix) { inherit user2; }; + "${user3}" = import (configPath + /user3.nix) { inherit user3; }; }; } diff --git a/modules/home/cli/development/tooling/elm/default.nix b/modules/home/cli/development/tooling/elm/default.nix index dc3676c..f114fe0 100755 --- a/modules/home/cli/development/tooling/elm/default.nix +++ b/modules/home/cli/development/tooling/elm/default.nix @@ -5,12 +5,12 @@ { home.packages = builtins.attrValues { inherit (pkgs.elmPackages) - # elm - # elm-format - # elm-land - # elm-language-server - # elm-review - # elm-test + elm + elm-format + elm-land + elm-language-server + elm-review + elm-test ; }; } diff --git a/modules/home/default.nix b/modules/home/default.nix index 9eef091..6a13da2 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -13,7 +13,12 @@ in deimos ceres ; - inherit (config.people) user0 user1 user2; + inherit (config.people) + user0 + user1 + user2 + user3 + ; in { "${mars.name}-${user0}" = { @@ -35,7 +40,6 @@ in zathura kolourPaint imageViewing - obsStudio daVinci mpv freetube @@ -53,8 +57,8 @@ in systemMonitor usbImager virtManager - hypr - wayland + # hypr + # wayland theming polychromatic dolphin @@ -82,6 +86,30 @@ in ; }; }; + "${mars.name}-${user3}" = { + imports = builtins.attrValues { + inherit (modules) + cli + floorp + ghostty + steam + zed + obsidian + okular + kolourPaint + imageViewing + obsStudio + mpv + freetube + vesktop + bitwarden + emote + flameshot + gnomeCalculator + theming + ; + }; + }; "${venus.name}-${user2}" = { imports = builtins.attrValues { inherit (modules) @@ -177,6 +205,27 @@ in theming ; }; + }; + "${deimos.name}-${user2}" = { + imports = builtins.attrValues { + inherit (modules) + cli + firefox + brave + code + ghostty + gaming + spotify + wpsOffice + obsidian + okular + images + videoPlaying + discord + signal + tools + ; + }; }; "${charon.name}-${user1}" = { imports = builtins.attrValues { diff --git a/modules/home/gui/apps/code/vsCode/config/userSettings.nix b/modules/home/gui/apps/code/vsCode/config/userSettings.nix index a699e01..e34977f 100755 --- a/modules/home/gui/apps/code/vsCode/config/userSettings.nix +++ b/modules/home/gui/apps/code/vsCode/config/userSettings.nix @@ -32,6 +32,9 @@ in "elmLS.disableElmLSDiagnostics" = true; "elmLS.elmReviewDiagnostics" = "warning"; "elmLS.elmReviewPath" = - "/nix/store/ms3g9cnwjhd1adccxar3vxy1gj98zsba-elm-review-2.12.0/bin/elm-review"; + "/nix/store/r19y19rx5b7l4dzapbx1g64d30yisby1-elm-review-2.10.3/bin/elm-review"; "editor.formatOnSave" = true; + "[elm]" = { + "editor.defaultFormatter" = "elmTooling.elm-ls-vscode"; + }; } diff --git a/modules/home/gui/apps/code/zed/config/extraPackages/default.nix b/modules/home/gui/apps/code/zed/config/extraPackages/default.nix index c317967..f64797c 100755 --- a/modules/home/gui/apps/code/zed/config/extraPackages/default.nix +++ b/modules/home/gui/apps/code/zed/config/extraPackages/default.nix @@ -7,4 +7,7 @@ builtins.attrValues { wl-clipboard-rs xsel ; + inherit (pkgs.elmPackages) + elm-language-server + ; } diff --git a/modules/home/gui/apps/code/zed/config/userSettings/config/languages/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/config/languages/default.nix index d364129..45a6041 100755 --- a/modules/home/gui/apps/code/zed/config/userSettings/config/languages/default.nix +++ b/modules/home/gui/apps/code/zed/config/userSettings/config/languages/default.nix @@ -35,4 +35,13 @@ }; }; }; + "Elm" = { + language_servers = [ "elm-language-server" ]; + format_on_save = { + external = { + command = "elm-review"; + arguments = [ "--stdin" ]; + }; + }; + }; } diff --git a/modules/home/gui/apps/emulators/ghostty/config/settings.nix b/modules/home/gui/apps/emulators/ghostty/config/settings.nix index 4ca9e05..ff9320a 100755 --- a/modules/home/gui/apps/emulators/ghostty/config/settings.nix +++ b/modules/home/gui/apps/emulators/ghostty/config/settings.nix @@ -6,12 +6,10 @@ }: let inherit (flake.config.aesthetics.themes) fonts; - inherit (flake.config.machines.devices) deimos; - hostname = osConfig.networking.hostName; in { confirm-close-surface = false; - window-decoration = if hostname == deimos.name then true else false; + window-decoration = true; font-size = fonts.sizes.terminal.size0; font-family = fonts.names.name0; window-padding-x = 10; diff --git a/modules/home/gui/apps/media/video/videoEditing/obsStudio/default.nix b/modules/home/gui/apps/media/video/videoEditing/obsStudio/default.nix index 98f31d1..bf591ce 100755 --- a/modules/home/gui/apps/media/video/videoEditing/obsStudio/default.nix +++ b/modules/home/gui/apps/media/video/videoEditing/obsStudio/default.nix @@ -5,9 +5,11 @@ enable = true; plugins = builtins.attrValues { inherit (pkgs.obs-studio-plugins) + wlrobs obs-tuna obs-vkcapture obs-multi-rtmp + obs-webkitgtk ; }; }; diff --git a/modules/nixos/core/doas/default.nix b/modules/nixos/core/doas/default.nix index 2b0cc03..bcfb6aa 100755 --- a/modules/nixos/core/doas/default.nix +++ b/modules/nixos/core/doas/default.nix @@ -8,6 +8,7 @@ let user0 user1 user2 + user3 ; inherit (flake.config.machines) devices @@ -30,6 +31,7 @@ let [ user0 user1 + user3 ] else if hostname == charon then [ user1 ] diff --git a/modules/nixos/core/homeManager/default.nix b/modules/nixos/core/homeManager/default.nix index e460ee5..4c05c86 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 = "backup3"; + backupFileExtension = "backup5"; extraSpecialArgs = { inherit flake diff --git a/modules/nixos/core/ssh/default.nix b/modules/nixos/core/ssh/default.nix index 964030c..4544958 100755 --- a/modules/nixos/core/ssh/default.nix +++ b/modules/nixos/core/ssh/default.nix @@ -8,9 +8,7 @@ let user0 user1 user2 - ; - inherit (flake.config.people.users.${userLogic}) - sshKeys + user3 ; inherit (flake.config.machines) devices @@ -22,30 +20,39 @@ let venus = devices.venus.name; charon = devices.charon.name; - userLogic = - if - builtins.elem hostname [ - mars - deimos - ceres - ] - then - user0 - else if hostname == charon then - user1 - else if hostname == venus then - user2 - else - ""; + # Helper function to get SSH keys for a specific user + getUserKeys = user: flake.config.people.users.${user}.sshKeys; in { users.users = if hostname == charon then { } - else + else if hostname == mars then { - ${userLogic} = { - openssh.authorizedKeys.keys = sshKeys; + ${user0} = { + openssh.authorizedKeys.keys = getUserKeys user0; }; - }; + ${user3} = { + openssh.authorizedKeys.keys = getUserKeys user3; + }; + } + else if + builtins.elem hostname [ + deimos + ceres + ] + then + { + ${user0} = { + openssh.authorizedKeys.keys = getUserKeys user0; + }; + } + else if hostname == venus then + { + ${user2} = { + openssh.authorizedKeys.keys = getUserKeys user2; + }; + } + else + { }; } diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index cd5ae03..3d0b078 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -10,11 +10,13 @@ in mullvad syncthing ollama - hypr + # hypr searx - wayland + portals xserver flatpak + plasma + sddm ; }; }; diff --git a/modules/nixos/desktop/wayland/wayland/default.nix b/modules/nixos/desktop/wayland/portals/default.nix similarity index 91% rename from modules/nixos/desktop/wayland/wayland/default.nix rename to modules/nixos/desktop/wayland/portals/default.nix index 2c6f2e4..658ef52 100755 --- a/modules/nixos/desktop/wayland/wayland/default.nix +++ b/modules/nixos/desktop/wayland/portals/default.nix @@ -6,6 +6,7 @@ portal = { enable = true; wlr.enable = true; + config.common.default = "*"; xdgOpenUsePortal = true; extraPortals = builtins.attrValues { inherit (pkgs) diff --git a/modules/nixos/hardware/razer/default.nix b/modules/nixos/hardware/razer/default.nix index a41b567..2feafa1 100755 --- a/modules/nixos/hardware/razer/default.nix +++ b/modules/nixos/hardware/razer/default.nix @@ -1,3 +1,3 @@ { - hardware.openrazer.enable = true; + hardware.openrazer.enable = false; } diff --git a/modules/nixos/services/mastodon/default.nix b/modules/nixos/services/mastodon/default.nix index 655a6f6..62da572 100755 --- a/modules/nixos/services/mastodon/default.nix +++ b/modules/nixos/services/mastodon/default.nix @@ -26,15 +26,17 @@ in # sudo mastodon-tootctl accounts modify username --remove-role # nixpkgs.overlays = [ - # (final: prev: { - # mastodon = prev.mastodon.overrideAttrs (oldAttrs: { - # postPatch = - # (oldAttrs.postPatch or "") - # + '' - # patch -p1 < ${./config/chars.patch} - # ''; - # }); - # }) + # ( + # final: prev: { + # mastodon = prev.mastodon.overrideAttrs (oldAttrs: { + # postPatch = + # (oldAttrs.postPatch or "") + # + '' + # patch -p1 < ${./chars.patch} + # ''; + # }); + # } + # ) # ]; services = { @@ -53,7 +55,7 @@ in passwordFile = config.sops.secrets.mastodon-database.path; }; extraConfig = { - SINGLE_USER_MODE = "false"; + SINGLE_USER_MODE = "true"; SMTP_AUTH_METHOD = "plain"; SMTP_DELIVERY_METHOD = "smtp"; SMTP_ENABLE_STARTTLS_AUTO = "true"; diff --git a/modules/nixos/sops/default.nix b/modules/nixos/sops/default.nix index 868a2a2..5a741db 100755 --- a/modules/nixos/sops/default.nix +++ b/modules/nixos/sops/default.nix @@ -8,6 +8,7 @@ let user0 user1 user2 + user3 ; inherit (flake.config.machines) devices diff --git a/profiles/user3/default.nix b/profiles/user3/default.nix new file mode 100755 index 0000000..c9cdc1e --- /dev/null +++ b/profiles/user3/default.nix @@ -0,0 +1,91 @@ +{ + config, + flake, + pkgs, + lib, + ... +}: +let + inherit (flake) self; + inherit (flake.config.people) user3; + inherit (flake.config.machines) devices; + inherit (flake.config.people.users.${user3}) name paths; + hostname = config.networking.hostName; +in +{ + users = { + users.${user3} = { + description = name; + name = user3; + isNormalUser = true; + shell = pkgs.nushell; + extraGroups = [ + "adbusers" + "disk" + "libvirtd" + "netdev" + "networkmanager" + "plugdev" + "samba" + "vboxusers" + "wheel" + ]; + }; + }; + home-manager.users = { + ${user3} = { + home = { + username = user3; + homeDirectory = "/home/${user3}"; + file = { + "./.config/scripts/get_weather.sh" = { + source = ./files/get_weather.sh; + executable = true; + }; + ".config/wallpaper" = { + source = ./files/wallpaper; + recursive = true; + }; + "./.config/vesktop/themes/macchiato-theme.css" = { + source = ./files/themes/vesktop/macchiato-theme.css; + }; + }; + sessionVariables = { + VISUAL = lib.getExe pkgs.zed-editor; + GTK_THEME = "catppuccin-macchiato-mauve-compact"; + }; + }; + imports = [ + { + home.stateVersion = config.system.stateVersion; + } + { + imports = [ + self.homeModules."${devices.${hostname}.name}-${user3}" + ]; + } + ]; + }; + }; + systemd.tmpfiles = { + rules = + [ + "d ${paths.path0} 0755 ${user3} users -" + ] + ++ (map (path: "d /home/${user3}/${path} 0755 ${user3} users -") [ + "Files" + "Files/Scripts" + "Files/Games" + "Files/Screenshots" + ]) + ++ (map (path: "R /home/${user3}/${path} 0755 ${user3} users - -") [ + "Desktop" + "Documents" + "Music" + "Pictures" + "Public" + "Templates" + "Videos" + ]); + }; +} diff --git a/profiles/user3/files/get_weather.sh b/profiles/user3/files/get_weather.sh new file mode 100755 index 0000000..2aee731 --- /dev/null +++ b/profiles/user3/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/profiles/user3/files/themes/vesktop/macchiato-theme.css b/profiles/user3/files/themes/vesktop/macchiato-theme.css new file mode 100755 index 0000000..d953df2 --- /dev/null +++ b/profiles/user3/files/themes/vesktop/macchiato-theme.css @@ -0,0 +1 @@ +@import url("https://catppuccin.github.io/discord/dist/catppuccin-macchiato.theme.css"); \ No newline at end of file diff --git a/profiles/user3/files/wallpaper/7yKtaRij2giAj0s09F6gmB8XIje.jpg b/profiles/user3/files/wallpaper/7yKtaRij2giAj0s09F6gmB8XIje.jpg new file mode 100755 index 0000000..da57bcf Binary files /dev/null and b/profiles/user3/files/wallpaper/7yKtaRij2giAj0s09F6gmB8XIje.jpg differ diff --git a/profiles/user3/files/wallpaper/FTDCMyaXoAEUn5h.jpg b/profiles/user3/files/wallpaper/FTDCMyaXoAEUn5h.jpg new file mode 100755 index 0000000..5a4caf1 Binary files /dev/null and b/profiles/user3/files/wallpaper/FTDCMyaXoAEUn5h.jpg differ diff --git a/profiles/user3/files/wallpaper/cat-waves.png b/profiles/user3/files/wallpaper/cat-waves.png new file mode 100755 index 0000000..ded59d8 Binary files /dev/null and b/profiles/user3/files/wallpaper/cat-waves.png differ diff --git a/profiles/user3/files/wallpaper/juliemao-1741428128332-6023.jpg b/profiles/user3/files/wallpaper/juliemao-1741428128332-6023.jpg new file mode 100755 index 0000000..af0dc4d Binary files /dev/null and b/profiles/user3/files/wallpaper/juliemao-1741428128332-6023.jpg differ diff --git a/profiles/user3/files/wallpaper/pinksky.png b/profiles/user3/files/wallpaper/pinksky.png new file mode 100755 index 0000000..9565c67 Binary files /dev/null and b/profiles/user3/files/wallpaper/pinksky.png differ diff --git a/profiles/user3/files/wallpaper/u6ne2q214dx71.jpg b/profiles/user3/files/wallpaper/u6ne2q214dx71.jpg new file mode 100755 index 0000000..58ee466 Binary files /dev/null and b/profiles/user3/files/wallpaper/u6ne2q214dx71.jpg differ diff --git a/profiles/user3/files/wallpaper/wallhaven-0wj757.jpg b/profiles/user3/files/wallpaper/wallhaven-0wj757.jpg new file mode 100755 index 0000000..ffc6074 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallhaven-0wj757.jpg differ diff --git a/profiles/user3/files/wallpaper/wallhaven-2ege2g.jpg b/profiles/user3/files/wallpaper/wallhaven-2ege2g.jpg new file mode 100755 index 0000000..ce08958 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallhaven-2ege2g.jpg differ diff --git a/profiles/user3/files/wallpaper/wallhaven-4dj2qo.png b/profiles/user3/files/wallpaper/wallhaven-4dj2qo.png new file mode 100755 index 0000000..395be5c Binary files /dev/null and b/profiles/user3/files/wallpaper/wallhaven-4dj2qo.png differ diff --git a/profiles/user3/files/wallpaper/wallhaven-4xq6vv.png b/profiles/user3/files/wallpaper/wallhaven-4xq6vv.png new file mode 100755 index 0000000..1b27934 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallhaven-4xq6vv.png differ diff --git a/profiles/user3/files/wallpaper/wallhaven-5dyvy3.jpg b/profiles/user3/files/wallpaper/wallhaven-5dyvy3.jpg new file mode 100755 index 0000000..4ea09fd Binary files /dev/null and b/profiles/user3/files/wallpaper/wallhaven-5dyvy3.jpg differ diff --git a/profiles/user3/files/wallpaper/wallhaven-735xv3.jpg b/profiles/user3/files/wallpaper/wallhaven-735xv3.jpg new file mode 100755 index 0000000..804454c Binary files /dev/null and b/profiles/user3/files/wallpaper/wallhaven-735xv3.jpg differ diff --git a/profiles/user3/files/wallpaper/wallhaven-8xe25y.jpg b/profiles/user3/files/wallpaper/wallhaven-8xe25y.jpg new file mode 100755 index 0000000..b483a4c Binary files /dev/null and b/profiles/user3/files/wallpaper/wallhaven-8xe25y.jpg differ diff --git a/profiles/user3/files/wallpaper/wallhaven-eyrj7o.jpg b/profiles/user3/files/wallpaper/wallhaven-eyrj7o.jpg new file mode 100755 index 0000000..011111a Binary files /dev/null and b/profiles/user3/files/wallpaper/wallhaven-eyrj7o.jpg differ diff --git a/profiles/user3/files/wallpaper/wallhaven-g8ky73.jpg b/profiles/user3/files/wallpaper/wallhaven-g8ky73.jpg new file mode 100755 index 0000000..f10d23b Binary files /dev/null and b/profiles/user3/files/wallpaper/wallhaven-g8ky73.jpg differ diff --git a/profiles/user3/files/wallpaper/wallhaven-j8wzvp.jpg b/profiles/user3/files/wallpaper/wallhaven-j8wzvp.jpg new file mode 100755 index 0000000..667e5db Binary files /dev/null and b/profiles/user3/files/wallpaper/wallhaven-j8wzvp.jpg differ diff --git a/profiles/user3/files/wallpaper/wallhaven-nekxjk.png b/profiles/user3/files/wallpaper/wallhaven-nekxjk.png new file mode 100755 index 0000000..d30c308 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallhaven-nekxjk.png differ diff --git a/profiles/user3/files/wallpaper/wallhaven-nryz87.jpg b/profiles/user3/files/wallpaper/wallhaven-nryz87.jpg new file mode 100755 index 0000000..6454932 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallhaven-nryz87.jpg differ diff --git a/profiles/user3/files/wallpaper/wallhaven-r7yey1.jpg b/profiles/user3/files/wallpaper/wallhaven-r7yey1.jpg new file mode 100755 index 0000000..6a2754d Binary files /dev/null and b/profiles/user3/files/wallpaper/wallhaven-r7yey1.jpg differ diff --git a/profiles/user3/files/wallpaper/wallhaven-vge32m.jpg b/profiles/user3/files/wallpaper/wallhaven-vge32m.jpg new file mode 100755 index 0000000..aba50bd Binary files /dev/null and b/profiles/user3/files/wallpaper/wallhaven-vge32m.jpg differ diff --git a/profiles/user3/files/wallpaper/wallhaven-vgxgem.jpg b/profiles/user3/files/wallpaper/wallhaven-vgxgem.jpg new file mode 100755 index 0000000..07c0e88 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallhaven-vgxgem.jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (1).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (1).jpg new file mode 100755 index 0000000..789c456 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (1).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (10).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (10).jpg new file mode 100755 index 0000000..b8dc444 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (10).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (11).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (11).jpg new file mode 100755 index 0000000..6e3d274 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (11).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (12).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (12).jpg new file mode 100755 index 0000000..9d03fd8 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (12).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (13).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (13).jpg new file mode 100755 index 0000000..7de6f45 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (13).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (14).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (14).jpg new file mode 100755 index 0000000..b860fc8 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (14).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (15).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (15).jpg new file mode 100755 index 0000000..742fb5f Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (15).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (16).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (16).jpg new file mode 100755 index 0000000..2f9fead Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (16).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (17).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (17).jpg new file mode 100755 index 0000000..65c5a89 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (17).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (19).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (19).jpg new file mode 100755 index 0000000..d284003 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (19).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (2).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (2).jpg new file mode 100755 index 0000000..419cdb6 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (2).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (20).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (20).jpg new file mode 100755 index 0000000..0cda78a Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (20).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (21).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (21).jpg new file mode 100755 index 0000000..c9a36ac Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (21).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (22).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (22).jpg new file mode 100755 index 0000000..625826c Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (22).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (23).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (23).jpg new file mode 100755 index 0000000..571de4c Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (23).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (24).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (24).jpg new file mode 100755 index 0000000..e7f5f67 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (24).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (26).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (26).jpg new file mode 100755 index 0000000..32c914a Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (26).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (27).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (27).jpg new file mode 100755 index 0000000..bc28661 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (27).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (28).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (28).jpg new file mode 100755 index 0000000..c0d943f Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (28).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (29).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (29).jpg new file mode 100755 index 0000000..4e960b2 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (29).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (3).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (3).jpg new file mode 100755 index 0000000..bb8041d Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (3).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (30).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (30).jpg new file mode 100755 index 0000000..257f324 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (30).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (31).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (31).jpg new file mode 100755 index 0000000..26a8dea Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (31).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (32).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (32).jpg new file mode 100755 index 0000000..b689877 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (32).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (34).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (34).jpg new file mode 100755 index 0000000..42440d5 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (34).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (35).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (35).jpg new file mode 100755 index 0000000..54a143b Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (35).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (37).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (37).jpg new file mode 100755 index 0000000..2317225 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (37).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (38).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (38).jpg new file mode 100755 index 0000000..937fcf5 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (38).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (4).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (4).jpg new file mode 100755 index 0000000..3714ec7 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (4).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (5).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (5).jpg new file mode 100755 index 0000000..7ad7ef4 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (5).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (6).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (6).jpg new file mode 100755 index 0000000..e280f63 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (6).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (7).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (7).jpg new file mode 100755 index 0000000..6952e52 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (7).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (8).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (8).jpg new file mode 100755 index 0000000..b58c9fd Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (8).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (9).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (9).jpg new file mode 100755 index 0000000..338ea49 Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (9).jpg differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper.jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper.jpg new file mode 100755 index 0000000..e08dc6e Binary files /dev/null and b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper.jpg differ diff --git a/profiles/user3/files/wallpaper/yrTphE7NymvE-bSD.mp4 b/profiles/user3/files/wallpaper/yrTphE7NymvE-bSD.mp4 new file mode 100755 index 0000000..b23b561 Binary files /dev/null and b/profiles/user3/files/wallpaper/yrTphE7NymvE-bSD.mp4 differ diff --git a/systems/mars/config/filesystem.nix b/systems/mars/config/filesystem.nix index 4e6dcf2..d6c0475 100755 --- a/systems/mars/config/filesystem.nix +++ b/systems/mars/config/filesystem.nix @@ -4,20 +4,9 @@ ... }: let - inherit (flake.config.people) - user0 - user1 - ; - inherit (flake.config.machines.devices) - mars - ceres - synology - ; - inherit (flake.config.services.instances) - samba - jellyfin - audiobookshelf - ; + inherit (flake.config.people) user0 user1 user3; + inherit (flake.config.machines.devices) mars ceres synology; + inherit (flake.config.services.instances) samba jellyfin audiobookshelf; synologySecrets = config.sops.secrets."network/synology".path; ceresSecrets = config.sops.secrets."network/server".path; in @@ -28,6 +17,7 @@ in "folder0" "folder1" "folder2" + "folder3" ]; storageDrives = [ @@ -99,6 +89,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.${user3}.home.homeDirectory} 0755 ${user3} users -" "Z ${mars.storage0.mount} 0755 ${user0} users -" "Z ${mars.storage1.mount} 0755 ${user0} users -" ];