diff --git a/flake.nix b/flake.nix index ee11fc1..03862fe 100755 --- a/flake.nix +++ b/flake.nix @@ -96,7 +96,6 @@ mars = inputs.self.lib.mkLinuxSystem [ ./systems/mars ./profiles/user0 - ./profiles/user1 config.nixosModules.mars config.nixosModules.core config.nixosModules.mantle @@ -104,7 +103,7 @@ inputs.nixos-cosmic.nixosModules.default inputs.home-manager.nixosModules.home-manager inputs.lix-module.nixosModules.default - inputs.niri.nixosModules.niri + # inputs.niri.nixosModules.niri inputs.nur.modules.nixos.default inputs.sops-nix.nixosModules.sops ]; diff --git a/modules/config/default.nix b/modules/config/default.nix index b39e46f..ec36931 100755 --- a/modules/config/default.nix +++ b/modules/config/default.nix @@ -225,9 +225,6 @@ in userIdForUser0 = [ "uid=1000" ]; - userIdForUser1 = [ - "uid=1002" - ]; dummy = [ ]; @@ -294,8 +291,6 @@ in usersFunctions = { user0 = "nick"; user0Label = "Nick"; - user1 = "streaming"; - user1Label = "Streaming"; }; }; diff --git a/modules/config/devices/config/synology.nix b/modules/config/devices/config/synology.nix index f92cf63..b6fae7d 100755 --- a/modules/config/devices/config/synology.nix +++ b/modules/config/devices/config/synology.nix @@ -3,11 +3,10 @@ let inherit (moduleFunctions.devicesFunctions) sambaPermissions userIdForUser0 - userIdForUser1 synologyIP deviceNames ; - inherit (moduleFunctions.usersFunctions) user0 user0Label user1; + inherit (moduleFunctions.usersFunctions) user0 user0Label; synologyName = deviceNames.nas; in { @@ -25,10 +24,4 @@ in device = "//${synologyIP}/homes/${user0Label}"; options = sambaPermissions ++ userIdForUser0; }; - # Streaming Folder - folder1 = { - mount = "/mnt/media/${synologyName}/${user1}"; - device = "//${synologyIP}/homes/${user0Label}"; - options = sambaPermissions ++ userIdForUser1; - }; } diff --git a/modules/config/users/config/user0.nix b/modules/config/users/config/user0.nix index 2d69fbc..e173470 100755 --- a/modules/config/users/config/user0.nix +++ b/modules/config/users/config/user0.nix @@ -14,7 +14,7 @@ address2 = "nick@uprootnutrition.com"; }; paths = { - path0 = "/home/${user0}/Files/Projects"; # Git path + path0 = "/home/${user0}/projects"; # Git path }; sshKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBF9TmImDoYDpsW5VMFbOcuK3aH4TWRtx/xGxT3yUtEN nick@desktop" diff --git a/modules/config/users/config/user1.nix b/modules/config/users/config/user1.nix deleted file mode 100755 index 2921f50..0000000 --- a/modules/config/users/config/user1.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ user1 }: -{ - name = "Streaming"; - aliases = { - }; - email = { - address0 = "nick@upRootNutrition.com"; - }; - paths = { - path0 = "/home/${user1}/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 538ff13..3d8fb6a 100755 --- a/modules/config/users/default.nix +++ b/modules/config/users/default.nix @@ -3,15 +3,12 @@ let inherit (moduleFunctions) usersFunctions; configPath = ./config; user0 = usersFunctions.user0; - user1 = usersFunctions.user1; in { inherit user0 - user1 ; users = { "${user0}" = import (configPath + /user0.nix) { inherit user0; }; - "${user1}" = import (configPath + /user1.nix) { inherit user1; }; }; } diff --git a/modules/home/cli/development/editing/helix/config/settings.nix b/modules/home/cli/development/editing/helix/config/settings.nix index ab53efe..f666f1c 100755 --- a/modules/home/cli/development/editing/helix/config/settings.nix +++ b/modules/home/cli/development/editing/helix/config/settings.nix @@ -19,8 +19,6 @@ keys = { normal = { - C-y = ":sh zellij run -n Yazi -c -f -x 10%% -y 10%% --width 80%% --height 80%% -- yazi-picker open ."; - C-v = ":sh zellij run -n Lazygit -c -f -x 10%% -y 10%% --width 80%% --height 80%% -- lazygit-root"; f = ":format"; tab = "indent"; S-tab = "unindent"; diff --git a/modules/home/default.nix b/modules/home/default.nix index 8a3c31f..3f7bd7e 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -14,7 +14,6 @@ in ; inherit (config.people) user0 - user1 ; in { @@ -63,7 +62,7 @@ in zoom academic hypr - niri + # niri wayland theming printManager @@ -76,32 +75,6 @@ in ; }; }; - "${mars.name}-${user1}" = { - imports = builtins.attrValues { - inherit (modules) - cli - floorp - ghostty - steam - zed - obsidian - okular - kolourPaint - imageViewing - obsStudio - mpv - freetube - vesktop - bitwarden - emote - flameshot - gnomeCalculator - theming - hypr - wayland - ; - }; - }; "${deimos.name}-${user0}" = { imports = builtins.attrValues { inherit (modules) diff --git a/modules/home/gui/apps/media/docs/docEditing/obsidian/default.nix b/modules/home/gui/apps/media/docs/docEditing/obsidian/default.nix index 15f0bdf..682f597 100755 --- a/modules/home/gui/apps/media/docs/docEditing/obsidian/default.nix +++ b/modules/home/gui/apps/media/docs/docEditing/obsidian/default.nix @@ -27,7 +27,7 @@ in vaults = { "obsidian" = { enable = true; - target = "/home/${user0}/Files/Projects/dotfiles/modules/home/gui/apps/media/docs/docEditing/obsidian/vault0/files"; + target = "/home/${user0}/projects/dotfiles/modules/home/gui/apps/media/docs/docEditing/obsidian/vault0/files"; settings = vault0Settings; }; }; diff --git a/modules/nixos/core/doas/default.nix b/modules/nixos/core/doas/default.nix index 37fd07b..0ec9f25 100755 --- a/modules/nixos/core/doas/default.nix +++ b/modules/nixos/core/doas/default.nix @@ -2,7 +2,6 @@ let inherit (flake.config.people) user0 - user1 ; in { @@ -15,7 +14,6 @@ in noPass = true; users = [ user0 - user1 ]; } ]; diff --git a/modules/nixos/core/environment/default.nix b/modules/nixos/core/environment/default.nix index bdb763f..41c0120 100755 --- a/modules/nixos/core/environment/default.nix +++ b/modules/nixos/core/environment/default.nix @@ -1,54 +1,27 @@ -{ pkgs, ... }: +{ pkgs, flake, ... }: +let + inherit (flake.config.people) user0; +in { environment = { enableAllTerminfo = true; - systemPackages = - let - yazi-picker = pkgs.writeShellScriptBin "yazi-picker" '' - #!/usr/bin/env bash - - paths=$(yazi "$2" --chooser-file=/dev/stdout | while read -r; do printf "%q " "$REPLY"; done) - - if [[ -n "$paths" ]]; then - zellij action toggle-floating-panes - zellij action write 27 # send key - zellij action write-chars ":$1 $paths" - zellij action write 13 # send key - else - zellij action toggle-floating-panes - fi - ''; - lazygit-root = pkgs.writeShellScriptBin "lazygit-root" '' - #!/usr/bin/env bash - - git_root=$(git rev-parse --show-toplevel 2>/dev/null) - - if [[ -z "$git_root" ]]; then - echo "Not in a git repository" - exit 1 - fi - - cd "$git_root" && lazygit - ''; - in - builtins.attrValues { - inherit (pkgs) - git - grim - pijul - sshfs - tomb - just - virt-manager - imagemagick - ; - # Add your custom scripts to the attribute set - inherit yazi-picker lazygit-root; - }; + systemPackages = builtins.attrValues { + inherit (pkgs) + git + grim + pijul + sshfs + tomb + just + virt-manager + imagemagick + ; + }; variables = { VIDEO_PLAYER = "mpv"; EDITOR = "hx"; TERM = "ghostty"; + XDG_DOWNLOAD_DIR = "/home/${user0}/downloads"; NIXPKGS_ALLOW_INSECURE = "1"; NIXPKGS_ALLOW_UNFREE = "1"; GTK_THEME = "catppuccin-macchiato-mauve-compact"; diff --git a/modules/nixos/core/nh/default.nix b/modules/nixos/core/nh/default.nix index 278d4d2..d397da1 100755 --- a/modules/nixos/core/nh/default.nix +++ b/modules/nixos/core/nh/default.nix @@ -9,6 +9,6 @@ in enable = true; dates = "weekly"; }; - flake = "/home/${user0}/Files/Projects/dotfiles"; + flake = "/home/${user0}/projects/dotfiles"; }; } diff --git a/modules/nixos/core/ssh/default.nix b/modules/nixos/core/ssh/default.nix index 322b85b..6a8533f 100755 --- a/modules/nixos/core/ssh/default.nix +++ b/modules/nixos/core/ssh/default.nix @@ -4,38 +4,12 @@ ... }: let - inherit (flake.config.people) user0 user1; - inherit (flake.config.machines) devices; - hostname = config.networking.hostName; - mars = devices.mars.name; - deimos = devices.deimos.name; - ceres = devices.ceres.name; - - getUserKeys = user: flake.config.people.users.${user}.sshKeys; - - user0Key = { - ${user0} = { - openssh.authorizedKeys.keys = getUserKeys user0; - }; - }; - user1Key = { - ${user1} = { - openssh.authorizedKeys.keys = getUserKeys user1; - }; - }; - + inherit (flake.config.people) user0; in { - users.users = - if hostname == mars then - user0Key // user1Key - else if - builtins.elem hostname [ - deimos - ceres - ] - then - user0Key - else - { }; + users.users = { + ${user0} = { + openssh.authorizedKeys.keys = flake.config.people.users.${user0}.sshKeys; + }; + }; } diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 15ba5a2..57e65cc 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -9,11 +9,11 @@ in inherit (modules) syncthing ollama - cosmic + # cosmic # plasma - # hypr + hypr # niri - # wayland + wayland network searx flatpak diff --git a/modules/nixos/services/glance/config/server.nix b/modules/nixos/services/glance/config/server.nix index 12cf8ec..37dec84 100755 --- a/modules/nixos/services/glance/config/server.nix +++ b/modules/nixos/services/glance/config/server.nix @@ -4,7 +4,7 @@ let inherit (flake.config.machines.devices) ceres; in { - assets-path = "/home/${user0}/Files/Projects/dotfiles/modules/nixos/services/glance/assets"; + assets-path = "/home/${user0}/projects/dotfiles/modules/nixos/services/glance/assets"; # host = configHelpers.host; # host = configHelpers.localhost; host = ceres.wireguard.ip0; diff --git a/profiles/user0/default.nix b/profiles/user0/default.nix index 47f87ae..a6d7d69 100755 --- a/profiles/user0/default.nix +++ b/profiles/user0/default.nix @@ -52,11 +52,11 @@ in homeDirectory = "/home/${user0}"; file = { "./justfile" = import ./files/misc/justfile.nix { inherit flake config lib; }; - "./Files/Scripts/list.sh" = { + "./.config/scripts/list.sh" = { source = ./files/scripts/list.sh; executable = true; }; - "./Files/Scripts/loop.sh" = { + "./.config/scripts/loop.sh" = { source = ./files/scripts/loop.sh; executable = true; }; @@ -97,22 +97,13 @@ in "d ${paths.path0} 0755 ${user0} users -" ] ++ (map (path: "d /home/${user0}/${path} 0755 ${user0} users -") [ - "Downloads/Nicotine" - "Downloads/Nicotine/Downloads" - "Downloads/Nicotine/Incomplete" - "Downloads/Nicotine/Received" - "Downloads/Qbittorent" - "Downloads/Qbittorent/Movies" - "Downloads/Qbittorent/Music" - "Downloads/Qbittorent/Shows" - "Files" - "Files/Scripts" - "Files/Games" - "Files/Screenshots" + "projects" + "downloads" ]) ++ (map (path: "R /home/${user0}/${path} 0755 ${user0} users - -") [ "Desktop" "Documents" + "Downloads" "Music" "Pictures" "Public" diff --git a/profiles/user0/files/misc/justfile.nix b/profiles/user0/files/misc/justfile.nix index 23f5e60..9cd04ea 100755 --- a/profiles/user0/files/misc/justfile.nix +++ b/profiles/user0/files/misc/justfile.nix @@ -33,16 +33,16 @@ in { text = '' rebuildBoot: - nixos-rebuild boot --sudo --flake ~/Files/Projects/dotfiles#${hostname} --show-trace + nixos-rebuild boot --sudo --flake ~/projects/dotfiles#${hostname} --show-trace rebuild: - nixos-rebuild switch --sudo --flake ~/Files/Projects/dotfiles#${hostname} --show-trace + nixos-rebuild switch --sudo --flake ~/projects/dotfiles#${hostname} --show-trace rebuild-server: - nixos-rebuild switch --flake ~/Files/Projects/dotfiles#${ceres.name} --target-host ${ceres.ip.address0} --sudo --ask-sudo-password + nixos-rebuild switch --flake ~/projects/dotfiles#${ceres.name} --target-host ${ceres.ip.address0} --sudo --ask-sudo-password update: - nix flake update --flake ~/Files/Projects/dotfiles + nix flake update --flake ~/projects/dotfiles remove-redundant: ls **/*.hs | each { |file| hlint --refactor --refactor-options="--inplace" $file.name } diff --git a/profiles/user1/default.nix b/profiles/user1/default.nix deleted file mode 100755 index 2d21b03..0000000 --- a/profiles/user1/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - config, - flake, - pkgs, - lib, - ... -}: -let - inherit (flake) self; - inherit (flake.config.people) user1; - inherit (flake.config.machines) devices; - inherit (flake.config.people.users.${user1}) name paths; - hostname = config.networking.hostName; -in -{ - users = { - users.${user1} = { - description = name; - name = user1; - isNormalUser = true; - shell = pkgs.nushell; - extraGroups = [ - "adbusers" - "disk" - "libvirtd" - "netdev" - "networkmanager" - "plugdev" - "samba" - "vboxusers" - "wheel" - ]; - }; - }; - home-manager.users = { - ${user1} = { - home = { - username = user1; - homeDirectory = "/home/${user1}"; - file = { - "./.config/scripts/get_weather.sh" = { - source = ./files/scripts/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}-${user1}" - ]; - } - ]; - }; - }; - systemd.tmpfiles = { - rules = - [ - "d ${paths.path0} 0755 ${user1} users -" - ] - ++ (map (path: "d /home/${user1}/${path} 0755 ${user1} users -") [ - "Files" - "Files/Scripts" - "Files/Games" - "Files/Screenshots" - ]) - ++ (map (path: "R /home/${user1}/${path} 0755 ${user1} users - -") [ - "Desktop" - "Documents" - "Music" - "Pictures" - "Public" - "Templates" - "Videos" - ]); - }; -} diff --git a/profiles/user1/files/scripts/get_weather.sh b/profiles/user1/files/scripts/get_weather.sh deleted file mode 100755 index 2aee731..0000000 --- a/profiles/user1/files/scripts/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/user1/files/themes/vesktop/macchiato-theme.css b/profiles/user1/files/themes/vesktop/macchiato-theme.css deleted file mode 100755 index d953df2..0000000 --- a/profiles/user1/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/user1/files/wallpaper/7yKtaRij2giAj0s09F6gmB8XIje.jpg b/profiles/user1/files/wallpaper/7yKtaRij2giAj0s09F6gmB8XIje.jpg deleted file mode 100755 index da57bcf..0000000 Binary files a/profiles/user1/files/wallpaper/7yKtaRij2giAj0s09F6gmB8XIje.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/FTDCMyaXoAEUn5h.jpg b/profiles/user1/files/wallpaper/FTDCMyaXoAEUn5h.jpg deleted file mode 100755 index 5a4caf1..0000000 Binary files a/profiles/user1/files/wallpaper/FTDCMyaXoAEUn5h.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/cat-waves.png b/profiles/user1/files/wallpaper/cat-waves.png deleted file mode 100755 index ded59d8..0000000 Binary files a/profiles/user1/files/wallpaper/cat-waves.png and /dev/null differ diff --git a/profiles/user1/files/wallpaper/juliemao-1741428128332-6023.jpg b/profiles/user1/files/wallpaper/juliemao-1741428128332-6023.jpg deleted file mode 100755 index af0dc4d..0000000 Binary files a/profiles/user1/files/wallpaper/juliemao-1741428128332-6023.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/pinksky.png b/profiles/user1/files/wallpaper/pinksky.png deleted file mode 100755 index 9565c67..0000000 Binary files a/profiles/user1/files/wallpaper/pinksky.png and /dev/null differ diff --git a/profiles/user1/files/wallpaper/u6ne2q214dx71.jpg b/profiles/user1/files/wallpaper/u6ne2q214dx71.jpg deleted file mode 100755 index 58ee466..0000000 Binary files a/profiles/user1/files/wallpaper/u6ne2q214dx71.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallhaven-0wj757.jpg b/profiles/user1/files/wallpaper/wallhaven-0wj757.jpg deleted file mode 100755 index ffc6074..0000000 Binary files a/profiles/user1/files/wallpaper/wallhaven-0wj757.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallhaven-2ege2g.jpg b/profiles/user1/files/wallpaper/wallhaven-2ege2g.jpg deleted file mode 100755 index ce08958..0000000 Binary files a/profiles/user1/files/wallpaper/wallhaven-2ege2g.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallhaven-4dj2qo.png b/profiles/user1/files/wallpaper/wallhaven-4dj2qo.png deleted file mode 100755 index 395be5c..0000000 Binary files a/profiles/user1/files/wallpaper/wallhaven-4dj2qo.png and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallhaven-4xq6vv.png b/profiles/user1/files/wallpaper/wallhaven-4xq6vv.png deleted file mode 100755 index 1b27934..0000000 Binary files a/profiles/user1/files/wallpaper/wallhaven-4xq6vv.png and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallhaven-5dyvy3.jpg b/profiles/user1/files/wallpaper/wallhaven-5dyvy3.jpg deleted file mode 100755 index 4ea09fd..0000000 Binary files a/profiles/user1/files/wallpaper/wallhaven-5dyvy3.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallhaven-735xv3.jpg b/profiles/user1/files/wallpaper/wallhaven-735xv3.jpg deleted file mode 100755 index 804454c..0000000 Binary files a/profiles/user1/files/wallpaper/wallhaven-735xv3.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallhaven-8xe25y.jpg b/profiles/user1/files/wallpaper/wallhaven-8xe25y.jpg deleted file mode 100755 index b483a4c..0000000 Binary files a/profiles/user1/files/wallpaper/wallhaven-8xe25y.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallhaven-eyrj7o.jpg b/profiles/user1/files/wallpaper/wallhaven-eyrj7o.jpg deleted file mode 100755 index 011111a..0000000 Binary files a/profiles/user1/files/wallpaper/wallhaven-eyrj7o.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallhaven-g8ky73.jpg b/profiles/user1/files/wallpaper/wallhaven-g8ky73.jpg deleted file mode 100755 index f10d23b..0000000 Binary files a/profiles/user1/files/wallpaper/wallhaven-g8ky73.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallhaven-j8wzvp.jpg b/profiles/user1/files/wallpaper/wallhaven-j8wzvp.jpg deleted file mode 100755 index 667e5db..0000000 Binary files a/profiles/user1/files/wallpaper/wallhaven-j8wzvp.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallhaven-nekxjk.png b/profiles/user1/files/wallpaper/wallhaven-nekxjk.png deleted file mode 100755 index d30c308..0000000 Binary files a/profiles/user1/files/wallpaper/wallhaven-nekxjk.png and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallhaven-nryz87.jpg b/profiles/user1/files/wallpaper/wallhaven-nryz87.jpg deleted file mode 100755 index 6454932..0000000 Binary files a/profiles/user1/files/wallpaper/wallhaven-nryz87.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallhaven-r7yey1.jpg b/profiles/user1/files/wallpaper/wallhaven-r7yey1.jpg deleted file mode 100755 index 6a2754d..0000000 Binary files a/profiles/user1/files/wallpaper/wallhaven-r7yey1.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallhaven-vge32m.jpg b/profiles/user1/files/wallpaper/wallhaven-vge32m.jpg deleted file mode 100755 index aba50bd..0000000 Binary files a/profiles/user1/files/wallpaper/wallhaven-vge32m.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallhaven-vgxgem.jpg b/profiles/user1/files/wallpaper/wallhaven-vgxgem.jpg deleted file mode 100755 index 07c0e88..0000000 Binary files a/profiles/user1/files/wallpaper/wallhaven-vgxgem.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (1).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (1).jpg deleted file mode 100755 index 789c456..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (1).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (10).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (10).jpg deleted file mode 100755 index b8dc444..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (10).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (11).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (11).jpg deleted file mode 100755 index 6e3d274..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (11).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (12).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (12).jpg deleted file mode 100755 index 9d03fd8..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (12).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (13).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (13).jpg deleted file mode 100755 index 7de6f45..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (13).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (14).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (14).jpg deleted file mode 100755 index b860fc8..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (14).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (15).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (15).jpg deleted file mode 100755 index 742fb5f..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (15).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (16).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (16).jpg deleted file mode 100755 index 2f9fead..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (16).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (17).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (17).jpg deleted file mode 100755 index 65c5a89..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (17).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (19).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (19).jpg deleted file mode 100755 index d284003..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (19).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (2).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (2).jpg deleted file mode 100755 index 419cdb6..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (2).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (20).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (20).jpg deleted file mode 100755 index 0cda78a..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (20).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (21).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (21).jpg deleted file mode 100755 index c9a36ac..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (21).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (22).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (22).jpg deleted file mode 100755 index 625826c..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (22).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (23).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (23).jpg deleted file mode 100755 index 571de4c..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (23).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (24).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (24).jpg deleted file mode 100755 index e7f5f67..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (24).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (26).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (26).jpg deleted file mode 100755 index 32c914a..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (26).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (27).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (27).jpg deleted file mode 100755 index bc28661..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (27).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (28).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (28).jpg deleted file mode 100755 index c0d943f..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (28).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (29).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (29).jpg deleted file mode 100755 index 4e960b2..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (29).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (3).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (3).jpg deleted file mode 100755 index bb8041d..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (3).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (30).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (30).jpg deleted file mode 100755 index 257f324..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (30).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (31).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (31).jpg deleted file mode 100755 index 26a8dea..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (31).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (32).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (32).jpg deleted file mode 100755 index b689877..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (32).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (34).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (34).jpg deleted file mode 100755 index 42440d5..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (34).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (35).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (35).jpg deleted file mode 100755 index 54a143b..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (35).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (37).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (37).jpg deleted file mode 100755 index 2317225..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (37).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (38).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (38).jpg deleted file mode 100755 index 937fcf5..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (38).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (4).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (4).jpg deleted file mode 100755 index 3714ec7..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (4).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (5).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (5).jpg deleted file mode 100755 index 7ad7ef4..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (5).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (6).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (6).jpg deleted file mode 100755 index e280f63..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (6).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (7).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (7).jpg deleted file mode 100755 index 6952e52..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (7).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (8).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (8).jpg deleted file mode 100755 index b58c9fd..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (8).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (9).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (9).jpg deleted file mode 100755 index 338ea49..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (9).jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper.jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper.jpg deleted file mode 100755 index e08dc6e..0000000 Binary files a/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper.jpg and /dev/null differ diff --git a/profiles/user1/files/wallpaper/yrTphE7NymvE-bSD.mp4 b/profiles/user1/files/wallpaper/yrTphE7NymvE-bSD.mp4 deleted file mode 100755 index b23b561..0000000 Binary files a/profiles/user1/files/wallpaper/yrTphE7NymvE-bSD.mp4 and /dev/null differ diff --git a/systems/mars/config/filesystem.nix b/systems/mars/config/filesystem.nix index d646100..fe4ba71 100755 --- a/systems/mars/config/filesystem.nix +++ b/systems/mars/config/filesystem.nix @@ -4,7 +4,7 @@ ... }: let - inherit (flake.config.people) user0 user1; + inherit (flake.config.people) user0; inherit (flake.config.machines.devices) mars ceres synology; inherit (flake.config.services) instances; synologySecrets = config.sops.secrets."network/synology".path; @@ -15,7 +15,6 @@ in let synologyDrives = [ "folder0" - "folder1" ]; storageDrives = [ @@ -88,7 +87,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 ${mars.storage0.mount} 0755 ${user0} users -" "Z ${mars.storage1.mount} 0755 ${user0} users -" ];