Compare commits
No commits in common. "a455d2cd07c653440f481f08c5dbdac058317fb4" and "9f935b75e9727337665afdfbf9043077cbb5ec0c" have entirely different histories.
a455d2cd07
...
9f935b75e9
103
flake.lock
generated
103
flake.lock
generated
@ -10,11 +10,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723293904,
|
||||
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
|
||||
"lastModified": 1722339003,
|
||||
"narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
|
||||
"rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -43,11 +43,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723405438,
|
||||
"narHash": "sha256-bpmC2m7OhlDvqgQZdZ2jBLyeIkq/Jld3X4bqRAxBSp8=",
|
||||
"lastModified": 1722347739,
|
||||
"narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "9312aa28271c91e5d67ecb9def527b2bbcff0e66",
|
||||
"rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -157,15 +157,15 @@
|
||||
"base16-vim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1722597040,
|
||||
"narHash": "sha256-F4XRYPXhN47vwBQWPhWS5mBRNNwrgZ+n+n2WsRSh+vQ=",
|
||||
"owner": "tinted-theming",
|
||||
"lastModified": 1663659192,
|
||||
"narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=",
|
||||
"owner": "chriskempson",
|
||||
"repo": "base16-vim",
|
||||
"rev": "5a200412c9856085ce726beb4c14c47326c19700",
|
||||
"rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "tinted-theming",
|
||||
"owner": "chriskempson",
|
||||
"repo": "base16-vim",
|
||||
"type": "github"
|
||||
}
|
||||
@ -371,11 +371,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723399884,
|
||||
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
|
||||
"lastModified": 1722630065,
|
||||
"narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "086f619dd991a4d355c07837448244029fc2d9ab",
|
||||
"rev": "afc892db74d65042031a093adb6010c4c3378422",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -421,11 +421,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722623071,
|
||||
"narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
|
||||
"lastModified": 1721330371,
|
||||
"narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprcursor",
|
||||
"rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
|
||||
"rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -469,11 +469,11 @@
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723738578,
|
||||
"narHash": "sha256-TLkmHk6xWEUGpLci1QNyWRC7VFqocgBat2gl1gVXpY4=",
|
||||
"lastModified": 1722773977,
|
||||
"narHash": "sha256-AqSmHptledo4Tp+hrHWovGR+e//bejR458sRmhq+jT4=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "12d9901472c6f9128fa8b16c25b3a879d1859e60",
|
||||
"revCount": 5095,
|
||||
"rev": "5dd2c27b631f16e49a2c6e6cbbefba9fa50bf543",
|
||||
"revCount": 5050,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland"
|
||||
@ -606,11 +606,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722869141,
|
||||
"narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=",
|
||||
"lastModified": 1722098849,
|
||||
"narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "0252fd13e78e60fb0da512a212e56007515a49f7",
|
||||
"rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -686,11 +686,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723352546,
|
||||
"narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
|
||||
"lastModified": 1722740924,
|
||||
"narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
|
||||
"rev": "97ca0a0fca0391de835f57e44f369a283e37890f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -708,11 +708,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723769240,
|
||||
"narHash": "sha256-8u6lV2alO1cj8/+2Ua/sFnJ0fm+hwVW8xvLlLd1uFAo=",
|
||||
"lastModified": 1722559629,
|
||||
"narHash": "sha256-BDnSIH6Ccd09MNmYY1N+rxBPN0zSSH5+9WkXN4K8rqE=",
|
||||
"owner": "Silveere",
|
||||
"repo": "nix-minecraft",
|
||||
"rev": "e7e395d07bb008f9d4b4e0007fd4045b8b1e5261",
|
||||
"rev": "9f98a05b4e3f75a001b5f94da400d689157b48cb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -731,11 +731,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723772202,
|
||||
"narHash": "sha256-e8nH/JfdW4OuaYcNnnRKaeB9fPRdCO3y4I3KzhXgE8k=",
|
||||
"lastModified": 1722562463,
|
||||
"narHash": "sha256-LctuHlTmJPqQna/3F10v4eNE8/KYh2bu0naEwalJ73o=",
|
||||
"owner": "infinidoge",
|
||||
"repo": "nix-minecraft",
|
||||
"rev": "77d0ca95f039e4e28f9b64c3f042c574d26a88e2",
|
||||
"rev": "6c5e8f138e4ba944f423850148651e00589dde73",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -753,11 +753,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723124175,
|
||||
"narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=",
|
||||
"lastModified": 1722253092,
|
||||
"narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690",
|
||||
"rev": "f373ad59ae5866f0f98216bd5c71526b373450d2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -791,11 +791,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1723637854,
|
||||
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
|
||||
"lastModified": 1722185531,
|
||||
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
|
||||
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -823,11 +823,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1723703277,
|
||||
"narHash": "sha256-nk0RaUB5f68BwtXAYy3WAjqFhVKqIl9Z89RGycTa2vk=",
|
||||
"lastModified": 1722640603,
|
||||
"narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8b908192e64224420e2d59dfd9b2e4309e154c5d",
|
||||
"rev": "81610abc161d4021b29199aa464d6a1a521e0cc9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -855,11 +855,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1723556749,
|
||||
"narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=",
|
||||
"lastModified": 1722519197,
|
||||
"narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4a92571f9207810b559c9eac203d1f4d79830073",
|
||||
"rev": "05405724efa137a0b899cce5ab4dde463b4fd30b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -899,11 +899,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723774846,
|
||||
"narHash": "sha256-m53hVat6XXiKooV1oUDEMnPcdNKqSn/kAW+g8juSq84=",
|
||||
"lastModified": 1722738111,
|
||||
"narHash": "sha256-cWD5pCs9AYb+512/yCx9D0Pl5KcmyuXHeJpsDw/D1vs=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "519f4892641bc04a6ac7c2d260cc68356f9ae90f",
|
||||
"rev": "27ec296d93cb4b2d03e8cbd019b1b4cde8c34280",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -931,15 +931,16 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722946882,
|
||||
"narHash": "sha256-mxtnMye8gs82tdQbVC+g6v3aPOZlH150f9WyntHIkTg=",
|
||||
"lastModified": 1716384443,
|
||||
"narHash": "sha256-utea2y5nEwzMM9rWJXDN0qmV4tJjRcMERQEcgk/ng00=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "5853f1a8bd072f2ebabfc3de3973084353cf6f1e",
|
||||
"rev": "e8e3304c2f8cf2ca60dcfc736a7422af2f24b8a8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "danth",
|
||||
"ref": "e8e3304c2f8cf2ca60dcfc736a7422af2f24b8a8",
|
||||
"repo": "stylix",
|
||||
"type": "github"
|
||||
}
|
||||
|
||||
@ -70,7 +70,7 @@
|
||||
};
|
||||
|
||||
stylix = {
|
||||
url = "github:danth/stylix";
|
||||
url = "github:danth/stylix?ref=e8e3304c2f8cf2ca60dcfc736a7422af2f24b8a8";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.home-manager.follows = "home-manager";
|
||||
};
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.nixfiles.theming;
|
||||
mkDefaultStylix = lib.mkOverride 999;
|
||||
|
||||
toCaps = s: with lib.strings; with builtins;
|
||||
(toUpper (substring 0 1 s)) + toLower (substring 1 ((stringLength s)-1) s);
|
||||
@ -81,9 +80,9 @@ in {
|
||||
enable = true;
|
||||
autoEnable = true;
|
||||
cursor = {
|
||||
package = mkDefaultStylix ctp.packages.cursors;
|
||||
name = mkDefaultStylix ctp.names.cursors;
|
||||
size = mkDefaultStylix 24;
|
||||
package = lib.mkDefault ctp.packages.cursors;
|
||||
name = lib.mkDefault ctp.names.cursors;
|
||||
size = lib.mkDefault 24;
|
||||
# x11.enable = lib.mkDefault true;
|
||||
# gtk.enable = lib.mkDefault true;
|
||||
};
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
# Home Manager default nixfiles entrypoint. This serves as an alternative to
|
||||
# default.nix, which sets up some more appropriate options for home-manager
|
||||
{ inputs, pkgs, config, lib, ... }:
|
||||
{ pkgs, config, lib, ... }:
|
||||
{
|
||||
imports = [
|
||||
./.
|
||||
inputs.stylix.homeManagerModules.stylix
|
||||
];
|
||||
config = {
|
||||
# bash is more common on my standalone machines for some reason (low
|
||||
|
||||
@ -1,11 +1,10 @@
|
||||
{ pkgs, lib, config, inputs, ... }@args:
|
||||
{
|
||||
imports = [ ];
|
||||
imports = [ inputs.stylix.homeManagerModules.stylix ];
|
||||
config = {
|
||||
stylix = lib.mkMerge [
|
||||
{
|
||||
targets.vim.enable = lib.mkDefault false;
|
||||
targets.neovim.enable = lib.mkDefault false;
|
||||
targets.gtk.enable = lib.mkDefault false;
|
||||
targets.fzf.enable = lib.mkDefault false;
|
||||
# the ring is styled light so it's light on light which looks worse than the default theme
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
nixfiles: final: prev:
|
||||
let
|
||||
pkgsStable = import nixfiles.inputs.nixpkgs.outPath { inherit (prev) system; };
|
||||
updateTime = nixfiles.inputs.nixpkgs-unstable.lastModified;
|
||||
|
||||
inherit (final) lib callPackage fetchFromGitHub;
|
||||
inherit (lib) recurseIntoAttrs optionalAttrs
|
||||
versionOlder versionAtLeast;
|
||||
@ -38,11 +35,6 @@ in {
|
||||
then (final.python3Packages.toPythonApplication pkgs-y.python3Packages.yt-dlp)
|
||||
else prev.yt-dlp;
|
||||
|
||||
easyeffects = let
|
||||
stable = pkgsStable.easyeffects;
|
||||
unstable = prev.easyeffects;
|
||||
in if updateTime < 1726148749 then stable else unstable;
|
||||
|
||||
redlib = let
|
||||
redlib-new = final.callPackage nixfiles.packages.${prev.system}.redlib.override {};
|
||||
inherit (prev) redlib;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
# this naming is confusing as shit
|
||||
# this enables color theming of things by stylix
|
||||
autoEnable = lib.mkDefault config.stylix.enable;
|
||||
# this enables the entire module. keep this off by default.
|
||||
# this enables installation of fonts/images/etc
|
||||
enable = lib.mkDefault false;
|
||||
|
||||
# an image i like
|
||||
@ -22,7 +22,8 @@
|
||||
# use system config in home-manager
|
||||
followSystem = lib.mkDefault true;
|
||||
|
||||
autoImport = lib.mkDefault true;
|
||||
# I will manually import within home-manager so it works standalone
|
||||
autoImport = lib.mkDefault false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user