From e35d5c36e614ee5b5ffcbc7bb554054fdd763d1c Mon Sep 17 00:00:00 2001 From: Jimbo Date: Tue, 18 Feb 2025 20:44:04 -0500 Subject: [PATCH] Nix Registry, Telegram Remove Telegram Desktop and add the Unstable Nix registry --- flake.lock | 18 +++++++++--------- modules/home/programs/misc/general/default.nix | 1 - modules/home/settings/nix/default.nix | 5 +++-- modules/home/wms/niri/autostart/default.nix | 1 - modules/home/wms/niri/rules/default.nix | 6 ------ modules/home/wms/sway/autostart/default.nix | 1 - modules/home/wms/sway/rules/default.nix | 1 - 7 files changed, 12 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 08220ba..d0e2573 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1739791827, - "narHash": "sha256-l6ooDEtfzet9qRQxlb5A+H6eY7VPpdiGMwqX0nqD1xM=", + "lastModified": 1739841949, + "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", "owner": "nix-community", "repo": "disko", - "rev": "af4a580628e98302bb922c01e1169ce08d7bee57", + "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", "type": "github" }, "original": { @@ -314,11 +314,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1739756973, - "narHash": "sha256-76SWjSvK8rLD1naSltv6G8cq0hGa55mjTAbwu8CllRc=", + "lastModified": 1739843142, + "narHash": "sha256-jpF2zYTQypG7ft7c4MoT8gitn5JAYuuv0XMVKwU8Fs0=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "8f62b0011ad2e219314df3a955150e63eb6e5503", + "rev": "ddda2b8d3e0cfd9d76f72b05b952ee3ef1e59b5f", "type": "github" }, "original": { @@ -442,11 +442,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739824570, - "narHash": "sha256-zj1b2jPID1CHEsmVHk+QcbarNoK2RPS55NRQ60DO5iQ=", + "lastModified": 1739903703, + "narHash": "sha256-w2tTcjx39lJoPDaFbIxi+INIjAKE0jbIx9TNjj9ghmg=", "owner": "nix-community", "repo": "NUR", - "rev": "eb69d09d62b3556f663d7cb703f91b37c3723e11", + "rev": "2215ad5c4347f522523715e809f5f2022509f504", "type": "github" }, "original": { diff --git a/modules/home/programs/misc/general/default.nix b/modules/home/programs/misc/general/default.nix index 4a83311..f0c73a9 100644 --- a/modules/home/programs/misc/general/default.nix +++ b/modules/home/programs/misc/general/default.nix @@ -3,7 +3,6 @@ home.packages = with pkgs; lib.mkIf config.home.desktop.enable [ bc libreoffice - telegram-desktop vesktop ]; } diff --git a/modules/home/settings/nix/default.nix b/modules/home/settings/nix/default.nix index 2dd08a3..81b80b5 100644 --- a/modules/home/settings/nix/default.nix +++ b/modules/home/settings/nix/default.nix @@ -1,7 +1,8 @@ -{ lib, pkgs, ... }: +{ unstable, lib, pkgs, ... }: { nix = { - package = lib.mkForce pkgs.nix; + package = lib.mkForce pkgs.nix; + registry.unstable.flake = unstable; settings.experimental-features = [ "nix-command" "flakes" diff --git a/modules/home/wms/niri/autostart/default.nix b/modules/home/wms/niri/autostart/default.nix index 8f76b65..585feeb 100644 --- a/modules/home/wms/niri/autostart/default.nix +++ b/modules/home/wms/niri/autostart/default.nix @@ -17,6 +17,5 @@ //spawn-at-startup "librewolf" "-p" "Misc" "--name" "MiscBrowser" spawn-at-startup "thunderbird" spawn-at-startup "vesktop" - spawn-at-startup "telegram-desktop" ''; } diff --git a/modules/home/wms/niri/rules/default.nix b/modules/home/wms/niri/rules/default.nix index ec5791e..a5ee0ec 100644 --- a/modules/home/wms/niri/rules/default.nix +++ b/modules/home/wms/niri/rules/default.nix @@ -19,12 +19,6 @@ open-maximized true open-on-workspace "${config.ws.w7}" } - window-rule { - match app-id="org.telegram.desktop" - block-out-from "screencast" - open-maximized true - open-on-workspace "${config.ws.w8}" - } window-rule { match app-id="thunderbird" block-out-from "screencast" diff --git a/modules/home/wms/sway/autostart/default.nix b/modules/home/wms/sway/autostart/default.nix index 92080af..6d40227 100644 --- a/modules/home/wms/sway/autostart/default.nix +++ b/modules/home/wms/sway/autostart/default.nix @@ -22,7 +22,6 @@ # Foreground { command = "thunderbird"; } { command = "vesktop"; } - { command = "telegram-desktop"; } ]; }; } diff --git a/modules/home/wms/sway/rules/default.nix b/modules/home/wms/sway/rules/default.nix index 874e72d..0a50d13 100644 --- a/modules/home/wms/sway/rules/default.nix +++ b/modules/home/wms/sway/rules/default.nix @@ -58,7 +58,6 @@ { app_id = "MiscBrowser"; } { app_id = "vesktop"; } ]; - "8:${config.ws.w8}" = [{ app_id = "org.telegram.desktop"; }]; "9:${config.ws.w9}" = [{ app_id = "thunderbird"; }]; # Etc