feat: cleaned up some stuff

home-manager/default.nix

@@ -4,6 +4,7 @@ let
   firefox = import ./modules/firefox;
   obs-studio = import ./modules/obs-studio;
   qbittorrent = import ./modules/qbittorrent;
+  steam = import ./modules/steam;
   # Files
   bottom = import ./modules/bottom.nix;
   brave = import ./modules/brave.nix;
@@ -85,6 +86,7 @@ in {
       nextcloud
       nushell
       starship
+      steam
       vscode
       wezterm
       yazi
@@ -118,6 +120,7 @@ in {
         misc-media
         freetube
         mpv
+        steam
       ];
     };
     extras = {

home-manager/modules/bat/default.nix

@@ -3,5 +3,11 @@
     enable = true;
     config.theme = "catppuccin-macchiato";
   };
-  xdg.configFile."bat/themes/catppuccin-mocha.tmTheme".source = ./catppuccin-macchiato.tmTheme;
+  home = {
+    file = {
+      "./.config/bat/themes/macchiato.tmTheme" = {
+        source = ./macchiato.tmTheme;
+      };
+    };
+  };
 }

home-manager/modules/misc/gaming.nix

@@ -4,7 +4,6 @@
       (pkgs)
       lutris
       prismlauncher
-      steam
       ;
   };
 }

home-manager/modules/obs-studio/default.nix

@@ -8,5 +8,11 @@
       ];
     };
   };
-  xdg.configFile."obs-studio/themes".source = ./themes;
+  home = {
+    file = {
+      "./.config/obs-studio/themes" = {
+        source = ./themes;
+      };
+    };
+  };
 }

home-manager/modules/steam/default.nix

@@ -0,0 +1,16 @@
+{pkgs, ...}: {
+  home.packages = builtins.attrValues {
+    inherit
+      (pkgs)
+      steam
+      ;
+  };
+
+  home = {
+    file = {
+      "./.steam/steam/steam_dev.cfg" = {
+        source = ./steam_dev.cfg;
+      };
+    };
+  };
+}

home-manager/modules/vesktop/default.nix

@@ -5,5 +5,12 @@
       vesktop
       ;
   };
-  xdg.configFile."vesktop/themes/macchiato.theme.css".source = ./macchiato.theme.css;
+
+  home = {
+    file = {
+      "./.config/vesktop/themes/macchiato-theme.css" = {
+        source = ./macchiato-theme.css;
+      };
+    };
+  };
 }

home-manager/modules/vesktop/macchiato-theme.css

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

home-manager/modules/vesktop/macchiato.theme.css

@@ -1,11 +0,0 @@
-/**
- * @name Catppuccin Macchiato
- * @author winston#0001
- * @authorId 505490445468696576
- * @version 0.2.0
- * @description 🎮 Soothing pastel theme for Discord
- * @website https://github.com/catppuccin/discord
- * @invite r6Mdz5dpFc
- * **/
-
- @import url("https://catppuccin.github.io/discord/dist/catppuccin-macchiato.theme.css");

nixos/default.nix

@@ -1,6 +1,5 @@
 let
   # Folders
-  steam = import ./modules/steam;
   services = import ./modules/services;
   # Files
   accounts = import ./modules/accounts.nix;
@@ -21,10 +20,11 @@ let
   locale = import ./modules/locale.nix;
   network = import ./modules/network.nix;
   nix = import ./modules/nix.nix;
-  ollama-main = import ./modules/ollama-main.nix;
+  ollama = import ./modules/ollama.nix;
   plasma = import ./modules/plasma.nix;
   printing = import ./modules/printing.nix;
   regreet = import ./modules/regreet.nix;
+  steam = import ./modules/steam.nix;
   syncthing = import ./modules/syncthing.nix;
   sysstat = import ./modules/sysstat.nix;
   system = import ./modules/system.nix;
@@ -52,7 +52,7 @@ in {
         locale
         network
         nix
-        ollama-main
+        ollama
         plasma
         printing
         regreet
@@ -84,7 +84,7 @@ in {
       desktop = {
         imports = [
           syncthing
-          ollama-main
+          ollama
         ];
       };
       server = {

profiles/user0/default.nix

@@ -42,11 +42,8 @@ in {
         username = user0;
         homeDirectory = "/home/${user0}";
         file = {
-          "./.steam/steam/steam_dev.cfg" = {
-            source = ../../nixos/modules/steam/steam_dev.cfg;
-          };
           "./justfile" = {
-            source = ./justfile;
+            source = ./files/justfile;
           };
           "./Files/Scripts/list.sh" = {
             source = ./files/list.sh;

profiles/user1/default.nix

@@ -30,8 +30,9 @@ in {
         username = user1;
         homeDirectory = "/home/${user1}";
         file = {
-          "./justfile".source = ./justfile;
-          "./.steam/steam/steam_dev.cfg".source = ../../nixos/modules/steam/steam_dev.cfg;
+          "./justfile" = {
+            source = ./files/justfile;
+          };
         };
         sessionVariables = {};
       };

profiles/user1/files/justfile

@@ -0,0 +1,14 @@
+ewwEdit:
+    eww --config /home/nick/dotfiles/home-manager/modules/eww/config/ open centerPanel
+
+ewwLaunch:
+    ./home/nick/dotfiles/home-manager/modules/eww/config/scripts/master.sh
+
+gobrrr:
+    home-manager switch --flake ~/dotfiles#desktop
+
+gobrrrl:
+    nixos-rebuild switch --use-remote-sudo --flake /home/nick/dotfiles#desktop
+
+fuckoff:
+    shutdown now

profiles/user2/default.nix

@@ -30,8 +30,9 @@ in {
         username = user2;
         homeDirectory = "/home/${user2}";
         file = {
-          "./justfile".source = ./justfile;
-          "./.steam/steam/steam_dev.cfg".source = ../../nixos/modules/steam/steam_dev.cfg;
+          "./justfile" = {
+            source = ./files/justfile;
+          };
         };
         sessionVariables = {};
       };

profiles/user2/files/justfile

@@ -0,0 +1,14 @@
+ewwEdit:
+    eww --config /home/nick/dotfiles/home-manager/modules/eww/config/ open centerPanel
+
+ewwLaunch:
+    ./home/nick/dotfiles/home-manager/modules/eww/config/scripts/master.sh
+
+gobrrr:
+    home-manager switch --flake ~/dotfiles#desktop
+
+gobrrrl:
+    nixos-rebuild switch --use-remote-sudo --flake /home/nick/dotfiles#desktop
+
+fuckoff:
+    shutdown now

systems/desktop/filesystem.nix

@@ -5,7 +5,7 @@
 }: let
   inherit (flake.config.people) user0 user1;
   inherit (flake.config.system.device) desktop server nas;
-  inherit (flake.config.instance) samba;
+  inherit (flake.config.service.instance) samba;
   synologySecrets = config.sops.secrets."network/synology".path;
   serverSecrets = config.sops.secrets."network/server".path;
 in {
@@ -55,11 +55,11 @@ in {
   in
     {
       "/" = {
-        device = "/dev/disk/by-uuid/9ea15b16-068a-4c1b-8152-096b901f1ae7";
+        device = "/dev/disk/by-uuid/a465cd69-1cdc-47f8-93ca-cfdfee28adfe";
         fsType = "ext4";
       };
       "/boot" = {
-        device = "/dev/disk/by-uuid/8A33-9662";
+        device = "/dev/disk/by-uuid/AEB2-681E";
         fsType = "vfat";
         options = desktop.boot.options;
       };
@@ -69,7 +69,7 @@ in {
     // (builtins.listToAttrs (map sambaMounts sambaDrives));
 
   swapDevices = [
-    {device = "/dev/disk/by-uuid/b21d20df-f272-4c0c-8e7a-5effac3373f8";}
+    {device = "/dev/disk/by-uuid/1c787018-5bea-48b5-973c-dafd54159ee1";}
   ];
 
   systemd.tmpfiles.rules = [