feat: removed user1 and tidied up user0 home

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"

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 }

profiles/user1/default.nix

@@ -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"
-      ]);
-  };
-}

profiles/user1/files/scripts/get_weather.sh

@@ -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\"}"

profiles/user1/files/themes/vesktop/macchiato-theme.css

@@ -1 +0,0 @@
-@import url("https://catppuccin.github.io/discord/dist/catppuccin-macchiato.theme.css");