From c34f6761614d96eec738b1c3e1964a332157fddd Mon Sep 17 00:00:00 2001 From: EdenQwQ Date: Tue, 22 Apr 2025 20:42:20 +0800 Subject: [PATCH] niri ovewview let's go --- flake.lock | 142 +++++++++--------- flake.nix | 2 +- .../programs/desktop/niri/override-config.nix | 6 +- home/programs/utils/default.nix | 1 - templates/python-analyze/flake.nix | 1 + 5 files changed, 78 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index f4786ff..b1d4b6e 100644 --- a/flake.lock +++ b/flake.lock @@ -113,11 +113,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1741628778, - "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", + "lastModified": 1743774811, + "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", + "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", "type": "github" }, "original": { @@ -411,11 +411,11 @@ ] }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -491,11 +491,11 @@ ] }, "locked": { - "lastModified": 1743860185, - "narHash": "sha256-TkhfJ+vH+iGxLQL6RJLObMmldAQpysVJ+p1WnnKyIeQ=", + "lastModified": 1745128386, + "narHash": "sha256-xnNxL9lZC5Ez8AxTgHZZu8pYSNM34+5GD5jGSs8Vq4M=", "owner": "nix-community", "repo": "home-manager", - "rev": "b5e29565131802cc8adee7dccede794226da8614", + "rev": "f98314bb064cf8f8446c44afbadaaad2505875a7", "type": "github" }, "original": { @@ -513,11 +513,11 @@ ] }, "locked": { - "lastModified": 1741635347, - "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", + "lastModified": 1743869639, + "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", + "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", "type": "github" }, "original": { @@ -540,16 +540,16 @@ ] }, "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "lastModified": 1737371634, + "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.6", + "ref": "v0.0.7", "repo": "ixx", "type": "github" } @@ -582,11 +582,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744511702, - "narHash": "sha256-LEKRZCqj7ERuKk+HI9F2UX7u8KQbBJwrfDFFMHEqiqA=", + "lastModified": 1745124952, + "narHash": "sha256-9yUYPMg0aRHZPjOvuSZV6hpXqfXC7PxEAd7Wrw3uIkY=", "owner": "DreamMaoMao", "repo": "maomaowm", - "rev": "d636ef97ac0d6dc68267ef9a5d813af112f0fc6d", + "rev": "284197be0b8819c1bcee50d8c57e1417dc9377d9", "type": "github" }, "original": { @@ -669,11 +669,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1743846670, - "narHash": "sha256-1U6AklLP3yCo/qhmFvhdRv0YFW0d8TXcw013IOxc/20=", + "lastModified": 1744991948, + "narHash": "sha256-f4xKjzY64l6e28YExcf/V8aLYzBzDdjNI7ZZJGBBz3Y=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f1d37a802c47e22ad4eff4e55d307e9ffb7a440b", + "rev": "a70acecb35de8941bac791c82d8e214d4be70567", "type": "github" }, "original": { @@ -702,17 +702,17 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1745071964, - "narHash": "sha256-kWPC3KjlJv4fV0j7o/vTV6TxEVxzlwfBj5ynYy6RetE=", + "lastModified": 1745314144, + "narHash": "sha256-3LTj3pOU2VIu59voAtHGnMfag6IMk7V/ba0pKkNnQeI=", "owner": "YalTeR", "repo": "niri", - "rev": "0bef1c6c3b44039dac2d858d57d49d8f0ca32c23", + "rev": "4f60ded2c391cf5011a2fa31b2d9caaefebc5df3", "type": "github" }, "original": { "owner": "YalTeR", "repo": "niri", - "rev": "0bef1c6c3b44039dac2d858d57d49d8f0ca32c23", + "rev": "4f60ded2c391cf5011a2fa31b2d9caaefebc5df3", "type": "github" } }, @@ -726,11 +726,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1742568248, - "narHash": "sha256-DLy7a13K73Se+UaRdFJa5QfPmnFvO2yoeg02c8ioR4k=", + "lastModified": 1744423808, + "narHash": "sha256-DiivRNDj39u86uUilkmbgbx2c1NqWVQ3fxw6fFfVO14=", "owner": "nix-community", "repo": "nixd", - "rev": "590eccaa079929daa58316f5386dbcc150e2d50d", + "rev": "3aa27fde1edcf7b126c70a62aad05d120209363c", "type": "github" }, "original": { @@ -826,11 +826,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1743703532, - "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bdb91860de2f719b57eef819b5617762f7120c70", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { @@ -842,11 +842,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1743703532, - "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bdb91860de2f719b57eef819b5617762f7120c70", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { @@ -926,11 +926,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -942,11 +942,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -958,11 +958,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -997,11 +997,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743844372, - "narHash": "sha256-59T+ikFiTt0CiSvuja3/xYahT6SL2s3XtNykfG8l0gk=", + "lastModified": 1745099712, + "narHash": "sha256-fj/S+L9nQyJYdWFk3+8BGPp4tg5rY3uaF6jGADm7OA0=", "owner": "nix-community", "repo": "nixvim", - "rev": "7b4311333b542178828e90f6997d8f03e8327b89", + "rev": "710f9cbd520b8e78fa95d4c5d255891e2b14a277", "type": "github" }, "original": { @@ -1017,11 +1017,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1743861594, - "narHash": "sha256-RNA1vVgCiFIrLvfvROosMvIxNuiB8ozmCEv6VQpSNFY=", + "lastModified": 1745128405, + "narHash": "sha256-em3wtAx+BG2G7hSHXiDEXkBu3z1B2amsJoZBiLar16w=", "owner": "nix-community", "repo": "NUR", - "rev": "45e6dcd45053dec3d486f9667e5727678e36b40c", + "rev": "cd27988fd8321e46df0cdec0c2352f890a42bcff", "type": "github" }, "original": { @@ -1040,11 +1040,11 @@ "treefmt-nix": "treefmt-nix_4" }, "locked": { - "lastModified": 1741693509, - "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=", + "lastModified": 1743884191, + "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=", "owner": "nix-community", "repo": "NUR", - "rev": "5479646b2574837f1899da78bdf9a48b75a9fb27", + "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c", "type": "github" }, "original": { @@ -1063,11 +1063,11 @@ ] }, "locked": { - "lastModified": 1743201766, - "narHash": "sha256-bb/dqoIjtIWtJRzASOe8g4m8W2jUIWtuoGPXdNjM/Tk=", + "lastModified": 1745046075, + "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", "owner": "NuschtOS", "repo": "search", - "rev": "2651dbfad93d6ef66c440cbbf23238938b187bde", + "rev": "066afe8643274470f4a294442aadd988356a478f", "type": "github" }, "original": { @@ -1140,11 +1140,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1743775855, - "narHash": "sha256-ZhhiYvHlA9f/Ck1i76ilfapLS7abLPRlWJQRxJEDTnQ=", + "lastModified": 1744910471, + "narHash": "sha256-HItOUMA2whFnPMJuyN2XHq9TZttgrgOAZcoUXsaD4Js=", "owner": "danth", "repo": "stylix", - "rev": "581fa67c818aaf91a1533149fb737d3e8c0949b8", + "rev": "8d5cd725ad591890c0cd804bf68cc842b8afca51", "type": "github" }, "original": { @@ -1265,11 +1265,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1741468895, - "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=", + "lastModified": 1742851696, + "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=", "owner": "tinted-theming", "repo": "schemes", - "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991", + "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77", "type": "github" }, "original": { @@ -1281,11 +1281,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1740877430, - "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", + "lastModified": 1743296873, + "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", + "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", "type": "github" }, "original": { @@ -1400,11 +1400,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1743748085, - "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=", + "lastModified": 1744961264, + "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d", + "rev": "8d404a69efe76146368885110f29a2ca3700bee6", "type": "github" }, "original": { @@ -1433,11 +1433,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1743346993, - "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=", + "lastModified": 1744860839, + "narHash": "sha256-m/p0wFYey7zqlf5yEJ3g/h+4ZNPkjPsGiMZVJ09aWWw=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3", + "rev": "2b5288b4b9ad2481a033e9c3cc1205108323e7d9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6d2225b..fa3a266 100644 --- a/flake.nix +++ b/flake.nix @@ -54,7 +54,7 @@ }; flake-parts.url = "github:hercules-ci/flake-parts"; niri-unstable = { - url = "github:YalTeR/niri/0bef1c6c3b44039dac2d858d57d49d8f0ca32c23"; + url = "github:YalTeR/niri/4f60ded2c391cf5011a2fa31b2d9caaefebc5df3"; flake = false; }; niri = { diff --git a/home/programs/desktop/niri/override-config.nix b/home/programs/desktop/niri/override-config.nix index 4328b5d..53ec899 100644 --- a/home/programs/desktop/niri/override-config.nix +++ b/home/programs/desktop/niri/override-config.nix @@ -2,7 +2,11 @@ let extraConfig = # kdl - ''''; + '' + overview { + zoom 0.36 + } + ''; finalNiriConfig = with config.lib.stylix.colors.withHashtag; builtins.replaceStrings diff --git a/home/programs/utils/default.nix b/home/programs/utils/default.nix index aeac1bc..489b1ab 100644 --- a/home/programs/utils/default.nix +++ b/home/programs/utils/default.nix @@ -32,7 +32,6 @@ ydotool jq scrcpy - upscaler direnv entr lutgen diff --git a/templates/python-analyze/flake.nix b/templates/python-analyze/flake.nix index 01cadcd..292edac 100644 --- a/templates/python-analyze/flake.nix +++ b/templates/python-analyze/flake.nix @@ -27,6 +27,7 @@ ps: with ps; [ numpy pandas + openpyxl scipy requests matplotlib