From 1b31f9e29c0bdf908248f673c98f3eac0738c9de Mon Sep 17 00:00:00 2001 From: alisceon Date: Wed, 7 Jan 2026 22:56:05 +0100 Subject: [PATCH] this is solid ig --- flake.lock | 20 ++------------ flake.nix | 5 +++- home/alisceon/workstation.nix | 20 ++++++++------ home/wm/gnome.nix | 1 - hosts/common/stylix.nix | 52 ++++++++--------------------------- hosts/common/workstation.nix | 7 ----- 6 files changed, 31 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index cdab942..b82db7d 100644 --- a/flake.lock +++ b/flake.lock @@ -235,22 +235,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": "flake-parts", @@ -337,7 +321,9 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "nur": "nur_2", "systems": "systems", "tinted-foot": "tinted-foot", diff --git a/flake.nix b/flake.nix index c060c1d..6a45215 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - stylix.url = "github:danth/stylix"; nur = { url = "github:nix-community/NUR"; inputs.nixpkgs.follows = "nixpkgs"; @@ -17,6 +16,10 @@ url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, nixpkgs-unstable, nur, nur-unstable, home-manager, stylix, ... }: diff --git a/home/alisceon/workstation.nix b/home/alisceon/workstation.nix index 2a60efc..e7d53b0 100644 --- a/home/alisceon/workstation.nix +++ b/home/alisceon/workstation.nix @@ -12,6 +12,9 @@ nativeMessagingHosts = [ pkgs.firefoxpwa ]; + profiles = { + default = {}; + }; }; # end firefox chromium = { enable = true; @@ -20,7 +23,16 @@ enable = true; silent = true; }; # end direnv + discord = { + enable = true; + }; # end discord }; # end programs + stylix.targets = { + firefox = { + enable = true; + profileNames = [ "default" ]; + }; + }; # obsidian special case # programs.obsidian.enable = true; @@ -45,14 +57,6 @@ ]; }; }; - gtk = lib.mkDefault { - enable = true; - cursorTheme.package = pkgs.vanilla-dmz; - cursorTheme.name = "Vanilla-DMZ"; - font.package = pkgs.inconsolata; - font.name = "Inconsolata"; - font.size = 14; - }; services.syncthing = { enable = true; diff --git a/home/wm/gnome.nix b/home/wm/gnome.nix index 90abc28..2258482 100644 --- a/home/wm/gnome.nix +++ b/home/wm/gnome.nix @@ -86,7 +86,6 @@ hide-window-on-esc = true; tab-policy = "never"; panel-icon-type = "none"; - custom-font = "Inconsolata 14"; use-system-font = false; use-theme-colors = true; }; diff --git a/hosts/common/stylix.nix b/hosts/common/stylix.nix index 221359f..c4fce4f 100644 --- a/hosts/common/stylix.nix +++ b/hosts/common/stylix.nix @@ -1,31 +1,18 @@ { config, pkgs, lib, ... }: - -let - # Opinionated: Nord Base16 scheme (YAML). Swap this for Catppuccin, Gruvbox, etc. - nordYaml = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/tinted-theming/base16-schemes/master/nord.yaml"; - sha256 = lib.fakeSha256; # replace with real hash after first build - }; -in { stylix = { enable = true; + autoEnable = true; + enableReleaseChecks = false; - # Wallpaper applied broadly (Sway, etc.) - image = pkgs.fetchurl { - url = "https://images.unsplash.com/photo-1441974231531-c6227db76b6e?auto=format&fit=crop&w=2400&q=80"; - sha256 = lib.fakeSha256; # replace with real hash after first build - }; + base16Scheme = "${pkgs.base16-schemes}/share/themes/selenized-black.yaml"; - base16Scheme = nordYaml; - - # Choose light/dark behavior polarity = "dark"; fonts = { monospace = { - package = pkgs.jetbrains-mono; - name = "JetBrains Mono"; + package = pkgs.inconsolata; + name = "Inconsolata"; }; sansSerif = { package = pkgs.inter; @@ -36,37 +23,22 @@ in name = "Source Serif 4"; }; emoji = { - package = pkgs.noto-fonts-emoji; - name = "Noto Color Emoji"; + package = pkgs.noto-fonts-color-emoji; + name = "noto-fonts-color-emoji"; }; sizes = { - applications = 11; - terminal = 12; - desktop = 11; - popups = 11; + applications = 14; + terminal = 14; + desktop = 14; + popups = 14; }; }; cursor = { package = pkgs.bibata-cursors; name = "Bibata-Modern-Ice"; - size = 24; + size = 20; }; - - # Optional: global opacity hints some targets use - opacity = { - applications = 0.95; - terminal = 0.92; - popups = 0.95; - }; - - # Tell Stylix to actually theme these: - targets.sway.enable = true; - targets.waybar.enable = true; - - # Usually nice to have: - targets.gtk.enable = true; - targets.kitty.enable = true; # if you use kitty }; } diff --git a/hosts/common/workstation.nix b/hosts/common/workstation.nix index 1785ce7..f93633f 100644 --- a/hosts/common/workstation.nix +++ b/hosts/common/workstation.nix @@ -70,11 +70,4 @@ pkgs.via ]; # end systemPackages }; # end environment - - fonts = { - enableDefaultPackages = true; - packages = with pkgs; [ - inconsolata - ]; # end packages - }; # end fonts } #end file