From 8d77e96d8990d27e80c09de33c71745ef8540ff9 Mon Sep 17 00:00:00 2001 From: atagen Date: Fri, 8 Aug 2025 17:00:13 +1000 Subject: [PATCH] begin hjem migration, bump flake --- assets/LICENSE | 3 + common/cli.nix | 18 +-- common/nix/settings.nix | 4 +- flake.lock | 273 +++++++++++++++++++-------------- graphical/audio-control.nix | 2 +- graphical/chat.nix | 4 - graphical/dev.nix | 88 +++++------ graphical/documents.nix | 2 +- graphical/fm.nix | 2 +- graphical/media.nix | 2 +- graphical/password-manager.nix | 2 +- graphical/platform-themes.nix | 2 +- graphical/rice.nix | 3 +- graphical/terminal.nix | 68 +++++--- util/create.nix | 5 +- 15 files changed, 260 insertions(+), 218 deletions(-) create mode 100644 assets/LICENSE diff --git a/assets/LICENSE b/assets/LICENSE new file mode 100644 index 0000000..df574d5 --- /dev/null +++ b/assets/LICENSE @@ -0,0 +1,3 @@ +all logos contained herein are property of their respective entities +i don't own them or claim to +cheers diff --git a/common/cli.nix b/common/cli.nix index 68d1ef7..4ce328e 100644 --- a/common/cli.nix +++ b/common/cli.nix @@ -1,6 +1,5 @@ { pkgs, - userPkgs, ... }: { @@ -11,7 +10,7 @@ git ; }; - hm.home.packages = builtins.attrValues { + home.packages = builtins.attrValues { inherit (pkgs) btop bat @@ -23,19 +22,4 @@ ouch ; }; - programs.yazi = { - enable = true; - plugins = { - inherit (pkgs.yaziPlugins) - lazygit - chmod - diff - mediainfo - smart-enter - full-border - wl-clipboard - ; - fr = pkgs.callPackage userPkgs.fr-yazi { }; - }; - }; } diff --git a/common/nix/settings.nix b/common/nix/settings.nix index a436d62..5118c49 100644 --- a/common/nix/settings.nix +++ b/common/nix/settings.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ pkgs, inputs, ... }: { imports = [ inputs.lix-module.nixosModules.default @@ -23,4 +23,6 @@ system.nixos.tags = [ "fatcock-xxl" ]; home-manager.useGlobalPkgs = true; + + hjem.linker = pkgs.smfh; } diff --git a/flake.lock b/flake.lock index 2eac3a8..381694a 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1752904518, - "narHash": "sha256-ZlkXcU2VcMc/Za2EyGEOcaixehlWSrGqDJwXSLE5CCo=", + "lastModified": 1754065275, + "narHash": "sha256-OYT3YIb5PB0Wjhc39+hDf7urVbTzJAcdlHEgku3dGyU=", "owner": "linyinfeng", "repo": "angrr", - "rev": "ab5d8b56bf41910fb808e491f2f340c84132a5f1", + "rev": "1f5492c0588ab364f3d5297c2d280fe2b58592c5", "type": "github" }, "original": { @@ -40,11 +40,11 @@ }, "arbys": { "locked": { - "lastModified": 1753316914, - "narHash": "sha256-HVT2JNM8op5hfDBSrIarL9GaKxQjkeQr2gf7CB6hQqk=", + "lastModified": 1754615787, + "narHash": "sha256-s5gpN0E8V0gBiZ2mkoUhl17y62N98IDTOg6AeM/rU44=", "ref": "refs/heads/meats", - "rev": "ef34e2314b84b732618274c1940423ae19ebdf5e", - "revCount": 3, + "rev": "60ff6e4dc0a4e24f8f65342d09d50129e39e1963", + "revCount": 5, "type": "git", "url": "https://git.atagen.co/atagen/arbys" }, @@ -55,11 +55,11 @@ }, "crane": { "locked": { - "lastModified": 1752859226, - "narHash": "sha256-Vk9qUd0pCkyJZiSDRxJBEDkxEr8CNcwBtuFuZr/HYNc=", + "lastModified": 1753316655, + "narHash": "sha256-tzWa2kmTEN69OEMhxFy+J2oWSvZP5QhEgXp3TROOzl0=", "owner": "ipetkov", "repo": "crane", - "rev": "126943a6f7b7c6535c0348fe3ba472c3b19f0e20", + "rev": "f35a3372d070c9e9ccb63ba7ce347f0634ddf3d2", "type": "github" }, "original": { @@ -87,6 +87,29 @@ "url": "https://git.atagen.co/atagen/culr" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "niri-tag", + "naersk", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1752475459, + "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=", + "owner": "nix-community", + "repo": "fenix", + "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -142,11 +165,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "type": "github" }, "original": { @@ -286,11 +309,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1753376980, - "narHash": "sha256-h7Say1U7r1ke3mfg3yvbzYnk3izmJ2g1zXzX5APNA8Q=", + "lastModified": 1754613249, + "narHash": "sha256-v62rsM5v2jFLNx9Wga/8C7kSSZaMKzPovRGEMiswtU4=", "owner": "helix-editor", "repo": "helix", - "rev": "4281228da35b02b0dcca3b4772b93d48d79ce046", + "rev": "18572973e6332101810169668894a99261bcd96b", "type": "github" }, "original": { @@ -307,11 +330,11 @@ "smfh": "smfh" }, "locked": { - "lastModified": 1752303056, - "narHash": "sha256-LzojKFWAAreWyH56aupj/MLwuPPnnyzplw/xdbavC9c=", + "lastModified": 1754244549, + "narHash": "sha256-ByZ81/QttgSS1mQYttnaoMw2WnqMvQ6HCxBPOioKrOA=", "owner": "feel-co", "repo": "hjem", - "rev": "3093a74542b30f8155954d585d0ae2401e3adbe5", + "rev": "ee5c671eeba5cddd94f2c7de3c36f019fae5854e", "type": "github" }, "original": { @@ -327,11 +350,11 @@ ] }, "locked": { - "lastModified": 1753387274, - "narHash": "sha256-Y1hAI9h+9DLBbgKvZBsHaeptFIcRw4iC6ySPmzyqmlM=", + "lastModified": 1754613544, + "narHash": "sha256-ueR1mGX4I4DWfDRRxxMphbKDNisDeMPMusN72VV1+cc=", "owner": "nix-community", "repo": "home-manager", - "rev": "a35f6b60430ff0c7803bd2a727df84c87569c167", + "rev": "cc2fa2331aebf9661d22bb507d362b39852ac73f", "type": "github" }, "original": { @@ -348,11 +371,11 @@ ] }, "locked": { - "lastModified": 1753282444, - "narHash": "sha256-QGeWgozKiGBTJrLYnXd9xwOY9HKsm4cFHsU8fopGVnU=", + "lastModified": 1754575993, + "narHash": "sha256-0ut8TM76DeMnexgwNyMx2c5flhp4IPtqQ79XR0hpmY0=", "owner": "nix-community", "repo": "home-manager", - "rev": "62975b8e23c4e39599b3303f6e76faa280a02c63", + "rev": "d8a475e179888553b6863204a93295da6ee13eb4", "type": "github" }, "original": { @@ -389,11 +412,11 @@ ] }, "locked": { - "lastModified": 1753257349, - "narHash": "sha256-Zb4528e94DwdUC0rKIX1+EFtkoelggWQakZ/YKemqJ4=", + "lastModified": 1754110197, + "narHash": "sha256-N7GWK2084EsNdwzwg6FCIgMrSau1WwzxGSNdPHx5Tak=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e89a3203fbb3a833d7b7777efc13697b6a962cfd", + "rev": "04ce5c103eb621220d69102bc0ee27c3abd89204", "type": "github" }, "original": { @@ -421,11 +444,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1753372565, - "narHash": "sha256-C6hTlYrguEZzc02JDAsht0i/wxAxgqvv2MGhJrHzNbw=", - "rev": "e88a85bd928afe02adaaea254eecde44d59c769d", + "lastModified": 1754569551, + "narHash": "sha256-P+WiN95OjCqHhfygglS/VOFTSj7qNdL5XQDo2wxhQqg=", + "rev": "8bbd5e1d0df9c31b4d86ba07bc85beb952e42ccb", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e88a85bd928afe02adaaea254eecde44d59c769d.tar.gz?rev=e88a85bd928afe02adaaea254eecde44d59c769d" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8bbd5e1d0df9c31b4d86ba07bc85beb952e42ccb.tar.gz?rev=8bbd5e1d0df9c31b4d86ba07bc85beb952e42ccb" }, "original": { "type": "tarball", @@ -477,14 +500,15 @@ }, "naersk": { "inputs": { + "fenix": "fenix", "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1751923969, - "narHash": "sha256-QNo234SxSB2lLavaT2d+g+Z2WB7o7w29vYkM6zfRLi4=", + "lastModified": 1752689277, + "narHash": "sha256-uldUBFkZe/E7qbvxa3mH1ItrWZyT6w1dBKJQF/3ZSsc=", "owner": "nix-community", "repo": "naersk", - "rev": "0473954e399eec0081ee816f3430c17d1f7e5a42", + "rev": "0e72363d0938b0208d6c646d10649164c43f4d64", "type": "github" }, "original": { @@ -518,11 +542,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1752799399, - "narHash": "sha256-Uy2qzd+fMoBcp4NPSO7DavEC1pGMegmAqoEMvmXbIQU=", + "lastModified": 1753661392, + "narHash": "sha256-fK4INnIJQNAA8cyjcDRZSPleA+N/STI6I0oBDMZ2r+E=", "owner": "oxalica", "repo": "nil", - "rev": "524ae2d67dd84d99a10f409ed6cd8e4e7b3cae3f", + "rev": "cd7a6f6d5dc58484e62a8e85677e06e47cf2bd4d", "type": "github" }, "original": { @@ -541,11 +565,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1753374784, - "narHash": "sha256-R6vHaUJiehdXSnzZqCOxmtmAnHA4GBOpS/UKydzAI38=", + "lastModified": 1754593792, + "narHash": "sha256-ufYmw5vGCUuMdLb8A4MkDKzaXUqlReu7A0wn9EbQ5do=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "da95771a65821bc98118cf3478eb2fc6fbfe035a", + "rev": "e76792be7533a57d1420b9cdfe3efa4690a650f0", "type": "github" }, "original": { @@ -564,11 +588,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable_2" }, "locked": { - "lastModified": 1752057206, - "narHash": "sha256-f8fNAag3K3WAq+lJr2EEu2f3xVSFLPddLgJKZRzXa3M=", + "lastModified": 1753374784, + "narHash": "sha256-R6vHaUJiehdXSnzZqCOxmtmAnHA4GBOpS/UKydzAI38=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "90c2edcf32d0fcb511fee9a0b8c580a18178c109", + "rev": "da95771a65821bc98118cf3478eb2fc6fbfe035a", "type": "github" }, "original": { @@ -619,11 +643,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1752060407, - "narHash": "sha256-3TmD23aCu7dnIxYGnRekDZhB4lvNFoB6MZlPjc8+ouA=", + "lastModified": 1753421223, + "narHash": "sha256-SfZZvJCH1pGkhwMPxLjo+D0C6TWhrZzkgkyngxlk4os=", "ref": "refs/heads/main", - "rev": "ae0b5e0f637d9e0798bb4c4e29b7736ecc0476a0", - "revCount": 35, + "rev": "51c0486748face3d31784f92b2ee330e78740b32", + "revCount": 36, "type": "git", "url": "https://git.atagen.co/atagen/niri-tag" }, @@ -635,11 +659,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1752870529, - "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=", + "lastModified": 1754589971, + "narHash": "sha256-gu0lWJbDkHs6+V9KHXwQHtZ2Hp72FxOjy3YisJ3qj9k=", "owner": "YaLTeR", "repo": "niri", - "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2", + "rev": "f74d83dccaa6e8fffb38c304dd5d1eae07b87d24", "type": "github" }, "original": { @@ -651,11 +675,11 @@ "niri-unstable_2": { "flake": false, "locked": { - "lastModified": 1750791124, - "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=", + "lastModified": 1752870529, + "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=", "owner": "YaLTeR", "repo": "niri", - "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c", + "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2", "type": "github" }, "original": { @@ -692,11 +716,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1752985182, - "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=", + "lastModified": 1754195341, + "narHash": "sha256-YL71IEf2OugH3gmAsxQox6BJI0KOcHKtW2QqT/+s2SA=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c", + "rev": "b7fcd4e26d67fca48e77de9b0d0f954b18ae9562", "type": "github" }, "original": { @@ -760,11 +784,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1753939845, + "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "94def634a20494ee057c76998843c015909d6311", "type": "github" }, "original": { @@ -821,11 +845,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1753345091, - "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", + "lastModified": 1754292888, + "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", + "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", "type": "github" }, "original": { @@ -837,11 +861,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1751943650, - "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88983d4b665fb491861005137ce2b11a9f89f203", + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "type": "github" }, "original": { @@ -869,11 +893,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1751949589, - "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", + "lastModified": 1752077645, + "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b008d60392981ad674e04016d25619281550a9d", + "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", "type": "github" }, "original": { @@ -885,11 +909,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { @@ -901,11 +925,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1751949589, - "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", + "lastModified": 1753369216, + "narHash": "sha256-Jx2i6loWL755GD+GlCXESMhIiO0aFc/pDo82N16fEiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b008d60392981ad674e04016d25619281550a9d", + "rev": "b74a30dbc0a72e20df07d43109339f780b439291", "type": "github" }, "original": { @@ -917,11 +941,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1753939845, + "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "94def634a20494ee057c76998843c015909d6311", "type": "github" }, "original": { @@ -964,11 +988,11 @@ }, "nixpkgs_16": { "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { @@ -980,11 +1004,11 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { @@ -1108,11 +1132,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { @@ -1131,11 +1155,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1753363396, - "narHash": "sha256-orjQhGQK2Q41pDk0wltZW+FT0a5zufxSqsT95A8lwYI=", + "lastModified": 1754597469, + "narHash": "sha256-XdVdXIU23qFcE1fdMVaaGhFSdVRGHjBXcRh/KHO9jqQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a37600ce98428a6c364a08c62be3333840e50041", + "rev": "adaeec6210ede1cdc71c5d65c89c8161490a9e64", "type": "github" }, "original": { @@ -1152,11 +1176,11 @@ ] }, "locked": { - "lastModified": 1753402503, - "narHash": "sha256-cc1seYNwhhk9f74NpJSFRmQFjDzXInq66/dSVs2eK4Y=", + "lastModified": 1753595452, + "narHash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=", "ref": "refs/heads/master", - "rev": "4dad44757085a42423f758bf0177cebcd07b4a4a", - "revCount": 656, + "rev": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda", + "revCount": 665, "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell.git" }, @@ -1189,6 +1213,23 @@ "quickshell": "quickshell" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1752428706, + "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "591e3b7624be97e4443ea7b5542c191311aa141d", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1240,11 +1281,11 @@ ] }, "locked": { - "lastModified": 1753238793, - "narHash": "sha256-jmQeEpgX+++MEgrcikcwoSiI7vDZWLP0gci7XiWb9uQ=", + "lastModified": 1754575663, + "narHash": "sha256-afOx8AG0KYtw7mlt6s6ahBBy7eEHZwws3iCRoiuRQS4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0ad7ab4ca8e83febf147197e65c006dff60623ab", + "rev": "6db0fb0e9cec2e9729dc52bf4898e6c135bb8a0f", "type": "github" }, "original": { @@ -1359,11 +1400,11 @@ ] }, "locked": { - "lastModified": 1752055615, - "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", + "lastModified": 1754061284, + "narHash": "sha256-ONcNxdSiPyJ9qavMPJYAXDNBzYobHRxw0WbT38lKbwU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", + "rev": "58bd4da459f0a39e506847109a2a5cfceb837796", "type": "github" }, "original": { @@ -1426,6 +1467,22 @@ } }, "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1754533920, + "narHash": "sha256-fCZ68Yud1sUCq6UNXj0SDyiBgVA8gJUE+14ZFGsFJG8=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "e0d1dad25a158551ab58547b2ece4b7d5a19929c", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable_2": { "flake": false, "locked": { "lastModified": 1752338000, @@ -1440,22 +1497,6 @@ "repo": "xwayland-satellite", "type": "github" } - }, - "xwayland-satellite-unstable_2": { - "flake": false, - "locked": { - "lastModified": 1751228685, - "narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "type": "github" - } } }, "root": "root", diff --git a/graphical/audio-control.nix b/graphical/audio-control.nix index 57a2e8c..3c7111c 100644 --- a/graphical/audio-control.nix +++ b/graphical/audio-control.nix @@ -4,7 +4,7 @@ ... }: { - hm.home.packages = builtins.attrValues { + home.packages = builtins.attrValues { inherit (pkgs) avizo playerctl diff --git a/graphical/chat.nix b/graphical/chat.nix index 8df8a77..4b51919 100644 --- a/graphical/chat.nix +++ b/graphical/chat.nix @@ -14,8 +14,4 @@ icon = ../assets/fb_msg.png; }; }; - hm.home.packages = [ - pkgs.cinny-desktop - pkgs.zoom-us - ]; } diff --git a/graphical/dev.nix b/graphical/dev.nix index 63721f6..5c0d4d9 100644 --- a/graphical/dev.nix +++ b/graphical/dev.nix @@ -2,63 +2,55 @@ pkgs, ... }: -let - getPkgs = builtins.attrValues; -in { - hm.home.packages = - getPkgs { - inherit (pkgs) - direnv - ; - } - ++ [ - # from https://gist.github.com/mikeboiko/58ab730afd65bca0a125bc12b6f4670d - (pkgs.writeTextFile { - name = "rbw-helper"; - text = '' - declare -A params + home.packages = [ + pkgs.direnv + # from https://gist.github.com/mikeboiko/58ab730afd65bca0a125bc12b6f4670d + (pkgs.writeTextFile { + name = "rbw-helper"; + text = '' + declare -A params - if [ "x$1" == "xget" ]; then - read line - while [ -n "$line" ]; do - key=$\{line%%=*} - value=$\{line#*=} - params[$key]=$value - read line - done + if [ "x$1" == "xget" ]; then + read line + while [ -n "$line" ]; do + key=$\{line%%=*} + value=$\{line#*=} + params[$key]=$value + read line + done - if [ "x$\{params['protocol']}" != "xhttps" ]; then - exit - fi + if [ "x$\{params['protocol']}" != "xhttps" ]; then + exit + fi - if [ -z "$\{params["host"]}" ]; then - exit - fi + if [ -z "$\{params["host"]}" ]; then + exit + fi - rbw ls > /dev/null 2>&1 - if [ $? -ne 0 ]; then - echo "Please login to rbw to use git credential helper" > /dev/stderr - exit - fi + rbw ls > /dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "Please login to rbw to use git credential helper" > /dev/stderr + exit + fi - user=`rbw get --full $\{params["host"]} | grep "Username:" | cut -d' ' -f2-` - pass=`rbw get $\{params["host"]}` + user=`rbw get --full $\{params["host"]} | grep "Username:" | cut -d' ' -f2-` + pass=`rbw get $\{params["host"]}` - if [ "x$user" == "x" ] || [ "x$pass" == "x" ]; then - echo "Couldn't find host in rbw DB." > /dev/stderr - exit - fi + if [ "x$user" == "x" ] || [ "x$pass" == "x" ]; then + echo "Couldn't find host in rbw DB." > /dev/stderr + exit + fi - echo username=$user - echo password=$pass - fi - ''; - executable = true; - destination = "/bin/git-credential-rw"; - }) - ]; + echo username=$user + echo password=$pass + fi + ''; + executable = true; + destination = "/bin/git-credential-rw"; + }) + ]; hm.programs.direnv = { enable = true; diff --git a/graphical/documents.nix b/graphical/documents.nix index 86b2c96..32a0d69 100644 --- a/graphical/documents.nix +++ b/graphical/documents.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - hm.home.packages = builtins.attrValues { + home.packages = builtins.attrValues { inherit (pkgs) libreoffice thunderbird diff --git a/graphical/fm.nix b/graphical/fm.nix index e93af84..9dc044f 100644 --- a/graphical/fm.nix +++ b/graphical/fm.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - hm.home.packages = builtins.attrValues { + home.packages = builtins.attrValues { inherit (pkgs) file-roller nautilus diff --git a/graphical/media.nix b/graphical/media.nix index 8cc11f8..dbe5930 100644 --- a/graphical/media.nix +++ b/graphical/media.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - hm.home.packages = builtins.attrValues { + home.packages = builtins.attrValues { inherit (pkgs) mpv imv diff --git a/graphical/password-manager.nix b/graphical/password-manager.nix index 1fd5cab..0225ac0 100644 --- a/graphical/password-manager.nix +++ b/graphical/password-manager.nix @@ -10,5 +10,5 @@ }; hm.programs.git.extraConfig.credential.helper = "rbw"; - hm.home.packages = [ pkgs.bitwarden ]; + home.packages = [ pkgs.bitwarden ]; } diff --git a/graphical/platform-themes.nix b/graphical/platform-themes.nix index dcba441..ea1ada0 100644 --- a/graphical/platform-themes.nix +++ b/graphical/platform-themes.nix @@ -6,7 +6,7 @@ in # for quickshell qt.enable = true; - hm.home.packages = [ + home.packages = [ pkgs.gtk-engine-murrine ]; hm.fonts.fontconfig.enable = true; diff --git a/graphical/rice.nix b/graphical/rice.nix index 1ab0d63..75e0fe6 100644 --- a/graphical/rice.nix +++ b/graphical/rice.nix @@ -6,7 +6,7 @@ ... }: { - hm.home.packages = + home.packages = let inherit (config.rice) icons fonts cursor; in @@ -15,6 +15,7 @@ ++ [ cursor.package ]; + rice = { fonts = let diff --git a/graphical/terminal.nix b/graphical/terminal.nix index 86603f6..443caab 100644 --- a/graphical/terminal.nix +++ b/graphical/terminal.nix @@ -1,4 +1,9 @@ -{ config, ... }: +{ + pkgs, + lib, + config, + ... +}: { # hm.programs.kitty = # let @@ -38,20 +43,19 @@ # }; # }; - hm.programs.ghostty = - let - inherit (config) rice; - in - { - enable = true; - installBatSyntax = true; - enableFishIntegration = true; - clearDefaultKeybinds = false; - - themes.rice = + home.packages = [ pkgs.ghostty ]; + home.xdg.config.files = { + "ghostty/themes/rice" = { + generator = + (pkgs.formats.keyValue { + listsAsDuplicateKeys = true; + mkKeyValue = lib.generators.mkKeyValueDefault { } " = "; + }).generate + "ghostty-theme"; + value = let - inherit (rice.palette.shortHex) util; - inherit (rice.palette.hex) normal bright; + inherit (config.rice.palette.shortHex) util; + inherit (config.rice.palette.hex) normal bright; in { foreground = util.fg; @@ -78,15 +82,31 @@ selection-foreground = util.fg_sel; selection-background = util.bg_sel; }; - settings = { - theme = "rice"; - font-size = rice.fonts.monospace.size; - font-family = rice.fonts.monospace.name; - window-decoration = "server"; - gtk-titlebar = false; - gtk-single-instance = true; - linux-cgroup = "always"; - gtk-wide-tabs = false; - }; }; + + "ghostty/config" = { + generator = lib.generators.toKeyValue { }; + value = + let + inherit (config) rice; + in + { + theme = "rice"; + font-size = rice.fonts.monospace.size; + font-family = rice.fonts.monospace.name; + window-decoration = "server"; + gtk-titlebar = false; + gtk-single-instance = true; + linux-cgroup = "always"; + gtk-wide-tabs = false; + }; + }; + }; + # hm.programs.ghostty = { + # enable = true; + # package = null; + # installBatSyntax = true; + # enableFishIntegration = true; + # clearDefaultKeybinds = false; + # }; } diff --git a/util/create.nix b/util/create.nix index 997dd5e..e09ca96 100644 --- a/util/create.nix +++ b/util/create.nix @@ -18,8 +18,11 @@ in }; modules = [ inputs.home-manager.nixosModules.home-manager + inputs.hjem.nixosModules.hjem (lib.mkAliasOptionModule [ "hm" ] [ "home-manager" "users" info.user ]) - ] ++ (recursivelyImport info.imports); + (lib.mkAliasOptionModule [ "home" ] [ "hjem" "users" info.user ]) + ] + ++ (recursivelyImport info.imports); } ) definitions; }