From f8cbfda0488d517dccd0fbd26c552a9c2aec7362 Mon Sep 17 00:00:00 2001 From: Bun Date: Sun, 11 May 2025 01:48:37 -0400 Subject: [PATCH] Fix folder paths, set Tower back to stable, remove Nix channels for system for now --- flake.nix | 7 ++-- hosts/tower/boot/default.nix | 4 +-- .../home/programs/terminal/ranger/default.nix | 2 +- modules/home/settings/default.nix | 1 + .../home/settings/gtk/bookmarks/default.nix | 3 +- .../home/settings/nix/channels/default.nix | 2 +- modules/home/settings/nix/unfree/default.nix | 4 +-- modules/home/settings/nixgl/default.nix | 10 ++++++ modules/home/settings/xdg/folders/default.nix | 2 ++ modules/home/wms/programs/waybar/default.nix | 34 +++++++++---------- .../system/settings/nix/channels/default.nix | 11 ------ modules/system/settings/nix/default.nix | 1 - 12 files changed, 42 insertions(+), 39 deletions(-) create mode 100644 modules/home/settings/nixgl/default.nix delete mode 100644 modules/system/settings/nix/channels/default.nix diff --git a/flake.nix b/flake.nix index 3d9b3197..db09545b 100644 --- a/flake.nix +++ b/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: - with inputs; let + flake-utils.lib.eachDefaultSystemPassThrough (system: + let mkNix = name: channel: channel.lib.nixosSystem { modules = [ (./hosts + "/${name}") ]; specialArgs = inputs; diff --git a/hosts/tower/boot/default.nix b/hosts/tower/boot/default.nix index 8c5668af..9f0c2504 100644 --- a/hosts/tower/boot/default.nix +++ b/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 diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix index d6d55b5d..9590fe17 100644 --- a/modules/home/programs/terminal/ranger/default.nix +++ b/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 diff --git a/modules/home/settings/default.nix b/modules/home/settings/default.nix index ffe0fbb4..c34510b7 100644 --- a/modules/home/settings/default.nix +++ b/modules/home/settings/default.nix @@ -9,6 +9,7 @@ ./impermanence ./locale ./nix + ./nixgl ./qt ./xdg ]; diff --git a/modules/home/settings/gtk/bookmarks/default.nix b/modules/home/settings/gtk/bookmarks/default.nix index 57d2d2c7..f4c9c95a 100644 --- a/modules/home/settings/gtk/bookmarks/default.nix +++ b/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" ]; } diff --git a/modules/home/settings/nix/channels/default.nix b/modules/home/settings/nix/channels/default.nix index 499e5afd..0273e22d 100644 --- a/modules/home/settings/nix/channels/default.nix +++ b/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; diff --git a/modules/home/settings/nix/unfree/default.nix b/modules/home/settings/nix/unfree/default.nix index 8c0a288a..41d21c96 100644 --- a/modules/home/settings/nix/unfree/default.nix +++ b/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 = []; }; diff --git a/modules/home/settings/nixgl/default.nix b/modules/home/settings/nixgl/default.nix new file mode 100644 index 00000000..ebf9c3d2 --- /dev/null +++ b/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; + }; +} diff --git a/modules/home/settings/xdg/folders/default.nix b/modules/home/settings/xdg/folders/default.nix index 470cd693..fbd3f6fe 100644 --- a/modules/home/settings/xdg/folders/default.nix +++ b/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"; }; } diff --git a/modules/home/wms/programs/waybar/default.nix b/modules/home/wms/programs/waybar/default.nix index 05db4928..7eea309e 100644 --- a/modules/home/wms/programs/waybar/default.nix +++ b/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; + } ''; }; } diff --git a/modules/system/settings/nix/channels/default.nix b/modules/system/settings/nix/channels/default.nix deleted file mode 100644 index 965eafe3..00000000 --- a/modules/system/settings/nix/channels/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/modules/system/settings/nix/default.nix b/modules/system/settings/nix/default.nix index c1115185..73fb0248 100644 --- a/modules/system/settings/nix/default.nix +++ b/modules/system/settings/nix/default.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { imports = [ - ./channels ./gc ./unfree ];