Simplify Blender import, remove Rot8, standardize fastfetch import, add Teams (ew), split up environment vars, etc

modules/home/files/default.nix

@@ -1,5 +1,7 @@
 { config, lib, ... }:
 {
+  imports = [ ./impermanence ];
+
   home.file = lib.mkIf config.home.desktop.enable {
     ".assets/wallpapers".source = ./wallpapers;
     ".assets/lockscreen".source = ./lockscreen;

modules/home/programs/gui/librewolf/default.nix

@@ -238,7 +238,10 @@
 
     # Symlinks to Librewolf
     home = {
-      file.".librewolf".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.mozilla/firefox";
+      file = {
+        ".librewolf".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.mozilla/firefox";
+        ".mozilla/librewolf".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.mozilla/firefox";
+      };
       persistence."/persist${config.home.homeDirectory}".directories = [ ".mozilla" ];
     };
   };

modules/home/programs/misc/gaming/launchers/default.nix

@@ -1,18 +1,19 @@
 { config, lib, pkgs, ... }:
 {
   config = lib.mkIf config.home.gaming.enable {
-    home.packages = with pkgs; [
-      heroic
-      prismlauncher
-      steam
-      steam-run-free
-    ];
-
-    home.persistence."/persist${config.home.homeDirectory}".directories = [
-      ".config/heroic"
-      ".local/share/PrismLauncher"
-      ".local/share/Steam"
-    ];
+    home = {
+      packages = with pkgs; [
+        heroic
+        prismlauncher
+        steam
+        steam-run-free
+      ];
+      persistence."/persist${config.home.homeDirectory}".directories = [
+        ".config/heroic"
+        ".local/share/PrismLauncher"
+        ".local/share/Steam"
+      ];
+    };
 
     nixpkgs.allowUnfreePackages = [
       "steam"

modules/home/programs/misc/school/default.nix

@@ -1,9 +1,17 @@
 { config, lib, pkgs, ... }:
 {
-  home.packages = with pkgs; lib.mkIf config.home.school.enable [
-    freerdp
-    globalprotect-openconnect
-    gpauth
-    remmina
-  ];
+  home = lib.mkIf config.home.school.enable {
+    packages = with pkgs; [
+      freerdp
+      globalprotect-openconnect
+      gpauth
+      remmina
+      teams-for-linux
+    ];
+    persistence."/persist${config.home.homeDirectory}".directories = [
+      ".config/com.yuezk.qt"
+      ".config/remmina"
+      ".config/teams-for-linux"
+    ];
+  };
 }

modules/home/programs/terminal/fastfetch/default.nix

@@ -1,7 +1,8 @@
-{ ... }:
+{ pkgs, ... }:
 {
-  imports = [ ./small ];
-
   programs.fastfetch.enable = true;
-  xdg.configFile."fastfetch/config.jsonc".source = ./config.jsonc;
+
+  home.packages = with pkgs; [ (writeScriptBin "smallfetch" "fastfetch --config ~/.config/fastfetch/small.jsonc") ];
+
+  xdg.configFile."fastfetch".source = ./configs;
 }

modules/home/programs/terminal/fastfetch/small/default.nix

@@ -1,5 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [ (writeScriptBin "smallfetch" "fastfetch --config ~/.config/fastfetch/small.jsonc") ];
-  xdg.configFile."fastfetch/small.jsonc".source = ./small.jsonc;
-}

modules/home/programs/terminal/zoxide/default.nix

@@ -2,5 +2,8 @@
 {
   programs.zoxide.enable = true;
 
-  home.persistence."/persist${config.home.homeDirectory}".directories = [ ".local/share/zoxide" ];
+  home = {
+    shellAliases.cd = "z";
+    persistence."/persist${config.home.homeDirectory}".directories = [ ".local/share/zoxide" ];
+  };
 }

modules/home/services/default.nix

@@ -2,7 +2,6 @@
 {
   imports = [
     ./easyeffects
-    ./impermanence
     ./mpd
     ./playerctl
   ];

modules/home/settings/aliases/default.nix

@@ -8,7 +8,6 @@
 
     # Shortcuts
     ff = "clear && fastfetch";
-    copycat = "wl-copy <";
     myip = "curl ifconfig.co";
     seneca = "ssh jhampton1@matrix.senecapolytechnic.ca";
   };

modules/home/settings/default.nix

@@ -4,6 +4,7 @@
     ./aliases
     ./cursor
     ./dconf
+    ./environment
     ./fonts
     ./gtk
     ./locale

modules/home/settings/environment/default.nix

@@ -0,0 +1,7 @@
+{ ... }:
+{
+  home.sessionVariables = {
+    MANPAGER = "nvim +Man!";
+    NIXPKGS_ALLOW_UNFREE = 1;
+  };
+}

modules/home/settings/xdg/default.nix

@@ -4,4 +4,6 @@
     ./defaults
     ./folders
   ];
+
+  home.preferXdgDirectories = true;
 }

modules/home/user/default.nix

@@ -3,10 +3,5 @@
   home = {
     username = "bun";
     homeDirectory = "/home/${config.home.username}";
-    sessionVariables = {
-      LIBVIRT_DEFAULT_URI = "qemu:///system";
-      MANPAGER = "nvim +Man!";
-      NIXPKGS_ALLOW_UNFREE = 1;
-    };
   };
 }

modules/home/wms/programs/default.nix

@@ -14,7 +14,6 @@
     brightnessctl
     hyprpicker
     libnotify
-    rot8
     shotman
     wdisplays
     wl-clipboard-rs

modules/home/wms/sway/autostart/default.nix

@@ -9,9 +9,6 @@
       { command = "foot -a music -T Music ncmpcpp"; }
       { command = "foot -a sound -T Sound pulsemixer"; }
 
-      # Daemons and tray
-      { command = "rot8"; }
-
       # Foreground
       { command = "thunderbird"; }
       { command = "vesktop"; }

modules/home/wms/sway/rules/default.nix

@@ -54,7 +54,7 @@
 
       # Communication
       "7:${config.ws.w7}" = [
-        { app_id = "MiscBrowser"; }
+        { app_id = "teams-for-linux"; }
         { app_id = "vesktop"; }
       ];
       "9:${config.ws.w9}" = [{ app_id = "thunderbird"; }];