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

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;
-  };
 }

modules/config/devices/default.nix

@@ -31,9 +31,6 @@ let
     userIdForUser1 = [
       "uid=1001"
     ];
-    userIdForUser3 = [
-      "uid=1002"
-    ];
     dummy = [
     ];
     ceresIP = "192.168.50.140";

modules/config/users/config/user3.nix

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

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; };
   };
 }

modules/home/cli/development/tooling/elm/default.nix

@@ -5,12 +5,12 @@
 {
   home.packages = builtins.attrValues {
     inherit (pkgs.elmPackages)
-      elm
+      # elm
-      elm-format
+      # elm-format
-      elm-land
+      # elm-land
-      elm-language-server
+      # elm-language-server
-      elm-review
+      # elm-review
-      elm-test
+      # elm-test
       ;
   };
 }

modules/home/default.nix

@@ -13,12 +13,7 @@ in
         deimos
         ceres
         ;
-      inherit (config.people)
+      inherit (config.people) user0 user1 user2;
-        user0
-        user1
-        user2
-        user3
-        ;
     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
+            hypr
-            # wayland
+            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 {

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";
-  };
 }

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
-    ;
 }

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

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;

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
           ;
       };
     };

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 ]

modules/nixos/core/homeManager/default.nix

@@ -3,7 +3,7 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    backupFileExtension = "backup5";
+    backupFileExtension = "backup3";
     extraSpecialArgs = {
       inherit
         flake

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
+  userLogic =
-  getUserKeys = user: flake.config.people.users.${user}.sshKeys;
+    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;
+        };
+      };
 }

modules/nixos/default.nix

@@ -10,13 +10,11 @@ in
           mullvad
           syncthing
           ollama
-          # hypr
+          hypr
           searx
-          portals
+          wayland
           xserver
           flatpak
-          plasma
-          sddm
           ;
       };
     };

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)

modules/nixos/hardware/razer/default.nix

@@ -1,3 +1,3 @@
 {
-  hardware.openrazer.enable = false;
+  hardware.openrazer.enable = true;
 }

modules/nixos/services/mastodon/default.nix

@@ -26,17 +26,15 @@ in
   # sudo mastodon-tootctl accounts modify username --remove-role
 
   # nixpkgs.overlays = [
-  #   (
+  #   (final: prev: {
-  #     final: prev: {
+  #     mastodon = prev.mastodon.overrideAttrs (oldAttrs: {
-  #       mastodon = prev.mastodon.overrideAttrs (oldAttrs: {
+  #       postPatch =
-  #         postPatch =
+  #         (oldAttrs.postPatch or "")
-  #           (oldAttrs.postPatch or "")
+  #         + ''
-  #           + ''
+  #           patch -p1 < ${./config/chars.patch}
-  #             patch -p1 < ${./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";

modules/nixos/sops/default.nix

@@ -8,7 +8,6 @@ let
     user0
     user1
     user2
-    user3
     ;
   inherit (flake.config.machines)
     devices

profiles/user3/default.nix

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

profiles/user3/files/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/user3/files/themes/vesktop/macchiato-theme.css

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

systems/mars/config/filesystem.nix

@@ -4,9 +4,20 @@
   ...
 }:
 let
-  inherit (flake.config.people) user0 user1 user3;
+  inherit (flake.config.people)
-  inherit (flake.config.machines.devices) mars ceres synology;
+    user0
-  inherit (flake.config.services.instances) samba jellyfin audiobookshelf;
+    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 -"
   ];