diff --git a/flake.nix b/flake.nix index 6b73805..ce5a76d 100755 --- a/flake.nix +++ b/flake.nix @@ -74,7 +74,6 @@ ./systems/mars ./profiles/user0 ./profiles/user1 - ./profiles/user3 config.nixosModules.mars config.nixosModules.core config.nixosModules.mantle @@ -100,7 +99,6 @@ ./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 b1f21b1..a704f92 100755 --- a/modules/config/devices/config/synology.nix +++ b/modules/config/devices/config/synology.nix @@ -4,16 +4,13 @@ let sambaPermissions userIdForUser0 userIdForUser1 - userIdForUser3 synologyIP ; user0 = "nick"; user1 = "garnet"; - user3 = "streaming"; user0Name = "Nick"; user1Name = "Garnet"; - user3Name = "Streaming"; synologyName = "synology"; in { @@ -44,10 +41,4 @@ 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 b1bdf85..b39f772 100755 --- a/modules/config/devices/default.nix +++ b/modules/config/devices/default.nix @@ -31,9 +31,6 @@ 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 deleted file mode 100755 index c3bba16..0000000 --- a/modules/config/users/config/user3.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ 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 60996ff..4ce7721 100755 --- a/modules/config/users/default.nix +++ b/modules/config/users/default.nix @@ -4,19 +4,16 @@ 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 f114fe0..dc3676c 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 6a13da2..9eef091 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -13,12 +13,7 @@ in deimos ceres ; - inherit (config.people) - user0 - user1 - user2 - user3 - ; + inherit (config.people) user0 user1 user2; in { "${mars.name}-${user0}" = { @@ -40,6 +35,7 @@ in zathura kolourPaint imageViewing + obsStudio daVinci mpv freetube @@ -57,8 +53,8 @@ in systemMonitor usbImager virtManager - # hypr - # wayland + hypr + wayland theming polychromatic dolphin @@ -86,30 +82,6 @@ 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) @@ -205,27 +177,6 @@ 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 e34977f..a699e01 100755 --- a/modules/home/gui/apps/code/vsCode/config/userSettings.nix +++ b/modules/home/gui/apps/code/vsCode/config/userSettings.nix @@ -32,9 +32,6 @@ in "elmLS.disableElmLSDiagnostics" = true; "elmLS.elmReviewDiagnostics" = "warning"; "elmLS.elmReviewPath" = - "/nix/store/r19y19rx5b7l4dzapbx1g64d30yisby1-elm-review-2.10.3/bin/elm-review"; + "/nix/store/ms3g9cnwjhd1adccxar3vxy1gj98zsba-elm-review-2.12.0/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 f64797c..c317967 100755 --- a/modules/home/gui/apps/code/zed/config/extraPackages/default.nix +++ b/modules/home/gui/apps/code/zed/config/extraPackages/default.nix @@ -7,7 +7,4 @@ 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 45a6041..d364129 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,13 +35,4 @@ }; }; }; - "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 ff9320a..4ca9e05 100755 --- a/modules/home/gui/apps/emulators/ghostty/config/settings.nix +++ b/modules/home/gui/apps/emulators/ghostty/config/settings.nix @@ -6,10 +6,12 @@ }: let inherit (flake.config.aesthetics.themes) fonts; + inherit (flake.config.machines.devices) deimos; + hostname = osConfig.networking.hostName; in { confirm-close-surface = false; - window-decoration = true; + window-decoration = if hostname == deimos.name then true else false; 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 bf591ce..98f31d1 100755 --- a/modules/home/gui/apps/media/video/videoEditing/obsStudio/default.nix +++ b/modules/home/gui/apps/media/video/videoEditing/obsStudio/default.nix @@ -5,11 +5,9 @@ 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 bcfb6aa..2b0cc03 100755 --- a/modules/nixos/core/doas/default.nix +++ b/modules/nixos/core/doas/default.nix @@ -8,7 +8,6 @@ let user0 user1 user2 - user3 ; inherit (flake.config.machines) devices @@ -31,7 +30,6 @@ 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 4c05c86..e460ee5 100755 --- a/modules/nixos/core/homeManager/default.nix +++ b/modules/nixos/core/homeManager/default.nix @@ -3,7 +3,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - backupFileExtension = "backup5"; + backupFileExtension = "backup3"; extraSpecialArgs = { inherit flake diff --git a/modules/nixos/core/ssh/default.nix b/modules/nixos/core/ssh/default.nix index 4544958..964030c 100755 --- a/modules/nixos/core/ssh/default.nix +++ b/modules/nixos/core/ssh/default.nix @@ -8,7 +8,9 @@ let user0 user1 user2 - user3 + ; + inherit (flake.config.people.users.${userLogic}) + sshKeys ; inherit (flake.config.machines) devices @@ -20,39 +22,30 @@ let venus = devices.venus.name; charon = devices.charon.name; - # Helper function to get SSH keys for a specific user - getUserKeys = user: flake.config.people.users.${user}.sshKeys; + userLogic = + if + builtins.elem hostname [ + mars + deimos + ceres + ] + then + user0 + else if hostname == charon then + user1 + else if hostname == venus then + user2 + else + ""; in { users.users = if hostname == charon then { } - else if hostname == mars then - { - ${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 - { }; + { + ${userLogic} = { + openssh.authorizedKeys.keys = sshKeys; + }; + }; } diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 3d0b078..cd5ae03 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -10,13 +10,11 @@ in mullvad syncthing ollama - # hypr + hypr searx - portals + wayland xserver flatpak - plasma - sddm ; }; }; diff --git a/modules/nixos/desktop/wayland/portals/default.nix b/modules/nixos/desktop/wayland/wayland/default.nix similarity index 91% rename from modules/nixos/desktop/wayland/portals/default.nix rename to modules/nixos/desktop/wayland/wayland/default.nix index 658ef52..2c6f2e4 100755 --- a/modules/nixos/desktop/wayland/portals/default.nix +++ b/modules/nixos/desktop/wayland/wayland/default.nix @@ -6,7 +6,6 @@ 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 2feafa1..a41b567 100755 --- a/modules/nixos/hardware/razer/default.nix +++ b/modules/nixos/hardware/razer/default.nix @@ -1,3 +1,3 @@ { - hardware.openrazer.enable = false; + hardware.openrazer.enable = true; } diff --git a/modules/nixos/services/mastodon/default.nix b/modules/nixos/services/mastodon/default.nix index 62da572..655a6f6 100755 --- a/modules/nixos/services/mastodon/default.nix +++ b/modules/nixos/services/mastodon/default.nix @@ -26,17 +26,15 @@ in # sudo mastodon-tootctl accounts modify username --remove-role # nixpkgs.overlays = [ - # ( - # final: prev: { - # mastodon = prev.mastodon.overrideAttrs (oldAttrs: { - # postPatch = - # (oldAttrs.postPatch or "") - # + '' - # patch -p1 < ${./chars.patch} - # ''; - # }); - # } - # ) + # (final: prev: { + # mastodon = prev.mastodon.overrideAttrs (oldAttrs: { + # postPatch = + # (oldAttrs.postPatch or "") + # + '' + # patch -p1 < ${./config/chars.patch} + # ''; + # }); + # }) # ]; services = { @@ -55,7 +53,7 @@ in passwordFile = config.sops.secrets.mastodon-database.path; }; extraConfig = { - SINGLE_USER_MODE = "true"; + SINGLE_USER_MODE = "false"; 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 5a741db..868a2a2 100755 --- a/modules/nixos/sops/default.nix +++ b/modules/nixos/sops/default.nix @@ -8,7 +8,6 @@ let user0 user1 user2 - user3 ; inherit (flake.config.machines) devices diff --git a/profiles/user3/default.nix b/profiles/user3/default.nix deleted file mode 100755 index c9cdc1e..0000000 --- a/profiles/user3/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - 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 deleted file mode 100755 index 2aee731..0000000 --- a/profiles/user3/files/get_weather.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/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 deleted file mode 100755 index d953df2..0000000 --- a/profiles/user3/files/themes/vesktop/macchiato-theme.css +++ /dev/null @@ -1 +0,0 @@ -@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 deleted file mode 100755 index da57bcf..0000000 Binary files a/profiles/user3/files/wallpaper/7yKtaRij2giAj0s09F6gmB8XIje.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/FTDCMyaXoAEUn5h.jpg b/profiles/user3/files/wallpaper/FTDCMyaXoAEUn5h.jpg deleted file mode 100755 index 5a4caf1..0000000 Binary files a/profiles/user3/files/wallpaper/FTDCMyaXoAEUn5h.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/cat-waves.png b/profiles/user3/files/wallpaper/cat-waves.png deleted file mode 100755 index ded59d8..0000000 Binary files a/profiles/user3/files/wallpaper/cat-waves.png and /dev/null differ diff --git a/profiles/user3/files/wallpaper/juliemao-1741428128332-6023.jpg b/profiles/user3/files/wallpaper/juliemao-1741428128332-6023.jpg deleted file mode 100755 index af0dc4d..0000000 Binary files a/profiles/user3/files/wallpaper/juliemao-1741428128332-6023.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/pinksky.png b/profiles/user3/files/wallpaper/pinksky.png deleted file mode 100755 index 9565c67..0000000 Binary files a/profiles/user3/files/wallpaper/pinksky.png and /dev/null differ diff --git a/profiles/user3/files/wallpaper/u6ne2q214dx71.jpg b/profiles/user3/files/wallpaper/u6ne2q214dx71.jpg deleted file mode 100755 index 58ee466..0000000 Binary files a/profiles/user3/files/wallpaper/u6ne2q214dx71.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallhaven-0wj757.jpg b/profiles/user3/files/wallpaper/wallhaven-0wj757.jpg deleted file mode 100755 index ffc6074..0000000 Binary files a/profiles/user3/files/wallpaper/wallhaven-0wj757.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallhaven-2ege2g.jpg b/profiles/user3/files/wallpaper/wallhaven-2ege2g.jpg deleted file mode 100755 index ce08958..0000000 Binary files a/profiles/user3/files/wallpaper/wallhaven-2ege2g.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallhaven-4dj2qo.png b/profiles/user3/files/wallpaper/wallhaven-4dj2qo.png deleted file mode 100755 index 395be5c..0000000 Binary files a/profiles/user3/files/wallpaper/wallhaven-4dj2qo.png and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallhaven-4xq6vv.png b/profiles/user3/files/wallpaper/wallhaven-4xq6vv.png deleted file mode 100755 index 1b27934..0000000 Binary files a/profiles/user3/files/wallpaper/wallhaven-4xq6vv.png and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallhaven-5dyvy3.jpg b/profiles/user3/files/wallpaper/wallhaven-5dyvy3.jpg deleted file mode 100755 index 4ea09fd..0000000 Binary files a/profiles/user3/files/wallpaper/wallhaven-5dyvy3.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallhaven-735xv3.jpg b/profiles/user3/files/wallpaper/wallhaven-735xv3.jpg deleted file mode 100755 index 804454c..0000000 Binary files a/profiles/user3/files/wallpaper/wallhaven-735xv3.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallhaven-8xe25y.jpg b/profiles/user3/files/wallpaper/wallhaven-8xe25y.jpg deleted file mode 100755 index b483a4c..0000000 Binary files a/profiles/user3/files/wallpaper/wallhaven-8xe25y.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallhaven-eyrj7o.jpg b/profiles/user3/files/wallpaper/wallhaven-eyrj7o.jpg deleted file mode 100755 index 011111a..0000000 Binary files a/profiles/user3/files/wallpaper/wallhaven-eyrj7o.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallhaven-g8ky73.jpg b/profiles/user3/files/wallpaper/wallhaven-g8ky73.jpg deleted file mode 100755 index f10d23b..0000000 Binary files a/profiles/user3/files/wallpaper/wallhaven-g8ky73.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallhaven-j8wzvp.jpg b/profiles/user3/files/wallpaper/wallhaven-j8wzvp.jpg deleted file mode 100755 index 667e5db..0000000 Binary files a/profiles/user3/files/wallpaper/wallhaven-j8wzvp.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallhaven-nekxjk.png b/profiles/user3/files/wallpaper/wallhaven-nekxjk.png deleted file mode 100755 index d30c308..0000000 Binary files a/profiles/user3/files/wallpaper/wallhaven-nekxjk.png and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallhaven-nryz87.jpg b/profiles/user3/files/wallpaper/wallhaven-nryz87.jpg deleted file mode 100755 index 6454932..0000000 Binary files a/profiles/user3/files/wallpaper/wallhaven-nryz87.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallhaven-r7yey1.jpg b/profiles/user3/files/wallpaper/wallhaven-r7yey1.jpg deleted file mode 100755 index 6a2754d..0000000 Binary files a/profiles/user3/files/wallpaper/wallhaven-r7yey1.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallhaven-vge32m.jpg b/profiles/user3/files/wallpaper/wallhaven-vge32m.jpg deleted file mode 100755 index aba50bd..0000000 Binary files a/profiles/user3/files/wallpaper/wallhaven-vge32m.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallhaven-vgxgem.jpg b/profiles/user3/files/wallpaper/wallhaven-vgxgem.jpg deleted file mode 100755 index 07c0e88..0000000 Binary files a/profiles/user3/files/wallpaper/wallhaven-vgxgem.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (1).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (1).jpg deleted file mode 100755 index 789c456..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (1).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (10).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (10).jpg deleted file mode 100755 index b8dc444..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (10).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (11).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (11).jpg deleted file mode 100755 index 6e3d274..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (11).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (12).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (12).jpg deleted file mode 100755 index 9d03fd8..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (12).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (13).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (13).jpg deleted file mode 100755 index 7de6f45..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (13).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (14).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (14).jpg deleted file mode 100755 index b860fc8..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (14).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (15).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (15).jpg deleted file mode 100755 index 742fb5f..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (15).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (16).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (16).jpg deleted file mode 100755 index 2f9fead..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (16).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (17).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (17).jpg deleted file mode 100755 index 65c5a89..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (17).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (19).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (19).jpg deleted file mode 100755 index d284003..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (19).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (2).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (2).jpg deleted file mode 100755 index 419cdb6..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (2).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (20).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (20).jpg deleted file mode 100755 index 0cda78a..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (20).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (21).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (21).jpg deleted file mode 100755 index c9a36ac..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (21).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (22).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (22).jpg deleted file mode 100755 index 625826c..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (22).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (23).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (23).jpg deleted file mode 100755 index 571de4c..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (23).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (24).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (24).jpg deleted file mode 100755 index e7f5f67..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (24).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (26).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (26).jpg deleted file mode 100755 index 32c914a..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (26).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (27).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (27).jpg deleted file mode 100755 index bc28661..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (27).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (28).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (28).jpg deleted file mode 100755 index c0d943f..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (28).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (29).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (29).jpg deleted file mode 100755 index 4e960b2..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (29).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (3).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (3).jpg deleted file mode 100755 index bb8041d..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (3).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (30).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (30).jpg deleted file mode 100755 index 257f324..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (30).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (31).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (31).jpg deleted file mode 100755 index 26a8dea..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (31).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (32).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (32).jpg deleted file mode 100755 index b689877..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (32).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (34).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (34).jpg deleted file mode 100755 index 42440d5..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (34).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (35).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (35).jpg deleted file mode 100755 index 54a143b..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (35).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (37).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (37).jpg deleted file mode 100755 index 2317225..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (37).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (38).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (38).jpg deleted file mode 100755 index 937fcf5..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (38).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (4).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (4).jpg deleted file mode 100755 index 3714ec7..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (4).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (5).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (5).jpg deleted file mode 100755 index 7ad7ef4..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (5).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (6).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (6).jpg deleted file mode 100755 index e280f63..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (6).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (7).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (7).jpg deleted file mode 100755 index 6952e52..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (7).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (8).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (8).jpg deleted file mode 100755 index b58c9fd..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (8).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (9).jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (9).jpg deleted file mode 100755 index 338ea49..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (9).jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper.jpg b/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper.jpg deleted file mode 100755 index e08dc6e..0000000 Binary files a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper.jpg and /dev/null differ diff --git a/profiles/user3/files/wallpaper/yrTphE7NymvE-bSD.mp4 b/profiles/user3/files/wallpaper/yrTphE7NymvE-bSD.mp4 deleted file mode 100755 index b23b561..0000000 Binary files a/profiles/user3/files/wallpaper/yrTphE7NymvE-bSD.mp4 and /dev/null differ diff --git a/systems/mars/config/filesystem.nix b/systems/mars/config/filesystem.nix index d6c0475..4e6dcf2 100755 --- a/systems/mars/config/filesystem.nix +++ b/systems/mars/config/filesystem.nix @@ -4,9 +4,20 @@ ... }: let - inherit (flake.config.people) user0 user1 user3; - inherit (flake.config.machines.devices) mars ceres synology; - inherit (flake.config.services.instances) samba jellyfin audiobookshelf; + inherit (flake.config.people) + user0 + user1 + ; + 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 @@ -17,7 +28,6 @@ in "folder0" "folder1" "folder2" - "folder3" ]; storageDrives = [ @@ -89,7 +99,6 @@ 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 -" ];