From 49c9a6290ed5b7e9433fc1aa8e9f30766790ca2c Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Tue, 1 Sep 2026 23:27:07 +0200 Subject: [PATCH] update, disable plasma --- .config/nushell/base-config.nu | 36 ++-- flake.lock | 332 +++++++++++++----------------- flake.nix | 23 ++- servers/ui-mode/configuration.nix | 8 +- with-extra.sh | 2 +- 5 files changed, 181 insertions(+), 220 deletions(-) diff --git a/.config/nushell/base-config.nu b/.config/nushell/base-config.nu index 9dc9fc1..802f046 100644 --- a/.config/nushell/base-config.nu +++ b/.config/nushell/base-config.nu @@ -517,7 +517,7 @@ $env.config = { event: {edit: movetolinestart} } { - name: move_to_line_start + name: move_to_line_start_control_a modifier: control keycode: char_a mode: [emacs, vi_normal, vi_insert] @@ -536,7 +536,7 @@ $env.config = { } } { - name: move_to_line_end_or_take_history_hint + name: move_to_line_end_or_take_history_hint_control_e modifier: control keycode: char_e mode: [emacs, vi_normal, vi_insert] @@ -548,7 +548,7 @@ $env.config = { } } { - name: move_to_line_start + name: move_to_line_start_control_home modifier: control keycode: home mode: [emacs, vi_normal, vi_insert] @@ -562,7 +562,7 @@ $env.config = { event: {edit: movetolineend} } { - name: move_up + name: move_up_control_p modifier: control keycode: char_p mode: [emacs, vi_normal, vi_insert] @@ -574,7 +574,7 @@ $env.config = { } } { - name: move_down + name: move_down_control_t modifier: control keycode: char_t mode: [emacs, vi_normal, vi_insert] @@ -593,7 +593,7 @@ $env.config = { event: {edit: backspace} } { - name: delete_one_word_backward + name: delete_one_word_backward_control_backspace modifier: control keycode: backspace mode: [emacs, vi_insert] @@ -607,28 +607,28 @@ $env.config = { event: {edit: delete} } { - name: delete_one_character_forward + name: delete_one_character_forward_control_delete modifier: control keycode: delete mode: [emacs, vi_insert] event: {edit: delete} } { - name: delete_one_character_forward + name: delete_one_character_backward_control_h modifier: control keycode: char_h mode: [emacs, vi_insert] event: {edit: backspace} } { - name: delete_one_word_backward + name: delete_one_word_backward_control_w modifier: control keycode: char_w mode: [emacs, vi_insert] event: {edit: backspaceword} } { - name: move_left + name: move_left_vi_normal_backspace modifier: none keycode: backspace mode: vi_normal @@ -642,7 +642,7 @@ $env.config = { event: {send: enter} } { - name: move_left + name: move_left_control_b modifier: control keycode: char_b mode: emacs @@ -654,7 +654,7 @@ $env.config = { } } { - name: move_right_or_take_history_hint + name: move_right_or_take_history_hint_control_f modifier: control keycode: char_f mode: emacs @@ -716,14 +716,14 @@ $env.config = { event: {edit: swapgraphemes} } { - name: move_one_word_left + name: move_one_word_left_alt_left modifier: alt keycode: left mode: emacs event: {edit: movewordleft} } { - name: move_one_word_right_or_take_history_hint + name: move_one_word_right_or_take_history_hint_alt_right modifier: alt keycode: right mode: emacs @@ -735,14 +735,14 @@ $env.config = { } } { - name: move_one_word_left + name: move_one_word_left_alt_b modifier: alt keycode: char_b mode: emacs event: {edit: movewordleft} } { - name: move_one_word_right_or_take_history_hint + name: move_one_word_right_or_take_history_hint_alt_f modifier: alt keycode: char_f mode: emacs @@ -761,14 +761,14 @@ $env.config = { event: {edit: deleteword} } { - name: delete_one_word_backward + name: delete_one_word_backward_alt_backspace modifier: alt keycode: backspace mode: emacs event: {edit: backspaceword} } { - name: delete_one_word_backward + name: delete_one_word_backward_alt_m modifier: alt keycode: char_m mode: emacs diff --git a/flake.lock b/flake.lock index 099c7a6..f533dfa 100644 --- a/flake.lock +++ b/flake.lock @@ -4,7 +4,6 @@ "inputs": { "corefonts": "corefonts", "crane": "crane", - "fenix": "fenix", "flake-compat": "flake-compat", "flake-parts": "flake-parts", "git-hooks": "git-hooks", @@ -15,11 +14,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1786323743, - "narHash": "sha256-bPT6UmXMc33Rd4rU9O8eMHhLbsJuU6ZxC2V7VDlmfms=", + "lastModified": 1788049356, + "narHash": "sha256-m+Vqjbx8l1D6TF+kx9wE9/z8iQXG5Juzy7oJn+KAj3c=", "owner": "mrshmllow", "repo": "affinity-nix", - "rev": "a67e334856b7bf0ab9b5b4f38dffd436c0b8a2e5", + "rev": "8c8b540e6535122d5d6e3c1bda3ff16e2c774453", "type": "github" }, "original": { @@ -52,11 +51,11 @@ ] }, "locked": { - "lastModified": 1786464219, - "narHash": "sha256-WKqWL8r7CyTDYueTr2ffJ9ya50dellv6IR1JX5PghDY=", + "lastModified": 1787400831, + "narHash": "sha256-H3MEkFDZf+UH+QrVgW8TdKrssPFltF8fBg/rh0J1zIc=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "f3d1804205e8158c15595cdda1b566f93349ffae", + "rev": "7ce889cb78b97979b83a4648509fc3ef405c3286", "type": "github" }, "original": { @@ -120,11 +119,11 @@ ] }, "locked": { - "lastModified": 1787110677, - "narHash": "sha256-KMccLdLlJ5mZPK5DMuI3ih7DPSm4GmpjKQzSp9ABdX4=", + "lastModified": 1788167007, + "narHash": "sha256-3tWyWqUTOzmXKVXOmctg14RsEH+tfsfydtL1uTreSxg=", "owner": "0xferrous", "repo": "CodexBar-flake", - "rev": "17ac476960e22d75851a7a7b2146701bbfae42cb", + "rev": "451e188cee61bca72c7a517754cede64529dac07", "type": "github" }, "original": { @@ -161,11 +160,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1787004344, - "narHash": "sha256-/YbaX3cVP54l6Ol8qgS/K8H+Hu8zgyOgUVDLTv70txE=", + "lastModified": 1788187015, + "narHash": "sha256-hzDa09x911RIYPj0e3kBvFzxN4u4yTGZL785kxVczr4=", "owner": "9001", "repo": "copyparty", - "rev": "6115eb452d2c2bbdeef5d19098fac17db69ddaa8", + "rev": "936e8a3bf374503adf6c018840ffd2db9878aaf3", "type": "github" }, "original": { @@ -192,11 +191,11 @@ }, "crane": { "locked": { - "lastModified": 1785782307, - "narHash": "sha256-MPaRdVkf6zZP5fCPxYCi8Dr4pZzgmXzg8T9nVEbp3Mw=", + "lastModified": 1787326676, + "narHash": "sha256-lWhBbBvC05/xwivKBBiM2YNizpmgqCgyOIzomvRuwxs=", "owner": "ipetkov", "repo": "crane", - "rev": "2c71e194474d13de031d729b729c968ddbe3507f", + "rev": "692f7e9ef2ece8125b466f66f2af532b3edaed0d", "type": "github" }, "original": { @@ -207,11 +206,11 @@ }, "crane_2": { "locked": { - "lastModified": 1787074141, - "narHash": "sha256-MWnmk87W8akPIKh+yd0bTfXvlyumKQVh5l/KTbgI95o=", + "lastModified": 1787326676, + "narHash": "sha256-lWhBbBvC05/xwivKBBiM2YNizpmgqCgyOIzomvRuwxs=", "owner": "ipetkov", "repo": "crane", - "rev": "6ed595a5527c0ec9563e0e06417f1b8fc88ccb66", + "rev": "692f7e9ef2ece8125b466f66f2af532b3edaed0d", "type": "github" }, "original": { @@ -257,11 +256,11 @@ ] }, "locked": { - "lastModified": 1786198506, - "narHash": "sha256-u4tdLMzKCV2R0wn4eFtk4LKH0RmzzCkxeYqCYs/P3eg=", + "lastModified": 1788184730, + "narHash": "sha256-/2/R7rkkqY/tWcEpHYp2q+0YoFDD4Y3MqBgfwMDgwyI=", "owner": "AvengeMedia", "repo": "danksearch", - "rev": "632c2909bb1bb534b574c22c1347de0e6521e58a", + "rev": "f720833cc6fc4228d2d001265f3d3474ae375724", "type": "github" }, "original": { @@ -279,12 +278,12 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1785432255, - "narHash": "sha256-IrqJV+9NcFevwyBBqEkxkbqhX3rtJI7sSzHz5wDVaLo=", - "rev": "782adcaacdc5b72dcae7093ff07e7f0be1271a76", - "revCount": 430, + "lastModified": 1787341630, + "narHash": "sha256-LGGnqJH919hu3YKK0hC/3vsl3Glya4bbEoW7Lbok3gc=", + "rev": "b484316129e0089e28077f4ede85ac4dbd4b842f", + "revCount": 435, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.21.9/019fb411-e801-74a0-8c53-b41643853e87/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.22.2/01a025df-f652-7701-a0cd-4f1373154572/source.tar.gz" }, "original": { "type": "tarball", @@ -294,37 +293,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-EOdnfemxahb/n6vo/7qAentrZ7zguj9Lxg3c4dGZ73c=", + "narHash": "sha256-76KjZDujSBvk+weVMPngpcbbERAdCozOXni6LII6M/g=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.9/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.2/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.9/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.2/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-BzjpknBhy8yI3i/WFi+8rvbI8MC6VUkty47TSDBc/yE=", + "narHash": "sha256-zr+VnNMCbERuf0mUOjJHBft/BwZdcjk4rKA7pXwRbSY=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.9/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.2/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.9/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.2/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-k9OeW3/AAHm/kYAXqi5WKTMNNtQ4o9kTeBlHrXonGBA=", + "narHash": "sha256-Rp0y7m4SQecV4R8wFjNLRIXcC73I4r4js+kAdAkoAbk=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.9/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.2/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.9/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.2/x86_64-linux" } }, "dmm": { @@ -390,28 +389,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "affinity-nix", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1785919363, - "narHash": "sha256-4FDhl7ybhL5qhJw1X2IviFJ2MERnzV7X1HlJhFeSBXU=", - "owner": "nix-community", - "repo": "fenix", - "rev": "d17fa5c004217ac6e51da9a8c2d2b79b0ed37109", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "locked": { "lastModified": 1751685974, @@ -460,15 +437,15 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -569,12 +546,12 @@ ] }, "locked": { - "lastModified": 1748821116, - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", - "revCount": 377, + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "revCount": 480, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.377%2Brev-49f0870db23e8c1ca0b5259734a02cd9e1e371a1/01972f28-554a-73f8-91f4-d488cc502f08/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.480%2Brev-17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e/019f2195-dee5-7233-9747-eca0c27f7406/source.tar.gz" }, "original": { "type": "tarball", @@ -586,11 +563,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1785627969, - "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", + "lastModified": 1787559586, + "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", + "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1", "type": "github" }, "original": { @@ -789,11 +766,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1784288435, - "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", + "lastModified": 1787138109, + "narHash": "sha256-O2tBn84NNuHrnqNVxx/XqsXwfYvS1YwBh+7CBnbCYsk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", + "rev": "928612b364dc241a05bf6567ad44d499efb6b9aa", "type": "github" }, "original": { @@ -805,10 +782,6 @@ "git-hooks-nix": { "inputs": { "flake-compat": "flake-compat_4", - "gitignore": [ - "determinate", - "nix" - ], "nixpkgs": [ "determinate", "nix", @@ -816,12 +789,12 @@ ] }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", - "revCount": 1026, + "lastModified": 1784288435, + "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", + "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", + "revCount": 1231, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1026%2Brev-80479b6ec16fefd9c1db3ea13aeb038c60530f46/0196d79a-1b35-7b8e-a021-c894fb62163d/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1231%2Brev-43b3c1ab9d40fb1dbb008f451988a91e375825e9/019f7135-8fdf-76f0-b1a1-d2c67e91af8d/source.tar.gz" }, "original": { "type": "tarball", @@ -840,11 +813,11 @@ ] }, "locked": { - "lastModified": 1784288435, - "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", + "lastModified": 1787424939, + "narHash": "sha256-O2tBn84NNuHrnqNVxx/XqsXwfYvS1YwBh+7CBnbCYsk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", + "rev": "809414f0cdadf82cf11b06c2b29ba9b3168b3297", "type": "github" }, "original": { @@ -862,11 +835,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1786886160, - "narHash": "sha256-legFYpDokCOzwAPmyH7mDi+2jkllaeE+czhJifeQsFU=", + "lastModified": 1788065178, + "narHash": "sha256-ADzuZ/MqrdJOMucTux5j0QMxo0YnCHLxuZAYlK/wxPE=", "owner": "schembriaiden", "repo": "helium-browser-nix-flake", - "rev": "11edc339e075f16b356852096420ecd966462cc1", + "rev": "f1250fd4dcd8f22cb3d8aa1e8e00f56cc947e795", "type": "github" }, "original": { @@ -882,11 +855,11 @@ ] }, "locked": { - "lastModified": 1786999651, - "narHash": "sha256-MTGMFlLDTklsXhCp4r5GXB4VAVadPdalXLvUjd/K7h0=", + "lastModified": 1788199093, + "narHash": "sha256-gh09zTgEsbnoWwrNPzIDajc/HoE446Sc3yKDCPFa7Xs=", "owner": "nix-community", "repo": "home-manager", - "rev": "353742587cbaf079b3caee743115d037bc51fea6", + "rev": "f772b7f968365e7b2b70a860c509d214639556fe", "type": "github" }, "original": { @@ -1015,11 +988,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1786998364, - "narHash": "sha256-egMnyO7618cG4qcvsTwUkYHoxPFNSe1IThXfDrl43l4=", + "lastModified": 1787584490, + "narHash": "sha256-n5pRDrqMLDSoVJ3fc2DR7hL8bxXJwuPm391j+9Vswbk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "af0d014cb26f536d8cb7cab2b9d5784f69767c8a", + "rev": "d8504461f0e9f95a5df9a0cdc0723d0ca6332888", "type": "github" }, "original": { @@ -1094,11 +1067,11 @@ ] }, "locked": { - "lastModified": 1787071735, - "narHash": "sha256-1DDAvYcJ7q1x4JdhoXU+PTQWxAUcv53gSNmmi9pBVuU=", + "lastModified": 1788037253, + "narHash": "sha256-QSGOM0IFpp45DwmtIwcih8+kKuSgAoQal9QkVVSRNew=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "83ce4b2a70d3c1a6ed8dc6db7f1fac17db2215b1", + "rev": "67c3a4c019f223c27b5bdc6bb656ce891a60861a", "type": "github" }, "original": { @@ -1239,11 +1212,11 @@ ] }, "locked": { - "lastModified": 1786464080, - "narHash": "sha256-W1hxvumEM57yV+QwsZ4QdAHEqOkr7e4S8VAkLX60qDE=", + "lastModified": 1786903207, + "narHash": "sha256-QTwMqLLONRhv9iz6CVeuX6BqQNQCIqI8hL/cPYlR/24=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "c157fe1e3092b980cc69315a6631f89aff09dcce", + "rev": "6cf50415e06dc6bd9f1252f1b745eac6b4a1cc39", "type": "github" }, "original": { @@ -1399,12 +1372,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1785428605, - "narHash": "sha256-wfaiSRLM1wDb4MV+NEzbyheK9Y03/oe56NR2I84UF7E=", - "rev": "0ff46631f69584c9f76792cae595ea253bd482c3", - "revCount": 26288, + "lastModified": 1787334067, + "narHash": "sha256-wmwgSBcAGJe/e+FrLwJxlghYV12F7UkIodm0j6cosYg=", + "rev": "c407745c8b9b616bebf7288697699c45794e31ac", + "revCount": 27248, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.9/019fb409-4d6e-7243-8a88-23ceee2520e9/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.22.2/01a02595-e77f-7e43-a616-5bbc77a2dc07/source.tar.gz" }, "original": { "type": "tarball", @@ -1419,11 +1392,11 @@ ] }, "locked": { - "lastModified": 1786530394, - "narHash": "sha256-Bxx47lHMVHFD7JCt0bQGwuYK71qKioYq2Y74CPg/KHs=", + "lastModified": 1787372347, + "narHash": "sha256-Foo41OtooHMiBITAFKdOhitmjrMZqcGy1epJNz7sNQ4=", "owner": "ryoppippi", "repo": "nix-bun", - "rev": "3c2ccb115cc79d0556743743654475d4f6446f11", + "rev": "fee8f233ad9409be44259b4f428f83ecb2812e37", "type": "github" }, "original": { @@ -1440,11 +1413,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1786844088, - "narHash": "sha256-gVwzq9tiX4oa6jwwoKsBJlKb2kPndVdMrYEvTpfi7DY=", + "lastModified": 1788064340, + "narHash": "sha256-QehJP4PYmGoibbmFKYUA19wvdESywXNC+9DHxcuos48=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "23ff06d540f4df5e315d9a45b2388b6581d1c0a5", + "rev": "51de0cca39be715df8e02218421cc7f91388228e", "type": "github" }, "original": { @@ -1481,11 +1454,11 @@ ] }, "locked": { - "lastModified": 1786852476, - "narHash": "sha256-IM5CYtf86W4w8eUPpKcY/LpdHElmVBtJhaKnoTKxZEA=", + "lastModified": 1788080100, + "narHash": "sha256-n14luQo3F/ZLfCEHk1QieiI1nGnW92ZQZeZ0UIb0UMQ=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "c7962dc97b45129df8d751bedaf37beb5a17706e", + "rev": "dbb978fa87faf13398e90ccbc52c343d21c7dd6d", "type": "github" }, "original": { @@ -1514,11 +1487,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1787126170, - "narHash": "sha256-AFZ07P7jdBhPJt0VkZhQPWEx1+JNySEkBA0IjpPAx08=", + "lastModified": 1788044418, + "narHash": "sha256-cmOd3iGoE140M2GidgQMQbyxHZ4dT7C0QZq2+CrXQyA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e8a8bfbbfadb96834ec3fa3d17a03807e38f4e63", + "rev": "dc3f0cfde2050172abf6c3cdb684f735c15a57c5", "type": "github" }, "original": { @@ -1561,11 +1534,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1786527240, - "narHash": "sha256-OLtJPnSXcRy79Rf7BhYaMeXAVF625FpLcd3+Svq641Y=", + "lastModified": 1787940818, + "narHash": "sha256-vFzVv78WlyEbTyV5BbrnicnV159wC0YPOcBe3QagyBI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e0c84f9d0ad137f076dc957494f5b39885597d4f", + "rev": "f6107e546a5012172d93e79f1f7950da02ad798f", "type": "github" }, "original": { @@ -1716,11 +1689,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1787070829, - "narHash": "sha256-vXNVDVtvfiQuXthP0NHPFdNvvMTkGpx0UP8oddIWbNk=", + "lastModified": 1788179007, + "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ae2bc1419c3f345984c2629e72e7a631820fa4d", + "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9", "type": "github" }, "original": { @@ -1748,11 +1721,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1786247143, - "narHash": "sha256-8S3Kcxs7D4UtxJxSJZz0m14CGhuW0MxfrIwJxeGWGnQ=", + "lastModified": 1787360063, + "narHash": "sha256-dt4WdcvsA8/RCe+VZZwqU0X+XMM3wBbGCWA0/sFWzGo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "279b4a8275f032c566576b3f181fa0f27197f588", + "rev": "2c423e03bbafcff28bfadc6781a4a8257f205cb5", "type": "github" }, "original": { @@ -1764,11 +1737,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1786593342, - "narHash": "sha256-smTKQXMLLStzc8zJevMCckbk3My7SvbbLmPYZUJJKW4=", + "lastModified": 1787964612, + "narHash": "sha256-0N9nghg3nwzX6b6qc77EzjR9cu/Z+UR66FlfsCqiURs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6b5e5b7a6631f065bf6908986990b37d845f847f", + "rev": "e8be7818e19ada32105a8af937a6a473b38167ca", "type": "github" }, "original": { @@ -1793,11 +1766,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1787070829, - "narHash": "sha256-vXNVDVtvfiQuXthP0NHPFdNvvMTkGpx0UP8oddIWbNk=", + "lastModified": 1788179007, + "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ae2bc1419c3f345984c2629e72e7a631820fa4d", + "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9", "type": "github" }, "original": { @@ -1854,11 +1827,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1786106723, - "narHash": "sha256-zDSUbpoeo/9ZmD2+wXnzxoo1+uhL8vxc0b8yuYMKYq0=", + "lastModified": 1787135253, + "narHash": "sha256-RD2kNWCG+Bjo6h+JVjWVNntZs2GtRoeY2xHjts/FNkA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f13ff45afd1bb73e640eaa08a7066dbed07e3238", + "rev": "ffb3c9b700e759be2ef13237c9d8f953b32a1e46", "type": "github" }, "original": { @@ -1917,26 +1890,26 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1782767157, - "narHash": "sha256-db/8NgfehQlPNt8rMY0J1gvwzTaURU/foM7y/AQimIM=", - "rev": "1d4e0f865d68258aada31e68e6d79c8c463f3b34", - "revCount": 914302, + "lastModified": 1784160687, + "narHash": "sha256-iYL/bixrb6FlHFu/gIuBYzq6c6lM5AAXsXNSWXtIgQc=", + "rev": "4382ed2b7a6839d4280a9b386db49cbc5907414d", + "revCount": 1009383, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.914302%2Brev-1d4e0f865d68258aada31e68e6d79c8c463f3b34/019f1c78-b5ab-7af2-8516-c0d5406b0646/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1009383%2Brev-4382ed2b7a6839d4280a9b386db49cbc5907414d/019f6c11-ad78-7500-a194-d18a5bad0fbe/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2511" + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2605" } }, "nixpkgs_7": { "locked": { - "lastModified": 1784497964, - "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", - "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", - "revCount": 1037713, + "lastModified": 1786247143, + "narHash": "sha256-8S3Kcxs7D4UtxJxSJZz0m14CGhuW0MxfrIwJxeGWGnQ=", + "rev": "279b4a8275f032c566576b3f181fa0f27197f588", + "revCount": 1050399, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1037713%2Brev-241313f4e8e508cb9b13278c2b0fa25b9ca27163/019fa760-2880-7491-9ad9-7ba4669f6a84/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1050399%2Brev-279b4a8275f032c566576b3f181fa0f27197f588/01a01364-0c36-7a91-b20d-31b3a834ddeb/source.tar.gz" }, "original": { "type": "tarball", @@ -1988,11 +1961,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1787135737, - "narHash": "sha256-+NntaPSXASiGVyfWZBbGnWOqmSayWA5Gsvd5ZnalDpk=", + "lastModified": 1788263493, + "narHash": "sha256-VCwnvc3sHbp8Ln4GugqbJHNl0CVelsxzdWMLfDaFXbw=", "owner": "can1357", "repo": "oh-my-pi", - "rev": "22b40b47e1e4c271de5f167918f5400966573d34", + "rev": "45aed39ae01f1086f56983563b80c8c079df5cfd", "type": "github" }, "original": { @@ -2004,11 +1977,11 @@ "on-linux": { "flake": false, "locked": { - "lastModified": 1785546009, - "narHash": "sha256-G1l+Byd3a0DMtwm84D2bXIKigMugYteh4ke+Mt1UZd8=", + "lastModified": 1787365621, + "narHash": "sha256-aRS0sZ6p7YJagjFaZFrS1zuvN3PVKNBJOze1Ek/bOi8=", "owner": "seapear", "repo": "AffinityOnLinux", - "rev": "916140f3677bf06f3552949e69f926ee0e50606c", + "rev": "0fe210754999a2ace3039c11fbbd11b45b5ee399", "type": "github" }, "original": { @@ -2024,11 +1997,11 @@ ] }, "locked": { - "lastModified": 1787136033, - "narHash": "sha256-XrMcE8rpCXojzyLb8aU6UcNtEZlm1EnCAIZVCGirU9Y=", + "lastModified": 1788203427, + "narHash": "sha256-pOjuc3aWU0jHbmj2FCtx2xML9tbNUxrdSX2j2MtRmPk=", "owner": "getpaseo", "repo": "paseo", - "rev": "e883b692b07c3e00c43b198738c864030893eaae", + "rev": "ecec33265e68a71c68f49ef7c330cf43aa1d37c8", "type": "github" }, "original": { @@ -2224,11 +2197,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1787082956, - "narHash": "sha256-Ufon4RcO0Sg44qpdEwngod4z4MPrG4nv3QSS7hyQIU4=", + "lastModified": 1788029235, + "narHash": "sha256-POpjL5a/lc8n430CnR2tpjsXgqa8kSe0zC+nNHOuaY0=", "owner": "temidaradev", "repo": "rusic", - "rev": "efdf304e24b65872311a160c2efeff5c6db082fe", + "rev": "a88b938136f448e1a8d33c5e886b0ce7c4de3a57", "type": "github" }, "original": { @@ -2237,23 +2210,6 @@ "type": "github" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1785889825, - "narHash": "sha256-U98Y5RADVCkMCbrKCFXppe6MSAi0tUTLxi3cB/SMcZI=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "6817dd3094203c8bc4911f5799baf897623003de", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -2533,11 +2489,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1785360170, - "narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=", + "lastModified": 1786901030, + "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0", + "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", "type": "github" }, "original": { @@ -2727,11 +2683,11 @@ ] }, "locked": { - "lastModified": 1786464334, - "narHash": "sha256-/TBQT5rhBB2Dm4HoZzhGDaCwYmRTs3W3DPhMXFWc/BU=", + "lastModified": 1786988229, + "narHash": "sha256-frEFLVRj8xXvBBDs44IRiqHo6R2PxsRpluygL7abjjI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "9f0e9ff02739cd538d39bd706422dc50e9ca60dd", + "rev": "59d429bf45aed4e2209043c0c36565ad8e2859a5", "type": "github" }, "original": { @@ -2781,11 +2737,11 @@ "rust-overlay": "rust-overlay_5" }, "locked": { - "lastModified": 1787134006, - "narHash": "sha256-tnBmOP7CQ4LLza4Jf+jnLJ06hmUw9KDloU4e6HibutE=", + "lastModified": 1788202020, + "narHash": "sha256-dWsg2ACvboPGt7Avf2veWpgrDRB3nsQdTEVIQ+BYjhQ=", "owner": "zed-industries", "repo": "zed", - "rev": "28c0f4aef89d298a08176977d9839671827f5528", + "rev": "ce48461eaadd16c65c31f835511ab96bd3b6e746", "type": "github" }, "original": { @@ -2800,11 +2756,11 @@ "nixpkgs": "nixpkgs_16" }, "locked": { - "lastModified": 1787102102, - "narHash": "sha256-NmX0gGqJovFZ4iu5bsAxTdojz6Jz29M4mdsLUZpWY3s=", + "lastModified": 1788149125, + "narHash": "sha256-GueAv4789rOV70hixnL9+uN4tiDKJm7s92DnTejdpuE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c66ece4c518550545f45dd0633551f23a085e01c", + "rev": "5fe00f38d41ced9a5c0ba1cbf2127d7e8b3e3d56", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3c2060f..b87a466 100644 --- a/flake.nix +++ b/flake.nix @@ -185,15 +185,17 @@ # DwarFS 0.14.0 bundles Folly and fbthrift snapshots that relied on # transitive C string declarations and fmt's pre-12 core header. dwarfs = prev.dwarfs.overrideAttrs (old: { - postPatch = (old.postPatch or "") + '' - sed -i '/#include /i#include ' folly/folly/lang/Exception.h - sed -i '/#include /i#include ' \ - fbthrift/thrift/compiler/ast/t_type.cc - sed -i '/#include /i#include ' \ - fbthrift/thrift/compiler/generate/t_concat_generator.cc - find fbthrift -type f \( -name '*.h' -o -name '*.cc' \) \ - -exec sed -i 's|||g' {} + - ''; + postPatch = + (old.postPatch or "") + + prev.lib.optionalString (old.version == "0.14.0") '' + sed -i '/#include /i#include ' folly/folly/lang/Exception.h + sed -i '/#include /i#include ' \ + fbthrift/thrift/compiler/ast/t_type.cc + sed -i '/#include /i#include ' \ + fbthrift/thrift/compiler/generate/t_concat_generator.cc + find fbthrift -type f \( -name '*.h' -o -name '*.cc' \) \ + -exec sed -i 's|||g' {} + + ''; }); # ethnum 1.5.2 assumes TryFromIntError is zero-sized, which is @@ -218,6 +220,7 @@ # Export sysbox NixOS module for external use nixosModules.sysbox = import ./modules/sysbox.nix; nixosModules.tuwunel-admin = import ./modules/tuwunel-admin.nix; + #nixosModules.budkyber = import ./modules/budkyber.nix; packages.x86_64-linux = rec { tuwunel-admin = @@ -234,8 +237,10 @@ paseo.nixosModules.paseo determinate.nixosModules.default home-manager.nixosModules.home-manager + #./modules/budkyber.nix { services.hypr-kdeconnect-fix.enable = true; + #services.budkyber.enable = true; home-manager.extraSpecialArgs = attrs; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/servers/ui-mode/configuration.nix b/servers/ui-mode/configuration.nix index ef51f9e..c1fc2bd 100644 --- a/servers/ui-mode/configuration.nix +++ b/servers/ui-mode/configuration.nix @@ -108,11 +108,11 @@ LC_TELEPHONE = "cs_CZ.UTF-8"; LC_TIME = "en_GB.UTF-8"; }; - services.displayManager.sddm.enable = true; + #services.displayManager.sddm.enable = true; services.displayManager.defaultSession = "hyprland-uwsm"; - services.desktopManager.plasma6 = { - enable = true; - }; +# services.desktopManager.plasma6 = { +# enable = true; +# }; # services.desktopManager.gnome.enable = true; services.xserver.xkb = { layout = "us"; diff --git a/with-extra.sh b/with-extra.sh index 46ee46a..fd2d2da 100644 --- a/with-extra.sh +++ b/with-extra.sh @@ -1 +1 @@ -nixos-rebuild boot --option extra-substituters "https://cache.nixos.org https://nix-community.cachix.org https://hyprland.cachix.org https://nix-gaming.cachix.org https://colmena.cachix.org https://install.determinate.systems https://rusic.cachix.org" --option extra-trusted-public-keys "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc= nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.flakehub.com-3:hJuILl5sVK4iKm86JzgdXW12Y2Hwd5G07qKtHTOcDCM= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= rusic.cachix.org-1:WXMpGpamblLUiJtcoxBxGGGGwIcWxGPJBUxarLiqWmw=" --flake ".#fern" +nixos-rebuild boot --option extra-substituters "https://cache.nixos.org https://nix-community.cachix.org https://hyprland.cachix.org https://nix-gaming.cachix.org https://colmena.cachix.org https://install.determinate.systems https://rusic.cachix.org https://cuda-maintainers.cachix.org https://cache.nixos-cuda.org" --option extra-trusted-public-keys "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc= nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.flakehub.com-3:hJuILl5sVK4iKm86JzgdXW12Y2Hwd5G07qKtHTOcDCM= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= rusic.cachix.org-1:WXMpGpamblLUiJtcoxBxGGGGwIcWxGPJBUxarLiqWmw= cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E= cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" --flake ".#fern"