From c54c59b01246494f23d21ac8d7f4c7eeceb5fcff Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Mon, 18 Nov 2024 10:48:27 +0300 Subject: [PATCH] Switch to releases for HM, NoD and Stylix. --- flake.lock | 271 ++++++++++++++++---------------------------- flake.nix | 23 +++- package/default.nix | 2 +- 3 files changed, 118 insertions(+), 178 deletions(-) diff --git a/flake.lock b/flake.lock index 10be0dfa..daf67646 100644 --- a/flake.lock +++ b/flake.lock @@ -34,14 +34,30 @@ "type": "github" } }, + "base16-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "base16-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-foot", + "type": "github" + } + }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1725860795, - "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", + "lastModified": 1696727917, + "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", + "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", "type": "github" }, "original": { @@ -50,18 +66,50 @@ "type": "github" } }, - "base16-vim": { + "base16-kitty": { "flake": false, "locked": { - "lastModified": 1716150083, - "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "owner": "kdrag0n", + "repo": "base16-kitty", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "type": "github" + }, + "original": { + "owner": "kdrag0n", + "repo": "base16-kitty", + "type": "github" + } + }, + "base16-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "repo": "base16-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", "type": "github" }, "original": { "owner": "tinted-theming", + "repo": "base16-tmux", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1663659192, + "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", + "owner": "chriskempson", + "repo": "base16-vim", + "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "type": "github" + }, + "original": { + "owner": "chriskempson", "repo": "base16-vim", "type": "github" } @@ -100,27 +148,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": [ - "stylix", - "systems" - ] - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -161,36 +188,16 @@ ] }, "locked": { - "lastModified": 1731604581, - "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", + "lastModified": 1732319136, + "narHash": "sha256-wpmPl6FkAF9Jj5C/rzANgpUjfzQrUYOn267LnzKU2uI=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "f8831cc700030e11fc91da9ef6270593e6440edc", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -289,11 +296,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731675559, - "narHash": "sha256-PTkplFzbwCc3zq2tQTrKBgPkGh7WC1wMjPTam0c1Gm0=", + "lastModified": 1732326197, + "narHash": "sha256-BMGM/uj8Ph3pTKd8utQOzUFs+Un0YLj3STDC2QSqMgw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8874a5ae6f8009a4a37b99e1a3578e5a9ddf35bf", + "rev": "618c7a6a0f3b52af3ccd399fd417b0d6e5cb8060", "type": "github" }, "original": { @@ -353,11 +360,11 @@ }, "nixpkgsMaster": { "locked": { - "lastModified": 1731687255, - "narHash": "sha256-SBh3x2Ibd8hqK0g2+Eh0rlptPRHM1r+KInDKf+XQsu4=", + "lastModified": 1732334126, + "narHash": "sha256-hi1lllCOk1CDhCTZXVdsGuEHhcwVENheD4aGTZqiW2s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "549d6d35f848811811a9dc92a389b9aa9b6c5213", + "rev": "a112c12b61f8f8a9b7951f8f3485fd618f11edde", "type": "github" }, "original": { @@ -369,11 +376,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -399,22 +406,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1731531548, - "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "24f0d4acd634792badd6470134c387a3b039dace", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nmd": { "flake": false, "locked": { @@ -552,11 +543,11 @@ "nvimDevicons": { "flake": false, "locked": { - "lastModified": 1728608318, - "narHash": "sha256-SUWEOp+QcfHjYaqqr4Zwvh0x91IAJXvrdMkQtuWMlGc=", + "lastModified": 1732225809, + "narHash": "sha256-PvQ6Q4+08uf4gVH5tsVRB+7AuDSubDUUbPiUDyNAbzc=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "19d257cf889f79f4022163c3fbb5e08639077bd8", + "rev": "f09be61d05bebcba85bb47be1931322d51b95644", "type": "github" }, "original": { @@ -584,11 +575,11 @@ "nvimGen": { "flake": false, "locked": { - "lastModified": 1730968406, - "narHash": "sha256-QM7DCO27rLk5NcPeD4YJcSj5QVohXU4eHJnvhwAuOHg=", + "lastModified": 1731840444, + "narHash": "sha256-OHWipqYGW8SiYqZBjh71cQ44mU6sN3AbJ89tlfeN414=", "owner": "David-Kunz", "repo": "gen.nvim", - "rev": "c9dd401ec4d9e98a4f06d5c090464e126129a3b2", + "rev": "488a745cd17a3dd6fc5280d66b3322b55118b28d", "type": "github" }, "original": { @@ -616,11 +607,11 @@ "nvimGruvboxMaterial": { "flake": false, "locked": { - "lastModified": 1727690770, - "narHash": "sha256-Ux4HlkNdPxyK8E+f9sqcCeGr0/6iC2mdGuwk6PjsZjY=", + "lastModified": 1731919897, + "narHash": "sha256-qErvjgqqWaCFeC9rdKQIRoHPhIew7GLxoXXYcqUVlI0=", "owner": "sainnhe", "repo": "gruvbox-material", - "rev": "b16dcd787db5ba9302b54ebeac186784c2aed29a", + "rev": "170148af9350f578f3623f810e54698fa1e5bdbf", "type": "github" }, "original": { @@ -648,11 +639,11 @@ "nvimLspconfig": { "flake": false, "locked": { - "lastModified": 1731651852, - "narHash": "sha256-enldOaHszQH7fUxUEWFNcWedH9zatrNp/Dh7vHGBz/o=", + "lastModified": 1732268459, + "narHash": "sha256-6KGLT//JZrj/9fz21ZykGTQaSs+qawZxLcwx2rUx9ao=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "87c7c83ce62971e0bdb29bb32b8ad2b19c8f95d0", + "rev": "c646154d6e4db9b2979eeb517d0b817ad00c9c47", "type": "github" }, "original": { @@ -712,11 +703,11 @@ "nvimTree": { "flake": false, "locked": { - "lastModified": 1731275826, - "narHash": "sha256-YIClwxyw4fNos5OIBZOjM0dlCw+yOhDDnq5jONSu7rs=", + "lastModified": 1732230767, + "narHash": "sha256-ME4xs1FcBu07hURfeDUuoIkr7qBhw7lJccYJNdZQ7og=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "28eac2801b201f301449e976d7a9e8cfde053ba3", + "rev": "1f3ffd6af145af2a4930a61c50f763264922c3fe", "type": "github" }, "original": { @@ -728,11 +719,11 @@ "nvimTreesitter": { "flake": false, "locked": { - "lastModified": 1731661756, - "narHash": "sha256-hLc/4JeU1Gc59jaOqn8wgCPGZG+9jMR08bi2Y7oTIwQ=", + "lastModified": 1732315699, + "narHash": "sha256-0Y1e/kGagxyDvej3+kMLvFjOfpNxnq6SRe6L9u4x62U=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "13c7caf8a602488b37cdefe8543c4cfdd5947d9d", + "rev": "28a5dc06a842459964203c41a7aac91a77feff20", "type": "github" }, "original": { @@ -831,28 +822,31 @@ "inputs": { "base16": "base16", "base16-fish": "base16-fish", + "base16-foot": "base16-foot", "base16-helix": "base16-helix", + "base16-kitty": "base16-kitty", + "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_3", - "systems": "systems_3", - "tinted-foot": "tinted-foot", - "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1731657386, - "narHash": "sha256-Mm/JL8tFUS1SOmmZDPcswExUxzw0VpHcEyZI1h58CGA=", + "lastModified": 1718122552, + "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", "owner": "danth", "repo": "stylix", - "rev": "5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f", + "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", "type": "github" }, "original": { "owner": "danth", + "ref": "release-24.05", "repo": "stylix", "type": "github" } @@ -886,71 +880,6 @@ "type": "indirect" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, - "tinted-kitty": { - "flake": false, - "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", - "type": "github" - } - }, - "tinted-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "tinted-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-tmux", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 94c27d0c..d047d227 100644 --- a/flake.nix +++ b/flake.nix @@ -1,19 +1,17 @@ { inputs = { + # SOURCE: https://github.com/NixOS/nixpkgs nixpkgs.url = "github:nixos/nixpkgs/release-24.11"; nixpkgsUnstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgsMaster.url = "github:nixos/nixpkgs/master"; - stylix.url = "github:danth/stylix"; - - nixpkgsJobber.url = "github:nixos/nixpkgs/051f920625ab5aabe37c920346e3e69d7d34400e"; - poetry2nixJobber.url = "github:nix-community/poetry2nix/304f8235fb0729fd48567af34fcd1b58d18f9b95"; - + # SOURCE: https://github.com/nix-community/home-manager home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + # SOURCE: https://github.com/nix-community/nix-on-droid nix-on-droid = { url = "github:t184256/nix-on-droid/release-24.05"; inputs = { @@ -22,11 +20,24 @@ }; }; + # SOURCE: https://github.com/LilleAila/nix-cursors nix-cursors = { url = "github:LilleAila/nix-cursors"; inputs.nixpkgs.follows = "nixpkgs"; }; + # SOURCE: https://github.com/danth/stylix + stylix = { + url = "github:danth/stylix/release-24.05"; + inputs = { + home-manager.follows = "home-manager"; + nixpkgs.follows = "nixpkgs"; + }; + }; + + nixpkgsJobber.url = "github:nixos/nixpkgs/051f920625ab5aabe37c920346e3e69d7d34400e"; + poetry2nixJobber.url = "github:nix-community/poetry2nix/304f8235fb0729fd48567af34fcd1b58d18f9b95"; + nvimAlign = { flake = false; url = "github:echasnovski/mini.align"; }; nvimAutoclose = { flake = false; url = "github:m4xshen/autoclose.nvim"; }; nvimBufferline = { flake = false; url = "github:akinsho/bufferline.nvim"; }; diff --git a/package/default.nix b/package/default.nix index 764fae73..73c7229c 100644 --- a/package/default.nix +++ b/package/default.nix @@ -147,7 +147,7 @@ anilibria-winmaclinux # Anime! appimage-run # Tool to run .AppImage files in NixOS. blanket # Sounds generator. - # calibre # Book library manager. + calibre # Book library manager. cbonsai # Draw trees. cmatrix # CLI Screensavers. cowsay # Cow quotes.