panotaka/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tried fixing stylix

Browse Source
This commit is contained in:
Thomas Syms
2023-12-12 16:34:46 -04:00
parent 9d6220b6ad
commit f0fb1325c7
3 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
flake.lock generated
View File

@@ -189,11 +189,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701728041, "lastModified": 1702203126,
"narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -225,27 +225,26 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1701656485, "lastModified": 1702336390,
"narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=", "narHash": "sha256-BRO8J8QbmyuS0XMh4UfY11akgTGZj1YhkqNvR83JrsI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "fa194fc484fd7270ab324bb985593f71102e84d1", "rev": "fef05bf9c8e818f4ca1425ef4c18e6680becd072",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "master",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1701718080, "lastModified": 1702151865,
"narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -295,11 +294,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1701532764, "lastModified": 1702242258,
"narHash": "sha256-Jrizp/nITbul2HBIraQRDw5lyJnzTsj0K9wZUFYX2gg=", "narHash": "sha256-DSiwYD1DZY+YJALahnCVKacWk2AGy+s1pd3Z07tEF/U=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "17a452c5d58bb90057d49c7e3e613b5e6dc1c0f4", "rev": "b5ad31b710294038f9ed70efdf787db6a82d7327",
"type": "github" "type": "github"
}, },
"original": { "original": {

16
flake.nix
View File

@@ -4,7 +4,7 @@
inputs = { inputs = {
# System # System
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware";
disko.url = "github:nix-community/disko"; disko.url = "github:nix-community/disko";
disko.inputs.nixpkgs.follows = "nixpkgs"; disko.inputs.nixpkgs.follows = "nixpkgs";
@@ -15,7 +15,7 @@
# Theming # Theming
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
}; };
outputs = inputs@{ self, nixpkgs, home-manager, ... }: outputs = inputs@{ self, nixpkgs, stylix, home-manager, ... }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
@@ -26,6 +26,11 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
# Theme
stylix.nixosModules.stylix
./themes/targets/all.nix
./themes/sandstone-forest
./hosts/Equinox ./hosts/Equinox
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
@@ -34,12 +39,9 @@
home-manager.extraSpecialArgs = inputs; home-manager.extraSpecialArgs = inputs;
home-manager.users.panotaka = { home-manager.users.panotaka = {
imports = [ ./home ./home/shell ./home/desktop ./themes/targets/all.nix ./themes/sandstone-forest ]; imports = [ ./home ./home/shell ./home/desktop ];
}; };
} }
inputs.stylix.nixosModules.stylix
./themes/targets/all.nix
./themes/sandstone-forest
]; ];
}; };
@@ -58,7 +60,7 @@
imports = [ ./home ./home/shell ./home/desktop ]; imports = [ ./home ./home/shell ./home/desktop ];
}; };
} }
inputs.stylix.nixosModules.stylix stylix.nixosModules.stylix
./themes/targets/all.nix ./themes/targets/all.nix
./themes/spaceduck ./themes/spaceduck
]; ];

6
themes/targets/all.nix
View File

@@ -1,3 +1,9 @@
{ {
stylix.autoEnable = true; stylix.autoEnable = true;
home-manager.sharedModules = [
{
stylix.autoEnable = true;
}
];
} }