From 88e63aaf7fd42713d9683ee831b6dc86f0e4e543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Sat, 29 Jun 2024 18:10:50 +0200 Subject: [PATCH] Update --- curacao/backup/default.nix | 10 ++-- flake.lock | 97 +++++++++++++++++--------------------- flake.nix | 4 +- hm/default.nix | 3 +- hm/theme/default.nix | 6 ++- os/style/default.nix | 1 + 6 files changed, 56 insertions(+), 65 deletions(-) diff --git a/curacao/backup/default.nix b/curacao/backup/default.nix index a1fec7a..ee2ef5c 100644 --- a/curacao/backup/default.nix +++ b/curacao/backup/default.nix @@ -28,11 +28,11 @@ in # cleanup hourly snapshots after some time TIMELINE_CLEANUP = true; TIMELINE_MIN_AGE = 1800; - TIMELINE_LIMIT_HOURLY = 24; - TIMELINE_LIMIT_DAILY = 31; - TIMELINE_LIMIT_WEEKLY = 8; - TIMELINE_LIMIT_MONTHLY = 0; - TIMELINE_LIMIT_YEARLY = 0; + TIMELINE_LIMIT_HOURLY = "24"; + TIMELINE_LIMIT_DAILY = "31"; + TIMELINE_LIMIT_WEEKLY = "8"; + TIMELINE_LIMIT_MONTHLY = "0"; + TIMELINE_LIMIT_YEARLY = "0"; # cleanup empty pre-post-pairs EMPTY_PRE_POST_CLEANUP = true; diff --git a/flake.lock b/flake.lock index 2508493..2f05083 100644 --- a/flake.lock +++ b/flake.lock @@ -123,11 +123,11 @@ ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1717177033, - "narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=", + "lastModified": 1719640067, + "narHash": "sha256-ZEJFGHnElbMH3JgnFANxOlJgniFamu9MemvHCMQZtpA=", "owner": "nix-community", "repo": "disko", - "rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c", + "rev": "423b86a7f756421325e71663ada79a199bf13408", "type": "github" }, "original": { @@ -225,11 +225,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -238,21 +238,6 @@ "type": "github" } }, - "flake-root": { - "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", - "owner": "srid", - "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -319,11 +304,11 @@ ] }, "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -378,11 +363,11 @@ ] }, "locked": { - "lastModified": 1716736833, - "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { @@ -399,15 +384,16 @@ ] }, "locked": { - "lastModified": 1717052710, - "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -441,11 +427,11 @@ ] }, "locked": { - "lastModified": 1716993688, - "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", + "lastModified": 1719128254, + "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", + "rev": "50581970f37f06a4719001735828519925ef8310", "type": "github" }, "original": { @@ -506,11 +492,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1717248095, - "narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=", + "lastModified": 1719647737, + "narHash": "sha256-OvX/qQQ33zyB5ReRzm+U5+9Hh6EeYxHdd21tXL3p/eY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7b49d3967613d9aacac5b340ef158d493906ba79", + "rev": "231274268ff2250d4730e274b808f66ef91b6381", "type": "github" }, "original": { @@ -520,11 +506,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "lastModified": 1719426051, + "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", "type": "github" }, "original": { @@ -570,7 +556,6 @@ "devshell": "devshell", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-root": "flake-root", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", @@ -580,15 +565,16 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1717255175, - "narHash": "sha256-MtsnAwzY2cmufUoFQvI/1mTzd3FKbZLCb8zF4jXkZLY=", + "lastModified": 1719657372, + "narHash": "sha256-3uCk0WXaUZPErNGUNCCbOg+DgZIjA6OgyqFYJwfZ4+0=", "owner": "nix-community", "repo": "nixvim", - "rev": "df3aa867137227bda9e44beab82a63443d700f18", + "rev": "5b94f0caddc9f406554701a214f879c75fb0ee60", "type": "github" }, "original": { "owner": "nix-community", + "ref": "nixos-24.05", "repo": "nixvim", "type": "github" } @@ -649,11 +635,11 @@ }, "nur": { "locked": { - "lastModified": 1717249505, - "narHash": "sha256-dprfeFpLbxOl4T8Len1+oXoJdPEjPldnHTeJIf86WXU=", + "lastModified": 1719665790, + "narHash": "sha256-fSlHsOBrI8SC/4jCojpHftwpwyhvf7WzvV5mBjOr7Aw=", "owner": "nix-community", "repo": "NUR", - "rev": "f267ad8addc9f5dd2cce435a2200146e6efc800e", + "rev": "a0498a771e9d6d3f66dba3bd166a9ebf3cc3cb8c", "type": "github" }, "original": { @@ -709,15 +695,16 @@ ] }, "locked": { - "lastModified": 1717212835, - "narHash": "sha256-fSNsRokB3YaTmJOcSdDzKJOFWq/bQ/FCoMGpF12sF5c=", + "lastModified": 1718122552, + "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", "owner": "danth", "repo": "stylix", - "rev": "266db7f00cad4a465e0ce43d91798fda10716212", + "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", "type": "github" }, "original": { "owner": "danth", + "ref": "release-24.05", "repo": "stylix", "type": "github" } @@ -760,11 +747,11 @@ ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1719243788, + "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8dab4dd..c91c36b 100644 --- a/flake.nix +++ b/flake.nix @@ -23,11 +23,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:danth/stylix"; # No 24.05 yet + url = "github:danth/stylix/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nixvim = { - url = "github:nix-community/nixvim"; # No 24.05 yet + url = "github:nix-community/nixvim/nixos-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nur.url = "github:nix-community/NUR"; diff --git a/hm/default.nix b/hm/default.nix index ed7bfce..63e76a4 100644 --- a/hm/default.nix +++ b/hm/default.nix @@ -1,4 +1,4 @@ -{ stylix, ... }: +{ ... }: { imports = [ ../common/frogarized @@ -21,7 +21,6 @@ ./rebuild ./shell ./ssh.nix - stylix.homeManagerModules.stylix ./theme ./tmux ./vim diff --git a/hm/theme/default.nix b/hm/theme/default.nix index 76463b1..adca936 100644 --- a/hm/theme/default.nix +++ b/hm/theme/default.nix @@ -1,7 +1,8 @@ -{ pkgs, config, lib, ... }: +{ pkgs, config, lib, stylix, ... }: { config = { stylix = { + enable = true; polarity = config.frogeye.polarity; fonts = { monospace = { @@ -13,4 +14,7 @@ }; }; }; + imports = [ + stylix.homeManagerModules.stylix + ]; } diff --git a/os/style/default.nix b/os/style/default.nix index 4c18755..0860599 100644 --- a/os/style/default.nix +++ b/os/style/default.nix @@ -6,6 +6,7 @@ initrd.systemd.enable = true; }; stylix = { + enable = true; homeManagerIntegration.autoImport = false; # Makes config reuse easier polarity = "dark"; targets.plymouth.logo = pkgs.runCommand "flower.png" { } "${pkgs.inkscape}/bin/inkscape ${pkgs.substituteAll {