From bf83183e8b53d8059e963c06924acd995a221d0e Mon Sep 17 00:00:00 2001 From: albert Date: Sun, 2 Jul 2023 21:47:52 +0900 Subject: [PATCH] Test --- flake.lock | 16 ---------------- flake.nix | 2 +- users/albert/dconf.nix | 3 ++- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 8c3c5b3b..5c13e537 100644 --- a/flake.lock +++ b/flake.lock @@ -122,21 +122,6 @@ "type": "github" } }, - "master-nixpkgs": { - "locked": { - "lastModified": 1688295725, - "narHash": "sha256-26bkoN3iHEKwvBojQKBAIjnzBpxVYTkgHz5lCFMB9y0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0e7a61c903290abde9503d5976b1d299d9329327", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "master", - "type": "indirect" - } - }, "moz_overlay": { "locked": { "lastModified": 1687771476, @@ -250,7 +235,6 @@ "inputs": { "home-manager": "home-manager", "lanzaboote": "lanzaboote", - "master-nixpkgs": "master-nixpkgs", "moz_overlay": "moz_overlay", "nur": "nur", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index 091162fb..45d5a646 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,7 @@ # Declare a generic configuration using the $hostname variable: ${hostname} = lib.nixosSystem { inherit system; - specialArgs = { inherit master; }; + specialArgs = { inherit unstable; }; modules = [ # Configuration Imports ./hosts/${hostname}/hardware-configuration.nix # Hardware Configuration diff --git a/users/albert/dconf.nix b/users/albert/dconf.nix index 0563be19..d4a420f5 100644 --- a/users/albert/dconf.nix +++ b/users/albert/dconf.nix @@ -131,7 +131,8 @@ with lib.hm.gvariant; }; "org/gnome/gnome-system-monitor" = { - cpu-colors = [ (mkTuple [ mkUint32 0 "#e6194B" ]) (mkTuple [ 1 "#f58231" ]) (mkTuple [ 2 "#ffe119" ]) (mkTuple [ 3 "#bfef45" ]) (mkTuple [ 4 "#3cb44b" ]) (mkTuple [ 5 "#42d4f4" ]) (mkTuple [ 6 "#4363d8" ]) (mkTuple [ 7 "#911eb4" ]) (mkTuple [ 8 "#f032e6" ]) (mkTuple [ 9 "#fabebe" ]) (mkTuple [ 10 "#ffd8b1" ]) (mkTuple [ 11 "#fffac8" ]) (mkTuple [ 12 "#aaffc3" ]) (mkTuple [ 13 "#469990" ]) (mkTuple [ 14 "#000075" ]) (mkTuple [ 15 "#e6beff" ]) (mkTuple [ 16 "#d4867999f332" ]) (mkTuple [ 17 "#7999f332b10b" ]) (mkTuple [ 18 "#f3328d907999" ]) (mkTuple [ 19 "#7999891df332" ]) ]; + # This breaks dconf.nix import for some reason.. + # cpu-colors = [ (mkTuple [ mkUint32 0 "#e6194B" ]) (mkTuple [ 1 "#f58231" ]) (mkTuple [ 2 "#ffe119" ]) (mkTuple [ 3 "#bfef45" ]) (mkTuple [ 4 "#3cb44b" ]) (mkTuple [ 5 "#42d4f4" ]) (mkTuple [ 6 "#4363d8" ]) (mkTuple [ 7 "#911eb4" ]) (mkTuple [ 8 "#f032e6" ]) (mkTuple [ 9 "#fabebe" ]) (mkTuple [ 10 "#ffd8b1" ]) (mkTuple [ 11 "#fffac8" ]) (mkTuple [ 12 "#aaffc3" ]) (mkTuple [ 13 "#469990" ]) (mkTuple [ 14 "#000075" ]) (mkTuple [ 15 "#e6beff" ]) (mkTuple [ 16 "#d4867999f332" ]) (mkTuple [ 17 "#7999f332b10b" ]) (mkTuple [ 18 "#f3328d907999" ]) (mkTuple [ 19 "#7999891df332" ]) ]; current-tab = "disks"; maximized = false; network-total-in-bits = false;