diff --git a/.editorconfig b/.editorconfig index 613d5c37..e814d0f4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,6 +6,7 @@ end_of_line = lf indent_style = space insert_final_newline = true trim_trailing_whitespace = true +charset = unset [*.{diff,patch}] end_of_line = unset diff --git a/flake.lock b/flake.lock index fbcfb39f..c958f4d5 100644 --- a/flake.lock +++ b/flake.lock @@ -141,16 +141,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 71522852..bd5791b7 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Theming framework for NixOS, Home Manager, nix-darwin, and Nix-on-Droid"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; flake-parts = { url = "github:hercules-ci/flake-parts"; diff --git a/flake/dev/flake.lock b/flake/dev/flake.lock index 9470a471..bf7de24a 100644 --- a/flake/dev/flake.lock +++ b/flake/dev/flake.lock @@ -22,16 +22,16 @@ }, "dev-nixpkgs": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -97,15 +97,16 @@ ] }, "locked": { - "lastModified": 1765172714, - "narHash": "sha256-/cjofqGxSWpRj2XJM+Bd5VUgWDkBWSxxO//HE+zOHMY=", + "lastModified": 1765859973, + "narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7887340779d5e70ef68012f3823568ee59eaa30", + "rev": "7df150f0d3857cf68dae443813b27acfb201b2d8", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -139,15 +140,16 @@ ] }, "locked": { - "lastModified": 1764764672, - "narHash": "sha256-BZN3w7AYQlXLKBK/FXu8K/tVTXxVsk/pAwEl6aAyxhE=", + "lastModified": 1764755396, + "narHash": "sha256-f6UrlGdwg+TIxxyDjeq1M7WGNZH/vpbOm0yzPgkMy9c=", "owner": "nix-community", "repo": "nixvim", - "rev": "8c9ba3b5d85cb985ab7372abf11af1954df15e4a", + "rev": "64d9e2616f4ee2acee380d61ccf1f3d610e7e969", "type": "github" }, "original": { "owner": "nix-community", + "ref": "nixos-25.11", "repo": "nixvim", "type": "github" } diff --git a/flake/dev/flake.nix b/flake/dev/flake.nix index 85e2b837..c85db98a 100644 --- a/flake/dev/flake.nix +++ b/flake/dev/flake.nix @@ -120,7 +120,7 @@ # # [1]: https://github.com/NixOS/nix/blob/d4f67fd46dfe2bc950bdfa14273f87b8a4c32e47/doc/manual/source/release-notes/rl-2.26.md?plain=1#L3-L11 inputs = { - dev-nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + dev-nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; dev-flake-parts = { url = "github:hercules-ci/flake-parts"; @@ -142,12 +142,12 @@ }; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "dev-nixpkgs"; }; nixvim = { - url = "github:nix-community/nixvim"; + url = "github:nix-community/nixvim/nixos-25.11"; inputs = { flake-parts.follows = "dev-flake-parts"; nixpkgs.follows = "dev-nixpkgs"; diff --git a/modules/vivid/hm.nix b/modules/vivid/hm.nix deleted file mode 100644 index c9172957..00000000 --- a/modules/vivid/hm.nix +++ /dev/null @@ -1,177 +0,0 @@ -{ mkTarget, ... }: -mkTarget { - config = - { colors }: - let - theme = "stylix"; - in - { - programs.vivid = { - activeTheme = theme; - themes.${theme} = { - colors = { - inherit (colors) - base00 - base01 - base02 - base03 - base04 - base05 - base06 - base07 - base08 - base09 - base0A - base0B - base0C - base0D - base0E - base0F - ; - }; - - core = { - normal_text.foreground = "base04"; - - reset_to_normal = { - background = "base00"; - foreground = "base04"; - font-style = "regular"; - }; - - # File Types - - regular_file.foreground = "base04"; - - directory = { - foreground = "base0F"; - font-style = "bold"; - }; - - multi_hard_link = { - foreground = "base0C"; - font-style = "underline"; - }; - - symlink.foreground = "base0C"; - broken_symlink.foreground = "base08"; - - missing_symlink_target = { - background = "base08"; - foreground = "base05"; - font-style = "bold"; - }; - - fifo = { - foreground = "base07"; - font-style = [ - "bold" - "underline" - ]; - }; - - character_device.foreground = "base0A"; - - block_device = { - foreground = "base0A"; - font-style = "underline"; - }; - - door = { - foreground = "base0A"; - font-style = "italic"; - }; - - socket = { - foreground = "base0A"; - font-style = "bold"; - }; - - # File Permissions - - executable_file = { - foreground = "base07"; - font-style = "bold"; - }; - - file_with_capability = { - foreground = "base04"; - font-style = [ - "bold" - "underline" - ]; - }; - - setuid = { - foreground = "base04"; - font-style = [ - "bold" - "underline" - ]; - }; - - setgid = { - foreground = "base04"; - font-style = [ - "bold" - "underline" - ]; - }; - - sticky = { - background = "base0F"; - foreground = "base05"; - font-style = "underline"; - }; - - other_writable = { - background = "base0F"; - foreground = "base05"; - font-style = "bold"; - }; - - sticky_other_writable = { - background = "base0F"; - foreground = "base05"; - font-style = [ - "bold" - "underline" - ]; - }; - }; - - # Document Types - - archives = { - foreground = "base05"; - font-style = "bold"; - }; - - executable = { - foreground = "base07"; - font-style = "bold"; - }; - - markup = { - foreground = "base06"; - web.foreground = "base04"; - }; - - media = { - foreground = "base0E"; - fonts.foreground = "base04"; - }; - - office.foreground = "base0B"; - - programming = { - source.foreground = "base07"; - tooling.foreground = "base04"; - }; - - text.foreground = "base04"; - unimportant.foreground = "base03"; - }; - }; - }; -} diff --git a/modules/vivid/meta.nix b/modules/vivid/meta.nix deleted file mode 100644 index d1d05ebf..00000000 --- a/modules/vivid/meta.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ lib, ... }: -{ - name = "vivid"; - homepage = "https://github.com/sharkdp/vivid"; - maintainers = [ lib.maintainers.arunoruto ]; -} diff --git a/modules/vivid/testbeds/vivid.nix b/modules/vivid/testbeds/vivid.nix deleted file mode 100644 index e3fc5626..00000000 --- a/modules/vivid/testbeds/vivid.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, pkgs, ... }: -let - package = pkgs.vivid; -in -{ - stylix.testbed.ui.command = { - text = "${lib.getExe pkgs.lsd} --all --long --recursive flake-parts/"; - useTerminal = true; - }; - - home-manager.sharedModules = lib.singleton { - programs.vivid = { - enable = true; - inherit package; - }; - }; -} diff --git a/stylix/release.nix b/stylix/release.nix index c24109c7..b8414db2 100644 --- a/stylix/release.nix +++ b/stylix/release.nix @@ -3,7 +3,7 @@ options.stylix = { release = lib.mkOption { description = "The version of NixOS that Stylix is built to support"; - default = "26.05"; + default = "25.11"; internal = true; readOnly = true; };