Compare commits
3 commits
ac36661d4e
...
8bfd76f23c
| Author | SHA1 | Date | |
|---|---|---|---|
| 8bfd76f23c | |||
| b123ab87df | |||
| 6adbd2d38c |
4 changed files with 63 additions and 346 deletions
297
flake.lock
generated
297
flake.lock
generated
|
|
@ -25,20 +25,14 @@
|
||||||
},
|
},
|
||||||
"catppuccin": {
|
"catppuccin": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"catppuccin-v1_1": "catppuccin-v1_1",
|
"nixpkgs": "nixpkgs"
|
||||||
"catppuccin-v1_2": "catppuccin-v1_2",
|
|
||||||
"home-manager": "home-manager_2",
|
|
||||||
"home-manager-stable": "home-manager-stable",
|
|
||||||
"nixpkgs": "nixpkgs",
|
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
|
||||||
"nuscht-search": "nuscht-search"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736957255,
|
"lastModified": 1737579274,
|
||||||
"narHash": "sha256-qZZ/K5XheRMjCNYgle90QESuys0PIFJNPJJswMJ0GEA=",
|
"narHash": "sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw=",
|
||||||
"owner": "catppuccin",
|
"owner": "catppuccin",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "f06fcadf9a61b6581b392e72f230fa6783fe36e4",
|
"rev": "06f0ea19334bcc8112e6d671fd53e61f9e3ad63a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -63,42 +57,14 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"catppuccin-v1_1": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1734055249,
|
|
||||||
"narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=",
|
|
||||||
"rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7",
|
|
||||||
"revCount": 326,
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"catppuccin-v1_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1734734291,
|
|
||||||
"narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=",
|
|
||||||
"rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8",
|
|
||||||
"revCount": 344,
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.1/0193e646-1107-7f69-a402-f2a3988ecf1d/source.tar.gz"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"eza-themes": {
|
"eza-themes": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736468386,
|
"lastModified": 1737730475,
|
||||||
"narHash": "sha256-K9k+jE27kK8PlN6BbTfMLhCagnWCc6CIO1lkqvWl9fE=",
|
"narHash": "sha256-d+bbjgI1JrOGenqZ2aIRK8itkTUV2L4L3vtEN9tEgf8=",
|
||||||
"owner": "eza-community",
|
"owner": "eza-community",
|
||||||
"repo": "eza-themes",
|
"repo": "eza-themes",
|
||||||
"rev": "266feb8d373ac201bd28d7522e4e65cb2865f082",
|
"rev": "a99a5f1bbb5fec2c0bfa945ec8e2aabcb6f24d71",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -164,24 +130,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_3": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_4"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731533236,
|
|
||||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flakey-profile": {
|
"flakey-profile": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712898590,
|
"lastModified": 1712898590,
|
||||||
|
|
@ -233,28 +181,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager-stable": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"catppuccin",
|
|
||||||
"nixpkgs-stable"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1736373539,
|
|
||||||
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"ref": "release-24.11",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager-unstable": {
|
"home-manager-unstable": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -262,11 +188,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737120639,
|
"lastModified": 1738275749,
|
||||||
"narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=",
|
"narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "a0046af169ce7b1da503974e1b22c48ef4d71887",
|
"rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -276,27 +202,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager_2": {
|
"home-manager_2": {
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"catppuccin",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1736508663,
|
|
||||||
"narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager_3": {
|
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs-raw"
|
"nixpkgs-raw"
|
||||||
|
|
@ -317,34 +222,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ixx": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": [
|
|
||||||
"catppuccin",
|
|
||||||
"nuscht-search",
|
|
||||||
"flake-utils"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"catppuccin",
|
|
||||||
"nuscht-search",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1729958008,
|
|
||||||
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
|
|
||||||
"owner": "NuschtOS",
|
|
||||||
"repo": "ixx",
|
|
||||||
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NuschtOS",
|
|
||||||
"ref": "v0.0.6",
|
|
||||||
"repo": "ixx",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"jovian": {
|
"jovian": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nix-github-actions": "nix-github-actions",
|
"nix-github-actions": "nix-github-actions",
|
||||||
|
|
@ -353,11 +230,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737126697,
|
"lastModified": 1737617533,
|
||||||
"narHash": "sha256-k1YhjONkiKBHzbjNy4ZsjysBac5UJSolCVq9cTKLeKM=",
|
"narHash": "sha256-9hHaUxeRDZ5PTk7TqBbHPAjgKuBl67asaMdyehYLqFs=",
|
||||||
"owner": "Jovian-Experiments",
|
"owner": "Jovian-Experiments",
|
||||||
"repo": "Jovian-NixOS",
|
"repo": "Jovian-NixOS",
|
||||||
"rev": "27a0ddac1a14e10ba98530f59db728951495f2ce",
|
"rev": "2dd65c3c92a4b8b1bf653657ae8648b883a4d427",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -369,11 +246,11 @@
|
||||||
"lix": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737086202,
|
"lastModified": 1738295316,
|
||||||
"narHash": "sha256-33tcNERQt1R7tr/W7pvQj8R6NJktyTOKMIfY16RHLK8=",
|
"narHash": "sha256-i6dSbuPQXv3iqARBqxL0tIbSZw4Rq5UuoVrI9a8vjV0=",
|
||||||
"rev": "0d14c2b67a407825e3427bf079b31de069d9653a",
|
"rev": "e529074cb2c21e66c300806ebf6bf03abcd681b3",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/0d14c2b67a407825e3427bf079b31de069d9653a.tar.gz?rev=0d14c2b67a407825e3427bf079b31de069d9653a"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e529074cb2c21e66c300806ebf6bf03abcd681b3.tar.gz?rev=e529074cb2c21e66c300806ebf6bf03abcd681b3"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
|
@ -382,7 +259,7 @@
|
||||||
},
|
},
|
||||||
"lix-module": {
|
"lix-module": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils",
|
||||||
"flakey-profile": "flakey-profile",
|
"flakey-profile": "flakey-profile",
|
||||||
"lix": [
|
"lix": [
|
||||||
"lix"
|
"lix"
|
||||||
|
|
@ -392,11 +269,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733522213,
|
"lastModified": 1738176840,
|
||||||
"narHash": "sha256-H+Pk19MzvI/TAbXWimUPZAoKkD56OSyxJBm8lVIA5n0=",
|
"narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=",
|
||||||
"rev": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea",
|
"rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c374ebf5548c7b6d4bf884369a5b6879cfc916ea.tar.gz?rev=c374ebf5548c7b6d4bf884369a5b6879cfc916ea"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/621aae0f3cceaffa6d73a4fb0f89c08d338d729e.tar.gz?rev=621aae0f3cceaffa6d73a4fb0f89c08d338d729e"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
|
@ -405,7 +282,7 @@
|
||||||
},
|
},
|
||||||
"lix-module-unstable": {
|
"lix-module-unstable": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_2",
|
||||||
"flakey-profile": "flakey-profile_2",
|
"flakey-profile": "flakey-profile_2",
|
||||||
"lix": [
|
"lix": [
|
||||||
"lix"
|
"lix"
|
||||||
|
|
@ -415,11 +292,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733522213,
|
"lastModified": 1738176840,
|
||||||
"narHash": "sha256-H+Pk19MzvI/TAbXWimUPZAoKkD56OSyxJBm8lVIA5n0=",
|
"narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=",
|
||||||
"rev": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea",
|
"rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c374ebf5548c7b6d4bf884369a5b6879cfc916ea.tar.gz?rev=c374ebf5548c7b6d4bf884369a5b6879cfc916ea"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/621aae0f3cceaffa6d73a4fb0f89c08d338d729e.tar.gz?rev=621aae0f3cceaffa6d73a4fb0f89c08d338d729e"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
|
@ -428,11 +305,11 @@
|
||||||
},
|
},
|
||||||
"nix-flatpak": {
|
"nix-flatpak": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736952876,
|
"lastModified": 1738175805,
|
||||||
"narHash": "sha256-dJXuLP2CBkIG333L+Rb3e1D0oXHYbl0MgmKPGuvFuAI=",
|
"narHash": "sha256-fPjaARmK522JLJ7wxFebxG4eE/3HHSmuAA78iAZ+A7g=",
|
||||||
"owner": "gmodena",
|
"owner": "gmodena",
|
||||||
"repo": "nix-flatpak",
|
"repo": "nix-flatpak",
|
||||||
"rev": "b6966d5fa96b0fae99a4da0b5bdfbb0a75f5c058",
|
"rev": "d4c75a33c4a7a16bf87cfd804fb5444a1ec53d49",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -466,11 +343,11 @@
|
||||||
},
|
},
|
||||||
"nix-impermanence": {
|
"nix-impermanence": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736688610,
|
"lastModified": 1737831083,
|
||||||
"narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=",
|
"narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "impermanence",
|
"repo": "impermanence",
|
||||||
"rev": "c64bed13b562fc3bb454b48773d4155023ac31b7",
|
"rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -486,11 +363,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736652904,
|
"lastModified": 1737861961,
|
||||||
"narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
|
"narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
|
"rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -506,11 +383,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736652904,
|
"lastModified": 1737861961,
|
||||||
"narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
|
"narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
|
"rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -521,11 +398,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736978406,
|
"lastModified": 1737751639,
|
||||||
"narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=",
|
"narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "b678606690027913f3434dea3864e712b862dde5",
|
"rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -553,11 +430,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-raw": {
|
"nixpkgs-raw": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736916166,
|
"lastModified": 1738163270,
|
||||||
"narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=",
|
"narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e24b4c09e963677b1beea49d411cd315a024ad3a",
|
"rev": "59e618d90c065f55ae48446f307e8c09565d5ab0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -566,29 +443,13 @@
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1736061677,
|
|
||||||
"narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-24.11",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-unstable-raw": {
|
"nixpkgs-unstable-raw": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737062831,
|
"lastModified": 1738142207,
|
||||||
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
|
"narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
|
"rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -599,11 +460,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736883708,
|
"lastModified": 1738142207,
|
||||||
"narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
|
"narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
|
"rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -632,11 +493,11 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737147292,
|
"lastModified": 1738308670,
|
||||||
"narHash": "sha256-y5ALxyA2en4I81mwdeJgatg0u/SWi0LMAv+uakJ9czE=",
|
"narHash": "sha256-88WNLo6WdYmlO5u+1vaVRIakliO0B9hiNxBEMTZ9yOM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "a55bbc7cf3f8772ef6274a32520ce117f32f9d0e",
|
"rev": "a75432a6ffa9ca5af9f885194b64e0d4ad10b96b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -645,29 +506,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nuscht-search": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils",
|
|
||||||
"ixx": "ixx",
|
|
||||||
"nixpkgs": [
|
|
||||||
"catppuccin",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1735854821,
|
|
||||||
"narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=",
|
|
||||||
"owner": "NuschtOS",
|
|
||||||
"repo": "search",
|
|
||||||
"rev": "836908e3bddd837ae0f13e215dd48767aee355f0",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NuschtOS",
|
|
||||||
"repo": "search",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"plasma-manager": {
|
"plasma-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": [
|
"home-manager": [
|
||||||
|
|
@ -697,7 +535,7 @@
|
||||||
"catppuccin": "catppuccin",
|
"catppuccin": "catppuccin",
|
||||||
"catppuccin-konsole": "catppuccin-konsole",
|
"catppuccin-konsole": "catppuccin-konsole",
|
||||||
"eza-themes": "eza-themes",
|
"eza-themes": "eza-themes",
|
||||||
"home-manager": "home-manager_3",
|
"home-manager": "home-manager_2",
|
||||||
"home-manager-unstable": "home-manager-unstable",
|
"home-manager-unstable": "home-manager-unstable",
|
||||||
"jovian": "jovian",
|
"jovian": "jovian",
|
||||||
"lix": "lix",
|
"lix": "lix",
|
||||||
|
|
@ -738,11 +576,11 @@
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737914989,
|
"lastModified": 1738235282,
|
||||||
"narHash": "sha256-9rOs5bFZ3BQb3SgGn0dF3fCdVQZ0Zdr9nj2LhO+t5uc=",
|
"narHash": "sha256-UpKVpjZwlse6aFNuke9J0AvQtnDNs8yLZqoDd5W2WWw=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "be97a926ce75b9fbe278e4ba519e9273c238316c",
|
"rev": "b4eae5b0b39934e558dac957da7feaa5e21d183c",
|
||||||
"revCount": 13,
|
"revCount": 21,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://forgejo@git.everest.tailscale:4222/Toast/shows-api.git"
|
"url": "ssh://forgejo@git.everest.tailscale:4222/Toast/shows-api.git"
|
||||||
},
|
},
|
||||||
|
|
@ -811,21 +649,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_5": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"treefmt-nix": {
|
"treefmt-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -849,7 +672,7 @@
|
||||||
},
|
},
|
||||||
"utils": {
|
"utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_5"
|
"systems": "systems_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731533236,
|
"lastModified": 1731533236,
|
||||||
|
|
|
||||||
|
|
@ -100,9 +100,7 @@
|
||||||
nixpkgs-unstable-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches {
|
nixpkgs-unstable-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches {
|
||||||
name = "patched-nixpkgs-unstable";
|
name = "patched-nixpkgs-unstable";
|
||||||
src = nixpkgs-unstable-raw;
|
src = nixpkgs-unstable-raw;
|
||||||
patches = [
|
patches = [];
|
||||||
./nixpkgs-patches/update-hhd.patch
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
nixpkgs-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches {
|
nixpkgs-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches {
|
||||||
name = "patched-nixpkgs";
|
name = "patched-nixpkgs";
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,8 @@
|
||||||
# Plymouth doesn't support fractional scaling :(
|
# Plymouth doesn't support fractional scaling :(
|
||||||
plymouth.extraConfig = "DeviceScale=2";
|
plymouth.extraConfig = "DeviceScale=2";
|
||||||
|
|
||||||
kernelPackages = pkgs.linuxPackages_latest;
|
# kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
# Commented out since bmi-260 doesn't compile for 6.13
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.hostName = "WinMax2"; # Define your hostname.
|
networking.hostName = "WinMax2"; # Define your hostname.
|
||||||
|
|
|
||||||
|
|
@ -1,105 +0,0 @@
|
||||||
From 32d076a87fa6611f62e050047442564b27d36bc1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Toast <39011842+toast003@users.noreply.github.com>
|
|
||||||
Date: Tue, 14 Jan 2025 10:18:45 +0100
|
|
||||||
Subject: [PATCH] handheld-daemon: 3.9.0 -> 3.10.2
|
|
||||||
|
|
||||||
---
|
|
||||||
.../0001-remove-selinux-fixes.patch | 37 +++++++++++++++++++
|
|
||||||
pkgs/by-name/ha/handheld-daemon/package.nix | 22 +++++++++--
|
|
||||||
2 files changed, 55 insertions(+), 4 deletions(-)
|
|
||||||
create mode 100644 pkgs/by-name/ha/handheld-daemon/0001-remove-selinux-fixes.patch
|
|
||||||
|
|
||||||
diff --git a/pkgs/by-name/ha/handheld-daemon/0001-remove-selinux-fixes.patch b/pkgs/by-name/ha/handheld-daemon/0001-remove-selinux-fixes.patch
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000000..2fe3ae78a1a47
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/pkgs/by-name/ha/handheld-daemon/0001-remove-selinux-fixes.patch
|
|
||||||
@@ -0,0 +1,37 @@
|
|
||||||
+diff --git a/src/hhd/plugins/power/power.py b/src/hhd/plugins/power/power.py
|
|
||||||
+index 5ece857..be41542 100644
|
|
||||||
+--- a/src/hhd/plugins/power/power.py
|
|
||||||
++++ b/src/hhd/plugins/power/power.py
|
|
||||||
+@@ -79,12 +79,6 @@ def create_subvol():
|
|
||||||
+ )
|
|
||||||
+ return
|
|
||||||
+
|
|
||||||
+- # Fixup selinux for swap
|
|
||||||
+- subprocess.run(
|
|
||||||
+- ["semanage", "fcontext", "-a", "-t", "var_t", HHD_SWAP_SUBVOL],
|
|
||||||
+- )
|
|
||||||
+- subprocess.run(["restorecon", HHD_SWAP_SUBVOL])
|
|
||||||
+-
|
|
||||||
+ logger.info(f"Creating swap subvolume {HHD_SWAP_SUBVOL}")
|
|
||||||
+ os.system(f"btrfs subvolume create {HHD_SWAP_SUBVOL}")
|
|
||||||
+
|
|
||||||
+@@ -153,19 +147,6 @@ def create_temporary_swap():
|
|
||||||
+ subprocess.run(["chmod", "600", HHD_SWAP_FILE], check=True)
|
|
||||||
+ subprocess.run(["mkswap", HHD_SWAP_FILE], check=True)
|
|
||||||
+
|
|
||||||
+- # Fixup selinux for swap
|
|
||||||
+- subprocess.run(
|
|
||||||
+- [
|
|
||||||
+- "semanage",
|
|
||||||
+- "fcontext",
|
|
||||||
+- "-a",
|
|
||||||
+- "-t",
|
|
||||||
+- "swapfile_t",
|
|
||||||
+- HHD_SWAP_FILE,
|
|
||||||
+- ],
|
|
||||||
+- )
|
|
||||||
+- subprocess.run(["restorecon", HHD_SWAP_FILE])
|
|
||||||
+-
|
|
||||||
+ # Enable swap
|
|
||||||
+ subprocess.run(["swapon", HHD_SWAP_FILE], check=True)
|
|
||||||
+
|
|
||||||
diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
|
|
||||||
index 1c11cd3b59b28..aad4a57e50c22 100644
|
|
||||||
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
|
|
||||||
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
|
|
||||||
@@ -11,19 +11,25 @@
|
|
||||||
efibootmgr,
|
|
||||||
dbus,
|
|
||||||
lsof,
|
|
||||||
+ btrfs-progs,
|
|
||||||
+ util-linux,
|
|
||||||
}:
|
|
||||||
python3Packages.buildPythonApplication rec {
|
|
||||||
pname = "handheld-daemon";
|
|
||||||
- version = "3.9.0";
|
|
||||||
+ version = "3.10.2";
|
|
||||||
pyproject = true;
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "hhd-dev";
|
|
||||||
repo = "hhd";
|
|
||||||
tag = "v${version}";
|
|
||||||
- hash = "sha256-y3CxdWqQEwdNYs4m1NEUeRjTvvhEpS5S739wyFlluWo=";
|
|
||||||
+ hash = "sha256-6BjXqqNe2u/rh1cnuJ13L/1KimprcyatIr53b0GOBSM=";
|
|
||||||
};
|
|
||||||
|
|
||||||
+ # Handheld-daemon runs some selinux-related utils which are not in nixpkgs.
|
|
||||||
+ # NixOS doesn't support selinux so we can safely remove them
|
|
||||||
+ patches = [ ./0001-remove-selinux-fixes.patch ];
|
|
||||||
+
|
|
||||||
# This package relies on several programs expected to be on the user's PATH.
|
|
||||||
# We take a more reproducible approach by patching the absolute path to each of these required
|
|
||||||
# binaries.
|
|
||||||
@@ -41,8 +47,16 @@ python3Packages.buildPythonApplication rec {
|
|
||||||
substituteInPlace src/hhd/controller/physical/imu.py \
|
|
||||||
--replace-fail '"modprobe' '"${lib.getExe' kmod "modprobe"}'
|
|
||||||
|
|
||||||
- substituteInPlace src/hhd/plugins/overlay/power.py \
|
|
||||||
- --replace-fail '"efibootmgr"' '"${lib.getExe' efibootmgr "id"}"'
|
|
||||||
+ substituteInPlace src/hhd/plugins/power/power.py \
|
|
||||||
+ --replace-fail '"efibootmgr"' '"${lib.getExe' efibootmgr "id"}"' \
|
|
||||||
+ --replace-fail '"systemctl"' '"${lib.getExe' systemd "systemctl"}"' \
|
|
||||||
+ --replace-fail '"stat"' '"${lib.getExe' coreutils "stat"}"' \
|
|
||||||
+ --replace-fail '"swapon"' '"${lib.getExe' util-linux "swapon"}"' \
|
|
||||||
+ --replace-fail '"swapoff"' '"${lib.getExe' util-linux "swapoff"}"' \
|
|
||||||
+ --replace-fail '"fallocate"' '"${lib.getExe' util-linux "fallocate"}"' \
|
|
||||||
+ --replace-fail '"chmod"' '"${lib.getExe' coreutils "chmod"}"' \
|
|
||||||
+ --replace-fail '"mkswap"' '"${lib.getExe' util-linux "mkswap"}"' \
|
|
||||||
+ --replace-fail '"btrfs",' '"${lib.getExe' btrfs-progs "btrfs"}",'
|
|
||||||
|
|
||||||
substituteInPlace src/hhd/device/oxp/serial.py \
|
|
||||||
--replace-fail "udevadm" "${lib.getExe' systemd "udevadm"}"
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue