From 3be7dbc5bb058790bfac72cefc76c44cb37efd16 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Mon, 16 Mar 2026 22:27:55 +0000 Subject: [PATCH] trying stylix --- Droidnix/README.org | 61 +++++-------------- .../machines/traveldroid/machine.nix | 2 +- .../out_of_tree/machines/traveldroid/top.nix | 2 +- Droidnix/generated/system/out_of_tree/nix.nix | 6 ++ 4 files changed, 23 insertions(+), 48 deletions(-) create mode 100644 Droidnix/generated/system/out_of_tree/nix.nix diff --git a/Droidnix/README.org b/Droidnix/README.org index d0b39f7f9..dcbda8382 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -93,7 +93,7 @@ This directory contains configurations specific to Hyprland. ** First Setup 1. Clone this repository. -2. Run the setup script: =./setup_droidnix.sh=. +2. Run the setup script: =./setup_droid=. 3. Edit =.assets/system/conf/base.conf= to choose your window manager (=wm = "hyprland"= or =wm = "mangowc"=). 4. Tangle this Org file to generate Nix configurations: =C-c C-v t= in Emacs or use this: =emacs README.org --batch -f org-babel-tangle && emacs --batch --eval "(setq org-html-htmlize-output-type nil)" README.org -f org-html-export-to-html= 5. Build and switch: =sudo nixos-rebuild switch --flake .#=. @@ -345,8 +345,8 @@ This is the top of the machine hierarchy ./dbus.nix ./audio.nix ./xdg.nix - #./session.nix ./networking.nix + ./nix.nix inputs.home-manager.nixosModules.home-manager ]; } @@ -474,7 +474,7 @@ This is the top if the machine hierarchy home = user.homeDirectory; }; # Optional: Enable auto-login for testing - services.getty.autologinUser = user.username; + #services.getty.autologinUser = user.username; }; } #+END_SRC @@ -540,31 +540,6 @@ This sets the networking. } #+END_SRC -** =generated/out_of_tree/machines/traveldroid/session.nix= -This sets the session variables -#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/session.nix :noweb tangle :mkdirp yes :eval never-html -{ config, pkgs, user, ... }: -{ - environment.sessionVariables = { - XDG_SESSION_TYPE = "wayland"; - XDG_CURRENT_DESKTOP = "Hyprland"; - XCURSOR_SIZE = "24"; - GTK_ENABLE_DARK_MODE = "1"; - GTK_THEME = "Catppuccin-Mocha-Standard-Blue-Dark"; - GTK_ICON_THEME = "Papirus-Dark"; - # Use this instead of GTK_APPLICATION_PREFER_DARK_THEME for newer GTK apps: - GTK_THEME_VARIANT = "dark"; - # For Qt apps (if any): - QT_STYLE_OVERRIDE = "gtk2"; - # For Zen Browser (Firefox fork): - MOZ_ENABLE_WAYLAND = "1"; - GSETTINGS_SCHEMA_DIR = "${pkgs.gsettings-desktop-schemas}/share/glib-2.0/schemas"; - }; - - # Add other session-wide variables here (e.g., QT_QPA_PLATFORM, SDL_VIDEODRIVER) -} -#+END_SRC - ** =generated/out_of_tree/machines/traveldroid/bluetooth.nix= This sets the bluetooth implementation #+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/bluetooth.nix :noweb tangle :mkdirp yes :eval never-html @@ -670,6 +645,18 @@ You'll notice the color values in multiple places outside this as well. } #+END_SRC +** =generated/out_of_tree/core/nix.nix= +I use the [[https://catppuccin.com/][Catppuccin]] almost everywhere. The nix module integrates almost automatically everywhere (except gtk). +You'll notice the color values in multiple places outside this as well. +#+BEGIN_SRC nix :tangle generated/system/out_of_tree/nix.nix :noweb tangle :mkdirp yes :eval never-html +{ config, pkgs, ... }: +{ + nix.settings = { + extra-experimental-features = [ "nix-command" "flakes" ]; + }; +} +#+END_SRC + * Now we reach the top of the hierarchy which will call all other imports @@ -1091,24 +1078,6 @@ You'll notice the color values in multiple places outside this as well. } #+END_SRC -** =generated/system/core/theme.nix= -I use the [[https://catppuccin.com/][Catppuccin]] almost everywhere. The nix module integrates almost automatically everywhere (except gtk). -You'll notice the color values in multiple places outside this as well. -#+BEGIN_SRC nix :tangle generated/system/core/theme.nix :noweb tangle :mkdirp yes :eval never-html -{ pkgs, flakeRoot, ... }: - -{ - programs.stylix = { - enable = true; - settings = { - theme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml"; - }; - }; -} - -#+END_SRC - - ** =generated/system/core/fonts.nix= This file installs and configures fonts #+BEGIN_SRC nix :tangle generated/system/core/fonts.nix :noweb tangle :mkdirp yes :eval never-html diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/machine.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/machine.nix index 352b795b2..4c9bb6b8d 100644 --- a/Droidnix/generated/out_of_tree/machines/traveldroid/machine.nix +++ b/Droidnix/generated/out_of_tree/machines/traveldroid/machine.nix @@ -33,6 +33,6 @@ home = user.homeDirectory; }; # Optional: Enable auto-login for testing - services.getty.autologinUser = user.username; + #services.getty.autologinUser = user.username; }; } diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix index 2ded41a65..196851af4 100644 --- a/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix +++ b/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix @@ -16,8 +16,8 @@ ./dbus.nix ./audio.nix ./xdg.nix - #./session.nix ./networking.nix + ./nix.nix inputs.home-manager.nixosModules.home-manager ]; } diff --git a/Droidnix/generated/system/out_of_tree/nix.nix b/Droidnix/generated/system/out_of_tree/nix.nix new file mode 100644 index 000000000..bb28420bf --- /dev/null +++ b/Droidnix/generated/system/out_of_tree/nix.nix @@ -0,0 +1,6 @@ +{ config, pkgs, ... }: +{ + nix.settings = { + extra-experimental-features = [ "nix-command" "flakes" ]; + }; +}