Fix folder paths, set Tower back to stable, remove Nix channels for system for now

flake.nix

@@ -44,13 +44,14 @@
       inputs.nixpkgs.follows = "unstable";
     };
 
+    # Specific apps
     blender.url = "github:edolstra/nix-warez?dir=blender";
   };
 
-  outputs = inputs:
+  outputs = inputs: with inputs;
 
-  inputs.flake-utils.lib.eachDefaultSystemPassThrough (system:
+  flake-utils.lib.eachDefaultSystemPassThrough (system:
-    with inputs; let
+    let
       mkNix = name: channel: channel.lib.nixosSystem {
         modules = [ (./hosts + "/${name}") ];
         specialArgs = inputs;

hosts/tower/boot/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgsUnstable, ... }:
+{ config, lib, pkgs, ... }:
 let
   commonKernelParams = [
     # VM/GPU passthrough
@@ -13,7 +13,7 @@ let
 in {
   boot = {
     # Latest kernel and IOMMU isolation
-    kernelPackages = pkgsUnstable.linuxPackages_latest;
+    kernelPackages = pkgs.linuxPackages_latest;
     kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:1f82,10de:10fa" ];
 
     # Load into GPU before video driver

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

@@ -99,7 +99,7 @@
         # Local files
         h:${config.home.homeDirectory}
         k:${config.home.homeDirectory}/Keepers
-        j:${config.home.homeDirectory}/Downloads
+        d:${config.home.homeDirectory}/Downloads
         j:${config.home.homeDirectory}/Documents
         p:${config.home.homeDirectory}/Photos
         v:${config.home.homeDirectory}/Videos

modules/home/settings/default.nix

@@ -9,6 +9,7 @@
     ./impermanence
     ./locale
     ./nix
+    ./nixgl
     ./qt
     ./xdg
   ];

modules/home/settings/gtk/bookmarks/default.nix

@@ -5,7 +5,8 @@
     "file://${config.home.homeDirectory}/Downloads"
     "file://${config.home.homeDirectory}/Documents"
     "file://${config.home.homeDirectory}/Videos"
-    "file://${config.home.homeDirectory}/Pictures/Screenshots"
+    "file://${config.home.homeDirectory}/Photos"
+    "file://${config.home.homeDirectory}/Photos/Screenshots"
     "file:///etc/nixos"
   ];
 }

modules/home/settings/nix/channels/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, stable, unstable, ... }:
+{ config, pkgs, stable, unstable, ... }:
 with pkgs; {
   nix.registry.stable.flake = stable;
   nix.registry.unstable.flake = unstable;

modules/home/settings/nix/unfree/default.nix

@@ -1,6 +1,6 @@
 { config, lib, ... }:
-with lib; {
+{
-  options.nixpkgs.allowUnfreePackages = mkOption {
+  options.nixpkgs.allowUnfreePackages = with lib; mkOption {
     type = types.listOf types.str;
     default = [];
   };

modules/home/settings/nixgl/default.nix

@@ -0,0 +1,10 @@
+{ config, lib, ... }:
+{
+  nixGL = lib.mkIf config.targets.genericLinux.enable {
+    installScripts = [
+      "mesa"
+      "nvidia"
+    ];
+    vulkan.enable = true;
+  };
+}

modules/home/settings/xdg/folders/default.nix

@@ -3,11 +3,13 @@
   xdg.userDirs = {
     enable = config.home.desktop.enable;
     createDirectories = true;
+
     desktop = null;
     pictures = "${config.home.homeDirectory}/Photos";
     music = null;
     publicShare = null;
     templates = null;
+
     extraConfig.XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
   };
 }

modules/home/wms/programs/waybar/default.nix

@@ -352,6 +352,16 @@
         border-bottom: 3px solid transparent;
         min-width: 20px;
       }
+      #scratchpad, #privacy {
+        margin-left: 4px;
+      }
+      #mpris, #custom-notifs, #idle_inhibitor, #custom-weather, #cpu, #memory, #custom-vram, #backlight, #battery {
+        margin: 0 5px 0 2px;
+      }
+      #pulseaudio {
+        margin-right: 5px;
+      }
+
       #workspaces button.visible, #workspaces button.active {
         border-bottom: 3px solid #${config.look.colors.prime};
         background: #${config.look.colors.mid};
@@ -363,23 +373,6 @@
         box-shadow: none;
         background: #${config.look.colors.light};
       }
-      #scratchpad, #privacy {
-        margin-left: 4px;
-      }
-      #mpris, #custom-notifs, #idle_inhibitor, #custom-weather, #cpu, #memory, #custom-vram, #backlight, #battery {
-        margin: 0 5px 0 2px;
-      }
-      #pulseaudio {
-        margin-right: 5px;
-      }
-
-      #mpris.paused, #custom-notifs.disabled, #idle_inhibitor.deactivated {
-        color: #888;
-      }
-      #pulseaudio.muted, #network.disconnected, #bluetooth.off {
-        color: #424242;
-      }
-
       #mpris {
         border-bottom: 3px solid #ffb066;
       }
@@ -411,6 +404,13 @@
         border-bottom: 3px solid #0a6cf5;
         margin: 0 2px 0 2px;
       }
+
+      #mpris.paused, #custom-notifs.disabled, #idle_inhibitor.deactivated {
+        color: #888;
+      }
+      #pulseaudio.muted, #network.disconnected, #bluetooth.off {
+        color: #424242;
+      }
     '';
   };
 }

modules/system/settings/nix/channels/default.nix

@@ -1,11 +0,0 @@
-{ config, lib, pkgs, stable, unstable, ... }:
-with pkgs; {
-  _module.args.pkgsStable = import stable {
-    inherit (stdenv.hostPlatform) system;
-    inherit (config.nixpkgs) config;
-  };
-  _module.args.pkgsUnstable = import unstable {
-    inherit (stdenv.hostPlatform) system;
-    inherit (config.nixpkgs) config;
-  };
-}

modules/system/settings/nix/default.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }:
 {
   imports = [
-    ./channels
     ./gc
     ./unfree
   ];