diff --git a/flake.lock b/flake.lock index 16dfdd9..ae8662a 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -113,6 +113,22 @@ "type": "github" } }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -132,12 +148,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -213,14 +232,14 @@ "type": "github" } }, - "kitty-themes": { + "kitty-themes-src": { "flake": false, "locked": { - "lastModified": 1669518372, - "narHash": "sha256-PGV/iPg7nFW8RMEMJbt1oGcAzTaS3u6I+sCpIDrx7ic=", + "lastModified": 1678282211, + "narHash": "sha256-heJayOz/2Bey/zAwL2PR1OsfGyCPqMyxT1XzwHLhQ0w=", "owner": "kovidgoyal", "repo": "kitty-themes", - "rev": "4d309e984b81dd120d7a697abe4f817da6f3cfe5", + "rev": "c01fcbd694353507c3cc7f657179bad1f32140a7", "type": "github" }, "original": { @@ -231,22 +250,22 @@ }, "nix-rice": { "inputs": { + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", - "kitty-themes": "kitty-themes", + "kitty-themes-src": "kitty-themes-src", "nixpkgs-lib": "nixpkgs-lib", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1672653036, - "narHash": "sha256-cifbZXl/fM+SBY5bN+jujMZEV+HolB3J2ja4K1RwzXA=", + "lastModified": 1682952592, + "narHash": "sha256-1qXvqCxnWpk0ELdpmS2OMDu047gvl166CGBm+sfi8oo=", "owner": "bertof", "repo": "nix-rice", - "rev": "ac810023c1bb3d999ab4295ea4eb261412f4b7c0", + "rev": "dddd03ed3c5e05c728b0df985f7af905b002f588", "type": "github" }, "original": { "owner": "bertof", - "ref": "v0.3.1", "repo": "nix-rice", "type": "github" } @@ -304,11 +323,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1671271357, - "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", + "lastModified": 1681303793, + "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "40f79f003b6377bd2f4ed4027dde1f8f922995dd", + "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc", "type": "github" }, "original": { @@ -320,11 +339,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1671929364, - "narHash": "sha256-N9GW06FZTKDpkv9YLMXswUxnX27b9qEtfTg7WsSdXjc=", + "lastModified": 1681001314, + "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a909f7a2fb4ec6d14d52b8a727bb9ba465e15766", + "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", "type": "github" }, "original": { @@ -335,16 +354,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1671271954, - "narHash": "sha256-cSvu+bnvN08sOlTBWbBrKaBHQZq8mvk8bgpt0ZJ2Snc=", + "lastModified": 1678872516, + "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d513b448cc2a6da2c8803e3c197c9fc7e67b19e3", + "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } @@ -399,7 +418,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-utils": [ "nix-rice", "flake-utils" @@ -409,11 +428,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1672050129, - "narHash": "sha256-GBQMcvJUSwAVOpDjVKzB6D5mmHI7Y4nFw+04bnS9QrM=", + "lastModified": 1682596858, + "narHash": "sha256-Hf9XVpqaGqe/4oDGr30W8HlsWvJXtMsEPHDqHZA6dDg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "67d98f02443b9928bc77f1267741dcfdd3d7b65c", + "rev": "fb58866e20af98779017134319b5663b8215d912", "type": "github" }, "original": { @@ -424,7 +443,7 @@ }, "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": [ "flake-utils" ], @@ -477,6 +496,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1667395993, diff --git a/flake.nix b/flake.nix index 702542b..f55c627 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; deploy-rs = { url = "github:serokell/deploy-rs"; inputs = { nixpkgs.follows = "nixpkgs"; }; }; flake-utils.url = "github:numtide/flake-utils"; - nix-rice = { url = "github:bertof/nix-rice/v0.3.1"; }; + nix-rice.url = "github:bertof/nix-rice"; nixos-generators = { url = "github:nix-community/nixos-generators"; inputs = { nixpkgs.follows = "nixpkgs"; }; }; nixos-hardware.url = "github:NixOS/nixos-hardware"; pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; }; }; diff --git a/hm_modules/helix.nix b/hm_modules/helix.nix index da72e0c..d3f4c22 100644 --- a/hm_modules/helix.nix +++ b/hm_modules/helix.nix @@ -18,7 +18,7 @@ # config = { nil = { formatting = { command = "nixpkgs-fmt"; }; }; }; }]; settings = { - theme = "ayu_mirage"; + theme = "nightfox"; editor = { lsp.display-messages = true; lsp.display-inlay-hints = true; diff --git a/rice.nix b/rice.nix index 3ba129c..962b717 100644 --- a/rice.nix +++ b/rice.nix @@ -1,6 +1,6 @@ self: super: with super.lib.nix-rice; -let theme = kitty-themes.getThemeByName "ayu_mirage"; +let theme = kitty-themes.getThemeByName "Nightfox"; in { rice = { colorPalette = rec {