vinzenz/nixos-configuration
0
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move kdeconnect settings to nixosModule

Browse source
This commit is contained in:
Vinzenz Schroeter 2025-09-13 14:56:45 +02:00
parent a63f1c69c7
commit 16422ccbd7
7 changed files with 56 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -133,6 +133,7 @@
nixosModules = {
lix = (import ./nixosModules/lix.nix);
kdeconnect = (import ./nixosModules/kdeconnect.nix);
niri = {
imports = [ niri.nixosModules.niri ];
nixpkgs.overlays = [ niri.overlays.niri ];
@ -144,6 +145,7 @@
imports = [
self.nixosModules.pkgs-unstable
self.nixosModules.niri
self.nixosModules.kdeconnect
home-manager.nixosModules.home-manager
servicepoint-simulator.nixosModules.default
servicepoint-cli.nixosModules.default

2
home/vinzenz/gnome.nix
View file

@ -4,7 +4,6 @@
home.packages =
with pkgs.gnomeExtensions;
[
gsconnect
# battery-health-charging
quick-settings-tweaker
solaar-extension
@ -16,7 +15,6 @@
"org/gnome/shell" = {
enabled-extensions = [
"GPaste@gnome-shell-extensions.gnome.org"
"gsconnect@andyholmes.github.io"
"solaar-extension@sidevesh"
"AlphabeticalAppGrid@stuarthayhurst"
];

11
home/vinzenz/niri.nix
View file

@ -16,16 +16,7 @@
name = "adwaita-dark";
};
services = {
kdeconnect = {
enable = true;
# this still shows up in gnome session starting with 25.05
# indicator = true;
};
mako = {
enable = true;
};
};
services.mako.enable = true;
programs.niri.settings = {
input.keyboard.xkb.layout = "de";

20
modules/desktop-environment.nix
View file

@ -26,7 +26,6 @@
};
programs = {
kdeconnect.enable = true;
firefox = {
enable = true;
languagePacks = [
@ -59,25 +58,6 @@
};
};
networking = {
firewall = {
allowedTCPPortRanges = [
{
# KDE Connect / gsconnect
from = 1714;
to = 1764;
}
];
allowedUDPPortRanges = [
{
# KDE Connect / gsconnect
from = 1714;
to = 1764;
}
];
};
};
systemd = {
# save some boot time because nothing actually requires network connectivity
services.NetworkManager-wait-online.enable = false;

3
modules/gnome-shared-dconf.nix
View file

@ -40,7 +40,4 @@
"org/gnome/shell/extensions/alphabetical-app-grid" = {
folder-order-position = "start";
};
"org/gnome/shell/extensions/gsconnect" = {
enabled = true;
};
}

1
modules/gnome.nix
View file

@ -29,7 +29,6 @@
programs = {
dconf.enable = true;
gpaste.enable = true;
kdeconnect.package = pkgs.gnomeExtensions.gsconnect;
};
# remove some gnome default apps

53
nixosModules/kdeconnect.nix Normal file
View file

@ -0,0 +1,53 @@
{
lib,
config,
pkgs,
...
}:
{
config = lib.mkMerge [
{
networking.firewall =
let
kdeconnect-range = {
from = 1714;
to = 1764;
};
in
{
allowedTCPPortRanges = [ kdeconnect-range ];
allowedUDPPortRanges = [ kdeconnect-range ];
};
programs.kdeconnect.enable = true;
home-manager.sharedModules = [
{
services.kdeconnect = {
enable = true;
# this still shows up in gnome session starting with 25.05
# indicator = true;
};
}
];
}
(lib.mkIf config.services.xserver.desktopManager.gnome.enable {
# replace kdeconnect with gsconnect
programs.kdeconnect.package = pkgs.gnomeExtensions.gsconnect;
home-manager.sharedModules = [
(
{ pkgs, ... }:
{
home.packages = [ pkgs.gnomeExtensions.gsconnect ];
# enable gsconnect extension
dconf.settings = {
"org/gnome/shell".enabled-extensions = [ "gsconnect@andyholmes.github.io" ];
"org/gnome/shell/extensions/gsconnect".enabled = true;
};
}
)
];
})
];
}