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

flake.lock

@@ -5,16 +5,19 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
+        "dir": "blender",
         "lastModified": 1746378999,
-        "narHash": "sha256-EwX7RUS3+jAM8W6CT5RbUzBSakv1OYxhzeTFUptggUI=",
+        "narHash": "sha256-aF+uC/aYR4I7VxN9s0gQG1WRDTE0Re3jAMd0qBkWjV4=",
+        "owner": "edolstra",
+        "repo": "nix-warez",
         "rev": "85d76721132cc6631bbaa8c950d4d0f3aa4003fd",
-        "revCount": 137,
+        "type": "github"
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/edolstra/blender-bin/1.0.15/01969c4d-b680-7b45-a6b4-65a828e5f108/source.tar.gz?rev=85d76721132cc6631bbaa8c950d4d0f3aa4003fd&revCount=137"
       },
       "original": {
-        "type": "tarball",
+        "dir": "blender",
-        "url": "https://flakehub.com/f/edolstra/blender-bin/1.0.13.tar.gz"
+        "owner": "edolstra",
+        "repo": "nix-warez",
+        "type": "github"
       }
     },
     "blobs": {

flake.nix

@@ -41,7 +41,7 @@
       inputs.nixpkgs.follows = "unstable";
     };
 
-    blender.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.13.tar.gz";
+    blender.url = "github:edolstra/nix-warez?dir=blender";
   };
 
   outputs = {

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; [
+    home = {
-      heroic
+      packages = with pkgs; [
-      prismlauncher
+        heroic
-      steam
+        prismlauncher
-      steam-run-free
+        steam
-    ];
+        steam-run-free
-
+      ];
-    home.persistence."/persist${config.home.homeDirectory}".directories = [
+      persistence."/persist${config.home.homeDirectory}".directories = [
-      ".config/heroic"
+        ".config/heroic"
-      ".local/share/PrismLauncher"
+        ".local/share/PrismLauncher"
-      ".local/share/Steam"
+        ".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 [
+  home = lib.mkIf config.home.school.enable {
-    freerdp
+    packages = with pkgs; [
-    globalprotect-openconnect
+      freerdp
-    gpauth
+      globalprotect-openconnect
-    remmina
+      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"; }];

modules/system/services/server/nfs/default.nix

@@ -3,7 +3,7 @@
   imports = [ ./user ];
 
   config = lib.mkIf config.services.nfs.server.enable {
-    services.nfs.server.exports = "/storage *(rw,sync,no_subtree_check)";
+    services.nfs.server.exports = "/storage *(rw)";
     networking.firewall.extraInputRules = "ip saddr { 10.0.0.0/8, 11.0.0.0/8, ${config.secrets.ips.bun} } tcp dport 2049 accept";
   };
 }

modules/system/users/main/default.nix

@@ -30,21 +30,21 @@
         "wheel"
 
         "audio"
-        "video"
-        "render"
         "input"
-        "disk"
+        "render"
+        "video"
 
         "dialout"
+        "disk"
         "rtkit"
 
         "kvm"
         "libvirtd"
         "qemu-libvirtd"
 
-        "nginx"
         "minecraft"
         "nfsShare"
+        "nginx"
       ];
       uid = 1000;
       shell = pkgs.zsh;