From 0d1d7b8c3a7f104010b6d4264182cc36051142e3 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Tue, 1 Apr 2025 15:34:52 +0200 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52' (2025-03-27) → 'github:nix-community/home-manager/55cf1f16324e694c991e846ad5fc897f0f75ac64' (2025-04-01) • Updated input 'niri': 'github:sodiboo/niri-flake/41db28938147dfa2a2d528f24b59b6962b96f0c5' (2025-03-26) → 'github:sodiboo/niri-flake/cdca190c377558ee9109d848b20ecb3bf941ef88' (2025-04-01) • Updated input 'niri/niri-unstable': 'github:YaLTeR/niri/4534d3726676a403eb3dd19d28371bd8acd98401' (2025-03-25) → 'github:YaLTeR/niri/60034a57efd9c8130b05797b37cbc187a8c13145' (2025-04-01) • Updated input 'niri/nixpkgs': 'github:NixOS/nixpkgs/1e5b653dff12029333a6546c11e108ede13052eb' (2025-03-22) → 'github:NixOS/nixpkgs/52faf482a3889b7619003c0daec593a1912fddc1' (2025-03-30) • Updated input 'niri/nixpkgs-stable': 'github:NixOS/nixpkgs/f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092' (2025-03-23) → 'github:NixOS/nixpkgs/7ffe0edc685f14b8c635e3d6591b0bbb97365e6c' (2025-03-30) • Updated input 'niri/xwayland-satellite-unstable': 'github:Supreeeme/xwayland-satellite/b2613aec05f9e3f8488ef924203d62cafb712642' (2025-03-23) → 'github:Supreeeme/xwayland-satellite/45c055696437a08e3989d9b91d9c617b84cc2bc3' (2025-03-30) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/ecaa2d911e77c265c2a5bac8b583c40b0f151726' (2025-03-24) → 'github:NixOS/nixos-hardware/de6fc5551121c59c01e2a3d45b277a6d05077bc4' (2025-03-31) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/698214a32beb4f4c8e3942372c694f40848b360d' (2025-03-25) → 'github:NixOS/nixpkgs/52faf482a3889b7619003c0daec593a1912fddc1' (2025-03-30) • Updated input 'nixpkgs-stable': 'github:NixOS/nixpkgs/d02d88f8de5b882ccdde0465d8fa2db3aa1169f7' (2025-03-25) → 'github:NixOS/nixpkgs/7ffe0edc685f14b8c635e3d6591b0bbb97365e6c' (2025-03-30) • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/8b1bcd4edc0de0a950eb117a37c55294997588b5' (2025-03-27) → 'github:NixOS/nixpkgs/88e992074d86ad50249de12b7fb8dbaadf8dc0c5' (2025-04-01) • Updated input 'stylix': 'github:danth/stylix/2fb8321ea16c595e0208b22021ddaf1f471c634a' (2025-03-27) → 'github:danth/stylix/54721996d6590267d095f63297d9051e9342a33d' (2025-04-01) --- flake.lock | 173 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 130 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index 31011ff..9d0e9d5 100644 --- a/flake.lock +++ b/flake.lock @@ -157,6 +157,20 @@ } }, "flake-compat": { + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-compat_2": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -353,11 +367,11 @@ ] }, "locked": { - "lastModified": 1743097780, - "narHash": "sha256-5tUbaMBKYbfTe/4aXACxmiXG22TgwPBNcfZ8Kg3rt+g=", + "lastModified": 1743513930, + "narHash": "sha256-ExRQkfXHwHbf6nKgnwDB0vSNInUS16cubvEVm3PrHeQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52", + "rev": "55cf1f16324e694c991e846ad5fc897f0f75ac64", "type": "github" }, "original": { @@ -434,11 +448,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742954683, - "narHash": "sha256-ZJBJzpWQcZYuxiX7YbLCaiZl1aOt8xQphXt0ZO0st+8=", + "lastModified": 1743513993, + "narHash": "sha256-4ActcWd2XOBei7ZcDrL8zWxUWh1TxwwsAp6CTwlgjog=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "41db28938147dfa2a2d528f24b59b6962b96f0c5", + "rev": "cdca190c377558ee9109d848b20ecb3bf941ef88", "type": "github" }, "original": { @@ -467,11 +481,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742877599, - "narHash": "sha256-3Xy1mlAUcYSQSpt0Q/flA+o6Y1ZACDW52vVP2CX52w8=", + "lastModified": 1743492917, + "narHash": "sha256-OqLDg0Ody1HX23hgjvjIkfZPNhYKxbkj/ONcDjdD4Ik=", "owner": "YaLTeR", "repo": "niri", - "rev": "4534d3726676a403eb3dd19d28371bd8acd98401", + "rev": "60034a57efd9c8130b05797b37cbc187a8c13145", "type": "github" }, "original": { @@ -480,13 +494,34 @@ "type": "github" } }, + "nixcord": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs_2", + "systems": "systems_2", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1743453178, + "narHash": "sha256-TdVPzQabTKVeX50Mbwu6Tq2l65e5WQk2o3S4NHyRBA0=", + "owner": "kaylorben", + "repo": "nixcord", + "rev": "ea80fdaf62168f85ce9813bc8f21fe45f892f5e7", + "type": "github" + }, + "original": { + "owner": "kaylorben", + "repo": "nixcord", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1742806253, - "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", + "lastModified": 1743420942, + "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", + "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", "type": "github" }, "original": { @@ -496,11 +531,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", "type": "github" }, "original": { @@ -524,11 +559,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742751704, - "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", + "lastModified": 1743367904, + "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", + "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", "type": "github" }, "original": { @@ -540,11 +575,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1743367904, + "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", "type": "github" }, "original": { @@ -555,11 +590,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1743082947, - "narHash": "sha256-wZ/bfXu9x025oNa4pVcwYbgVRSl2tf/izZTegPSljUQ=", + "lastModified": 1743472173, + "narHash": "sha256-xwNv3FYTC5pl4QVZ79gUxqCEvqKzcKdXycpH5UbYscw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b1bcd4edc0de0a950eb117a37c55294997588b5", + "rev": "88e992074d86ad50249de12b7fb8dbaadf8dc0c5", "type": "github" }, "original": { @@ -570,11 +605,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1742800061, + "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", "type": "github" }, "original": { @@ -583,7 +634,7 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -599,7 +650,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1726937504, "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", @@ -622,7 +673,7 @@ "stylix", "nixpkgs" ], - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1741693509, @@ -645,8 +696,9 @@ "home-manager": "home-manager", "lix-module": "lix-module", "niri": "niri", + "nixcord": "nixcord", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unstable-small": "nixpkgs-unstable-small", "stylix": "stylix", @@ -706,14 +758,14 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_2", + "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -721,11 +773,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1743075971, - "narHash": "sha256-8fSI6C19ZTcHgvoLK17wfEEVI08tgnZfSLgVe3E/22w=", + "lastModified": 1743496321, + "narHash": "sha256-xhHg8ixBhZngvGOMb2SJuJEHhHA10n8pA02fEKuKzek=", "owner": "danth", "repo": "stylix", - "rev": "2fb8321ea16c595e0208b22021ddaf1f471c634a", + "rev": "54721996d6590267d095f63297d9051e9342a33d", "type": "github" }, "original": { @@ -750,6 +802,20 @@ } }, "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "id": "systems", + "type": "indirect" + } + }, + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -764,7 +830,7 @@ "type": "github" } }, - "systems_3": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -862,6 +928,27 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixcord", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742370146, + "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "stylix", @@ -888,9 +975,9 @@ "crane": "crane_2", "fenix": "fenix_2", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "rust-manifest": "rust-manifest", - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1739736913, @@ -926,11 +1013,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742773235, - "narHash": "sha256-YhJex62HHVF6EfdGLIC01uM6jH8XJu5ryZ+LlhG7wMs=", + "lastModified": 1743346993, + "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b2613aec05f9e3f8488ef924203d62cafb712642", + "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3", "type": "github" }, "original": { From 279aebf54e066eb79a6facd80f1b8a55df22f644 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Tue, 1 Apr 2025 17:57:28 +0200 Subject: [PATCH 2/3] fix vencord startup corner radius mismatch --- modules/desktop/home/niri/quirks.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/desktop/home/niri/quirks.nix b/modules/desktop/home/niri/quirks.nix index 070f2fd..1f4eb31 100644 --- a/modules/desktop/home/niri/quirks.nix +++ b/modules/desktop/home/niri/quirks.nix @@ -38,6 +38,21 @@ border.enable = false; shadow.enable = false; } + { + matches = [ + { + app-id = "vesktop"; + title = "vesktop"; + is-floating = true; + } + ]; + geometry-corner-radius = let val = 5.; in { + bottom-left = val; + bottom-right = val; + top-left = val; + top-right = val; + }; + } ]; # fix electron apps not doing wayland From b8c6e0c19636ba752b104051f557e6087be4bfff Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Tue, 1 Apr 2025 17:58:07 +0200 Subject: [PATCH 3/3] add vencord (yes, ik, wrong order) --- flake.nix | 7 +++++++ modules/desktop-legacy/social.nix | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/flake.nix b/flake.nix index 4ff56c9..e33d645 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ stylix.url = "github:danth/stylix"; typst-within.url = "github:schrottkatze/typst"; crane.url = "github:ipetkov/crane"; + nixcord.url = "github:kaylorben/nixcord"; lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module"; inputs.nixpkgs.follows = "nixpkgs"; @@ -79,6 +80,9 @@ home-manager.extraSpecialArgs = { inherit pkgs-unstable-small pkgs-stable typst-within; }; + home-manager.sharedModules = [ + inputs.nixcord.homeManagerModules.nixcord + ]; home-manager.users.jade = { nixosConfig, pkgs, @@ -106,6 +110,9 @@ home-manager.extraSpecialArgs = { inherit pkgs-unstable-small pkgs-stable typst-within; }; + home-manager.sharedModules = [ + inputs.nixcord.homeManagerModules.nixcord + ]; home-manager.users.jade = { nixosConfig, pkgs, diff --git a/modules/desktop-legacy/social.nix b/modules/desktop-legacy/social.nix index 2dcde86..dca396b 100644 --- a/modules/desktop-legacy/social.nix +++ b/modules/desktop-legacy/social.nix @@ -16,6 +16,17 @@ in pkgs-stable, ... }: { + programs.nixcord = { + enable = true; + vesktop = { + enable = true; + # autoScroll.enable = true; + }; + config = { + frameless = true; + disableMinSize = true; + }; + }; home.packages = with pkgs; [ signal-desktop mumble