From 5c3f1cb32e97b67015339499393ae4b13d9c7f67 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Sun, 29 Dec 2024 17:56:56 +0100 Subject: [PATCH 1/5] flake: update --- flake.lock | 394 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 295 insertions(+), 99 deletions(-) diff --git a/flake.lock b/flake.lock index 88a037f..9058e4a 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1733625860, - "narHash": "sha256-YiLUDw14NaavML8y9rxXxO7q+j3b/ghQhBmIy0+/Zmk=", + "lastModified": 1734671517, + "narHash": "sha256-rTKZlNZP13zIy8eyHiTbCN15rON0FG9S8zxRE7jH+Ak=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "e2d561c933cd085d68bf0b39c4f78870ad0abbc2", + "rev": "6d49cb495c3b0364fb6c4b50ab4c04a864aa6c43", "type": "github" }, "original": { @@ -104,11 +104,11 @@ ] }, "locked": { - "lastModified": 1734400729, - "narHash": "sha256-Bf+oya0BuleVXYGIWsb0eWnrK6s0aiesOsI7Mpj1pMU=", + "lastModified": 1734906446, + "narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a132fa41be7ebe797ad758e84d9df068151a723b", + "rev": "eecb74dc79bb6752a2a507e6edee3042390a6091", "type": "github" }, "original": { @@ -118,12 +118,21 @@ } }, "catppuccin": { + "inputs": { + "catppuccin-v1_1": "catppuccin-v1_1", + "catppuccin-v1_2": "catppuccin-v1_2", + "home-manager": "home-manager_2", + "home-manager-stable": "home-manager-stable", + "nixpkgs": "nixpkgs_3", + "nixpkgs-stable": "nixpkgs-stable", + "nuscht-search": "nuscht-search" + }, "locked": { - "lastModified": 1734624488, - "narHash": "sha256-swNM0LxzIcyQcyK5SE0Q13qs3MOcJR4KL2+bSv2HHpg=", + "lastModified": 1735399522, + "narHash": "sha256-1lIjMEBvtxJH3V7c66D8pN/pPp4xsFGz6PjcOYX/Niw=", "owner": "catppuccin", "repo": "nix", - "rev": "562a0ace199ab59413d5093e31d6745704bd0d11", + "rev": "8b6baed3d010416da6295805012b12cfa05c09f7", "type": "github" }, "original": { @@ -132,6 +141,34 @@ "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": 1734728407, + "narHash": "sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA=", + "rev": "23ee86dbf4ed347878115a78971d43025362fab1", + "revCount": 341, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -309,7 +346,25 @@ }, "flake-utils": { "inputs": { - "systems": "systems_7" + "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" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_8" }, "locked": { "lastModified": 1726560853, @@ -440,9 +495,32 @@ "type": "github" } }, + "home-manager-stable": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, "home-manager_2": { "inputs": { "nixpkgs": [ + "catppuccin", "nixpkgs" ] }, @@ -461,6 +539,26 @@ } }, "home-manager_3": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_4": { "inputs": { "nixpkgs": [ "nixvim", @@ -484,7 +582,7 @@ }, "hypr-contrib": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1733056338, @@ -516,11 +614,11 @@ ] }, "locked": { - "lastModified": 1734364709, - "narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=", + "lastModified": 1734906540, + "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a", + "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", "type": "github" }, "original": { @@ -545,11 +643,11 @@ ] }, "locked": { - "lastModified": 1733684019, - "narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=", + "lastModified": 1734906236, + "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d", + "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c", "type": "github" }, "original": { @@ -572,15 +670,15 @@ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_4", + "systems": "systems_5", "xdph": "xdph" }, "locked": { - "lastModified": 1734573361, - "narHash": "sha256-rlHkYVDjKXABfAxdcsHnbdZa/0EWE3g/XnR/Ln96rPA=", + "lastModified": 1735473418, + "narHash": "sha256-Zmf77Z+9XzdMureswTG+iVKw/6X4CVP9PLd0y8CaYf0=", "ref": "refs/heads/main", - "rev": "5b714f05f87831e3e930af04649f853d5efb9902", - "revCount": 5570, + "rev": "3f40d6d9361d0c5fec558b7549e58203fbe5cbd7", + "revCount": 5599, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -657,11 +755,11 @@ ] }, "locked": { - "lastModified": 1733940128, - "narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=", + "lastModified": 1734906472, + "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "3833097e50473a152dd614d4b468886840b4ea78", + "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152", "type": "github" }, "original": { @@ -686,11 +784,11 @@ ] }, "locked": { - "lastModified": 1734364628, - "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", + "lastModified": 1734906259, + "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", + "rev": "0404833ea18d543df44df935ebf1b497310eb046", "type": "github" }, "original": { @@ -703,8 +801,8 @@ "inputs": { "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_4", - "systems": "systems_5" + "nixpkgs": "nixpkgs_5", + "systems": "systems_6" }, "locked": { "lastModified": 1734384415, @@ -725,8 +823,8 @@ "hyprland-protocols": "hyprland-protocols_2", "hyprutils": "hyprutils_3", "hyprwayland-scanner": "hyprwayland-scanner_3", - "nixpkgs": "nixpkgs_5", - "systems": "systems_6" + "nixpkgs": "nixpkgs_6", + "systems": "systems_7" }, "locked": { "lastModified": 1731163989, @@ -754,11 +852,11 @@ ] }, "locked": { - "lastModified": 1734384247, - "narHash": "sha256-bl3YyJb2CgaeVKYq/l8j27vKdbkTpDNFDsnCl0dnNlY=", + "lastModified": 1735316583, + "narHash": "sha256-AiiUwHWHfEdpFzXy7l1x3zInCUa1xcRMrbZ1XRSkzwU=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e6cf45cd1845368702e03b8912f4cc44ebba3322", + "rev": "8f15d45b120b33712f6db477fe5ffb18034d0ea8", "type": "github" }, "original": { @@ -829,11 +927,11 @@ ] }, "locked": { - "lastModified": 1734384417, - "narHash": "sha256-noYeXcNQ15g1/gIJIYT2zdO66wzY5Z06PYz6BfKUZA8=", + "lastModified": 1734793513, + "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "90e87f7fcfcce4862826d60332cbc5e2f87e1f88", + "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61", "type": "github" }, "original": { @@ -892,6 +990,34 @@ "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" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -917,15 +1043,15 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "umu": "umu" }, "locked": { - "lastModified": 1734486355, - "narHash": "sha256-e9ui1RA/Bf57fiABB0ddXy4m/FoqM9yiEv6XtaoTyag=", + "lastModified": 1735481011, + "narHash": "sha256-u5yRymUN2ZuOavCj1HY1Le0Uyyg2azCTtZRLiXfOpo8=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "3a37d41cbe8cda558c5d1a83e73fd452207cd914", + "rev": "578b00c7c0db22464e50d7ae2f492dd9438a284c", "type": "github" }, "original": { @@ -936,11 +1062,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734352517, - "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -990,6 +1116,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1734600368, + "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -1007,11 +1149,27 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { @@ -1038,6 +1196,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1712163089, "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", @@ -1053,7 +1227,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1734119587, "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", @@ -1069,7 +1243,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1728241625, "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", @@ -1085,13 +1259,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { - "lastModified": 1733935885, - "narHash": "sha256-xyiHLs6KJ1fxeGmcCxKjJE4yJknVJxbC8Y/ZRYyC8WE=", + "lastModified": 1735268880, + "narHash": "sha256-7QEFnKkzD13SPxs+UFR5bUFN2fRw+GlL0am72ZjNre4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a48e3c2e435e95103d56590188cfed7b70e108c", + "rev": "7cc0bff31a3a705d3ac4fdceb030a17239412210", "type": "github" }, "original": { @@ -1101,33 +1275,17 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_8": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", - "owner": "nixos", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1137,13 +1295,13 @@ "locked": { "lastModified": 1728492678, "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1152,7 +1310,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixvim": "nixvim_2" }, "locked": { @@ -1175,9 +1333,9 @@ "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", - "home-manager": "home-manager_3", + "home-manager": "home-manager_4", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, @@ -1198,15 +1356,15 @@ "nur": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_11", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1734626672, - "narHash": "sha256-L/FC33I5l9GwaZ55zVDiKROyhAit6yl6yWqxssMl2sk=", + "lastModified": 1735490440, + "narHash": "sha256-v4s1vzJP2BMwYc1vtr6Y6P6i9uFMPKyrFv61YwAmQIM=", "owner": "nix-community", "repo": "NUR", - "rev": "7bdb9e6abd154dde4004c499aa1c7707a6dbcb16", + "rev": "69f33b21fab40d98058247256fb8f964eb2c24e9", "type": "github" }, "original": { @@ -1215,9 +1373,32 @@ "type": "github" } }, - "nuschtosSearch": { + "nuscht-search": { "inputs": { "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "owner": "NuschtOS", + "repo": "search", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixvim", "nixvim", @@ -1246,14 +1427,14 @@ "hyprland", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1734379367, - "narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -1269,14 +1450,14 @@ "agenix": "agenix", "alejandra": "alejandra", "catppuccin": "catppuccin", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "hypr-contrib": "hypr-contrib", "hyprland": "hyprland", "hyprpicker": "hyprpicker", "hyprsunset": "hyprsunset", "nix-gaming": "nix-gaming", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixvim": "nixvim", "nur": "nur" } @@ -1345,16 +1526,16 @@ }, "systems_4": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1389,6 +1570,21 @@ } }, "systems_7": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1499,11 +1695,11 @@ ] }, "locked": { - "lastModified": 1734422917, - "narHash": "sha256-0y7DRaXslhfqVKV8a/talYTYAe2NHOQhMZG7KMNRCtc=", + "lastModified": 1734907020, + "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "3e884d941ca819c1f2e50df8bdae0debded1ed87", + "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", "type": "github" }, "original": { From b706836944ca47fbbc405723aab2f82d2c9a5790 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Tue, 7 Jan 2025 09:58:12 +0100 Subject: [PATCH 2/5] feat: add fancy boot animations; fix ichiyo's boot process --- hosts/ichiyo/default.nix | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/hosts/ichiyo/default.nix b/hosts/ichiyo/default.nix index c38c5e8..a16aed7 100644 --- a/hosts/ichiyo/default.nix +++ b/hosts/ichiyo/default.nix @@ -4,6 +4,9 @@ ./hardware-configuration.nix ./../../modules/core ]; + + # Enable fancy boot animations + boot.plymouth.enable = true; powerManagement = { enable = true; @@ -14,18 +17,17 @@ liv.laptop.enable = true; # Bootloader stuff - boot.loader.grub.enable = lib.mkForce true; - boot.loader.grub.device = lib.mkForce "/dev/sda"; - boot.loader.grub.useOSProber = lib.mkForce true; - boot.initrd.secrets = { - "/crypto_keyfile.bin" = null; - }; - boot.loader.grub.enableCryptodisk = lib.mkForce true; - boot.initrd.luks.devices."luks-729500c5-557b-45c8-ab3f-5c365db28284".keyFile = lib.mkForce "/crypto_keyfile.bin"; - - networking.hostName = "ichiyo"; - boot = { + loader.grub = { + enable = lib.mkForce true; + device = lib.mkForce "/dev/sda"; + enableCryptodisk = lib.mkForce true; + useOSProber = lib.mkForce true; + }; + initrd.secrets = { + "/crypto_keyfile.bin" = null; + }; + initrd.luks.devices."luks-729500c5-557b-45c8-ab3f-5c365db28284".keyFile = lib.mkForce "/crypto_keyfile.bin"; extraModulePackages = with config.boot.kernelPackages; [ acpi_call @@ -33,4 +35,6 @@ ] ++ [pkgs.cpupower-gui]; }; + + networking.hostName = "ichiyo"; } From ec2d723a661a3aeb2f8f4d9f1fb64c383aab0184 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Tue, 7 Jan 2025 09:58:22 +0100 Subject: [PATCH 3/5] feat: adds displaylink driver --- modules/core/displaylink.nix | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 modules/core/displaylink.nix diff --git a/modules/core/displaylink.nix b/modules/core/displaylink.nix new file mode 100644 index 0000000..f7e7608 --- /dev/null +++ b/modules/core/displaylink.nix @@ -0,0 +1,4 @@ +{ ... }: { + services.xserver.videoDrivers = [ "displaylink" "modesetting" ]; + systemd.services.dlm.wantedBy = [ "multi-user.target" ]; +} From 797689501dd05003f721fdedfd19602fe8372345 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Tue, 7 Jan 2025 09:58:30 +0100 Subject: [PATCH 4/5] feat: map caps to ctrl --- modules/home/hyprland/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index 9e662b0..25da213 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -101,6 +101,7 @@ ]; input = { + kb_options = "caps:ctrl_modifier"; kb_layout = "us"; numlock_by_default = true; follow_mouse = 1; From 266159e65915b3b8cf9d7272c6ce5120ad7c86df Mon Sep 17 00:00:00 2001 From: Ahwx Date: Tue, 7 Jan 2025 09:58:33 +0100 Subject: [PATCH 5/5] flake: update --- flake.lock | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 9058e4a..fadb8c5 100644 --- a/flake.lock +++ b/flake.lock @@ -128,11 +128,11 @@ "nuscht-search": "nuscht-search" }, "locked": { - "lastModified": 1735399522, - "narHash": "sha256-1lIjMEBvtxJH3V7c66D8pN/pPp4xsFGz6PjcOYX/Niw=", + "lastModified": 1735937475, + "narHash": "sha256-TYs1HHBRfCBb3aAak1bJ9087gX9DeYLGy69Dkiz9WdE=", "owner": "catppuccin", "repo": "nix", - "rev": "8b6baed3d010416da6295805012b12cfa05c09f7", + "rev": "07f97a4990c138032a594b830bb02fd5dcf91ec2", "type": "github" }, "original": { @@ -545,11 +545,11 @@ ] }, "locked": { - "lastModified": 1735381016, - "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", + "lastModified": 1736013363, + "narHash": "sha256-P4lsS2Y5GzBfC8OfXtD/xWEucX6oHGTjOzjEjEJbXfc=", "owner": "nix-community", "repo": "home-manager", - "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", + "rev": "0d7908bd09165db6699908b7e3970f137327cbf0", "type": "github" }, "original": { @@ -674,11 +674,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1735473418, - "narHash": "sha256-Zmf77Z+9XzdMureswTG+iVKw/6X4CVP9PLd0y8CaYf0=", + "lastModified": 1736008833, + "narHash": "sha256-3OvlurfefGSjT4E+qRvQNmqqRVlbHN8ifZy5C3uUZM8=", "ref": "refs/heads/main", - "rev": "3f40d6d9361d0c5fec558b7549e58203fbe5cbd7", - "revCount": 5599, + "rev": "b0bae15499ad57bbfeae8be958df8c022201e583", + "revCount": 5628, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -701,11 +701,11 @@ ] }, "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "lastModified": 1735734474, + "narHash": "sha256-9OV4lOqrEJVLdOrpNN/9msNwAhI6FQTu4N7fufilG08=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "rev": "271df559dd30e4bc5ec6af02d017ac0aaabd63a7", "type": "github" }, "original": { @@ -805,11 +805,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1734384415, - "narHash": "sha256-As7Z39Pqoy/dUiaaT8UIPUVGViWiKmRsBUHTGkT2430=", + "lastModified": 1735584197, + "narHash": "sha256-B1PqiHp/jmDVXVrvyh/eu2KP3LCyi1JL0h3vuy/wVnM=", "owner": "hyprwm", "repo": "hyprpicker", - "rev": "46d2f5a817a89405cef941d8beb4551425acf3da", + "rev": "444c40e5e3dc4058a6a762ba5e73ada6d6469055", "type": "github" }, "original": { @@ -1047,11 +1047,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1735481011, - "narHash": "sha256-u5yRymUN2ZuOavCj1HY1Le0Uyyg2azCTtZRLiXfOpo8=", + "lastModified": 1735868406, + "narHash": "sha256-/CGzY7MUnhmw+I9j8ApwDt7qOKixWif2khwXEIR97Bc=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "578b00c7c0db22464e50d7ae2f492dd9438a284c", + "rev": "afc74611082ecc4a961e4317fa2763c8812e217f", "type": "github" }, "original": { @@ -1165,11 +1165,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -1277,11 +1277,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -1360,11 +1360,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1735490440, - "narHash": "sha256-v4s1vzJP2BMwYc1vtr6Y6P6i9uFMPKyrFv61YwAmQIM=", + "lastModified": 1736027142, + "narHash": "sha256-AZ5YNuV9w8SSxCM2KYnvcqntxPKED53oMjDotEj5jyU=", "owner": "nix-community", "repo": "NUR", - "rev": "69f33b21fab40d98058247256fb8f964eb2c24e9", + "rev": "782119f4b55be55f6578f8387c1b9a8017719997", "type": "github" }, "original": {