diff --git a/flake.lock b/flake.lock index 58fb6ee..94a2fa4 100644 --- a/flake.lock +++ b/flake.lock @@ -15,11 +15,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1772265981, - "narHash": "sha256-JoXciqQCwHdIvENurNwgc6jH1e/d5xcjn9ybYNe+YQI=", + "lastModified": 1773962509, + "narHash": "sha256-DAHcc8ghdDEX+xHPjuKf7qXSL/5G9NqP3mrq5jAKFi0=", "owner": "mrshmllow", "repo": "affinity-nix", - "rev": "cd7bed5b72ceeb50b862c550cc16c6f1b11a2d84", + "rev": "494090443b8086f14ce851ecba8463800176c1c1", "type": "github" }, "original": { @@ -145,11 +145,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1773201798, - "narHash": "sha256-TZQwHvIBz9hr/fci/G/AIjPSKCMtxQm/xFm3MNJ/mVg=", + "lastModified": 1774152686, + "narHash": "sha256-RlEgsdHr9IQm79SsXKNT8iU+ZjjIOPTJXcatMqgSfwk=", "owner": "rycee", "repo": "nur-expressions", - "rev": "016edd132727d8ac364454a6b443ef46c2d1c7e4", + "rev": "4c83dbe717272428562a33db817f492195e227ae", "type": "gitlab" }, "original": { @@ -349,11 +349,11 @@ ] }, "locked": { - "lastModified": 1773264496, - "narHash": "sha256-uwFY0+UfaGEo6205ixeBjplZxHWr56UQef+MtmJ0PW0=", + "lastModified": 1774201162, + "narHash": "sha256-th4i3X3P3yikPk3qu1A5DQ40tIztZKvAKPaa9hjXF+U=", "owner": "nix-community", "repo": "home-manager", - "rev": "32f78141a98098efed490842923b25ecb93b9b9f", + "rev": "932ca46013acabbedd13c27dc278e3d043707e46", "type": "github" }, "original": { @@ -422,11 +422,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772963539, - "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "type": "github" }, "original": { @@ -467,6 +467,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "noctalia": { "inputs": { "nixpkgs": [ @@ -475,11 +491,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773252517, - "narHash": "sha256-t4K/LBLj2UTVpUhdNbpdzexP/sJeCJB1R6nii8QDt28=", + "lastModified": 1774202729, + "narHash": "sha256-rSyMyO1xwqOUwYYQz8R89VKygYMNhvpiqOXp9Fp0mEA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "dbb2e156838e740629e60b1d9f7969aff5868fde", + "rev": "56c0904dc6f1c1b2fbfc06756252eda5c8828a60", "type": "github" }, "original": { @@ -494,14 +510,15 @@ "noctalia", "nixpkgs" ], - "systems": "systems" + "systems": "systems", + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1773175685, - "narHash": "sha256-YOkWzVq7opym1ovJvSCvqpG6OCDGJwPo/EPeRxcGay4=", + "lastModified": 1774059741, + "narHash": "sha256-ObYsrf7XLJDqWVbJ+GWH5JYV/EUc7SVdhGx5r5wWKno=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "6b9eceefde3d47ca83c544b54bcdd358be4cbd2f", + "rev": "c9beee5c634ec784af128b8e7c56db14012ab17f", "type": "github" }, "original": { @@ -634,11 +651,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1772296853, - "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", + "lastModified": 1774124764, + "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=", "owner": "danth", "repo": "stylix", - "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", + "rev": "e31c79f571c5595a155f84b9d77ce53a84745494", "type": "github" }, "original": { @@ -777,6 +794,24 @@ "repo": "treefmt-nix", "type": "github" } + }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1772660329, + "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/hosts/Garand-Desktop/home-modules.nix b/hosts/Garand-Desktop/home-modules.nix index dda1a64..2a7d6b9 100644 --- a/hosts/Garand-Desktop/home-modules.nix +++ b/hosts/Garand-Desktop/home-modules.nix @@ -24,7 +24,7 @@ _: { /* Communication and synchronization */ - kdeconnect.enable = false; # KDE Connect: integrate your phone and desktop + kdeconnect.enable = true; # KDE Connect: integrate your phone and desktop nextcloud-client.enable = true; # Nextcloud Client: sync files with a Nextcloud server vesktop.enable = true; # Vesktop: a community‑driven Discord client diff --git a/hosts/Garand-Laptop/home-modules.nix b/hosts/Garand-Laptop/home-modules.nix index dda1a64..2a7d6b9 100644 --- a/hosts/Garand-Laptop/home-modules.nix +++ b/hosts/Garand-Laptop/home-modules.nix @@ -24,7 +24,7 @@ _: { /* Communication and synchronization */ - kdeconnect.enable = false; # KDE Connect: integrate your phone and desktop + kdeconnect.enable = true; # KDE Connect: integrate your phone and desktop nextcloud-client.enable = true; # Nextcloud Client: sync files with a Nextcloud server vesktop.enable = true; # Vesktop: a community‑driven Discord client diff --git a/modules/core/network.nix b/modules/core/network.nix index db20960..f0e6931 100644 --- a/modules/core/network.nix +++ b/modules/core/network.nix @@ -28,10 +28,22 @@ in { 59011 8080 ]; + allowedTCPPortRanges = [ + { + from = 1714; + to = 1764; + } + ]; allowedUDPPorts = [ 59010 59011 ]; + allowedUDPPortRanges = [ + { + from = 1714; + to = 1764; + } + ]; }; }; } diff --git a/modules/core/nh.nix b/modules/core/nh.nix index 149028e..f23e773 100644 --- a/modules/core/nh.nix +++ b/modules/core/nh.nix @@ -1,6 +1,11 @@ -{username, ...}: { +{ + username, + pkgs, + ... +}: { programs.nh = { enable = true; + package = pkgs.nh; clean = { enable = true; extraArgs = "--keep-since 7d --keep 5"; diff --git a/modules/home/gtk.nix b/modules/home/gtk.nix index cec72b3..471631a 100644 --- a/modules/home/gtk.nix +++ b/modules/home/gtk.nix @@ -4,11 +4,12 @@ name = "Papirus-Dark"; package = pkgs.papirus-icon-theme; }; - gtk3.extraConfig = { - gtk-application-prefer-dark-theme = 1; - }; - gtk4.extraConfig = { - gtk-application-prefer-dark-theme = 1; + gtk3.extraConfig.gtk-application-prefer-dark-theme = 1; + gtk4 = { + theme = null; + extraConfig = { + gtk-application-prefer-dark-theme = 1; + }; }; }; } diff --git a/modules/home/kdeConnect.nix b/modules/home/kdeConnect.nix index 2d1276c..61e1b61 100644 --- a/modules/home/kdeConnect.nix +++ b/modules/home/kdeConnect.nix @@ -6,9 +6,11 @@ }: { options.kdeconnect.enable = lib.mkEnableOption "KDE Connect"; - config.services.kdeconnect = lib.mkIf config.kdeconnect.enable { - enable = true; - indicator = true; - package = pkgs.kdePackages.kdeconnect-kde; + config = { + services.kdeconnect = lib.mkIf config.kdeconnect.enable { + enable = true; + indicator = false; + package = pkgs.kdePackages.kdeconnect-kde; + }; }; } diff --git a/modules/home/noctalia/plugins.nix b/modules/home/noctalia/plugins.nix index 867d369..41dc4bf 100644 --- a/modules/home/noctalia/plugins.nix +++ b/modules/home/noctalia/plugins.nix @@ -1,28 +1,34 @@ -{lib, ...}: { +{lib, ...}: let + sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; +in { programs.noctalia-shell = lib.mkForce { plugins = { sources = [ { enabled = true; name = "Noctalia Plugins"; - url = "https://github.com/noctalia-dev/noctalia-plugins"; + url = sourceUrl; } ]; states = { mini-docker = { enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + sourceUrl = sourceUrl; }; timer = { enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + sourceUrl = sourceUrl; }; keybind-cheatsheet = { enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; + sourceUrl = sourceUrl; + }; + kde-connect = { + enabled = true; + sourceUrl = sourceUrl; }; }; - version = 1; + version = 2; }; pluginSettings = { mini-docker.refreshInterval = 5000; @@ -36,6 +42,9 @@ columnCount = 2; autoHeight = true; }; + kde-connect = { + hideIfNoDeviceConnected = true; + }; }; }; } diff --git a/modules/home/noctalia/settings/bar/widgets/right.nix b/modules/home/noctalia/settings/bar/widgets/right.nix index 564e56b..562ed6b 100644 --- a/modules/home/noctalia/settings/bar/widgets/right.nix +++ b/modules/home/noctalia/settings/bar/widgets/right.nix @@ -27,6 +27,9 @@ showUnreadBadge = true; unreadBadgeColor = "primary"; } + { + id = "plugin:kde-connect"; + } { id = "Bluetooth"; displayMode = "onhover"; diff --git a/modules/home/zed/user-settings/agent.nix b/modules/home/zed/user-settings/agent.nix index 78c3aa3..bf5c7e1 100644 --- a/modules/home/zed/user-settings/agent.nix +++ b/modules/home/zed/user-settings/agent.nix @@ -1,6 +1,5 @@ _: { programs.zed-editor.userSettings.agent = { - always_allow_tool_actions = true; default_profile = "ask"; default_model = { provider = "Cerebras PAUG";