diff --git a/.gitignore b/.gitignore index f8fd48a..200ca60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ hardware-configuration.nix calib-data.bin -user-config.nix diff --git a/hosts/default.nix b/hosts/default.nix index 0b6e4fe..176cfef 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -7,7 +7,9 @@ let pkgs = inputs.nixpkgs.legacyPackages.${system}; mkSystem = pkgs: hostname: pkgs.lib.nixosSystem { - specialArgs = { inherit inputs; }; + specialArgs = { + inherit inputs; + }; modules = [ ./base-configuration.nix ./${hostname} diff --git a/hosts/hulk/networking.nix b/hosts/hulk/networking.nix index 41b7be1..07f7a8c 100644 --- a/hosts/hulk/networking.nix +++ b/hosts/hulk/networking.nix @@ -8,4 +8,16 @@ in { networking.wireless.enable = pkgs.lib.mkIf wirelessEnabled true; networking.wireless.userControlled.enable = pkgs.lib.mkIf wirelessEnabled true; + + networking.firewall = { + trustedInterfaces = [ "p2p-wl+" ]; + allowedTCPPorts = [ + 7236 + 7250 + ]; + allowedUDPPorts = [ + 7236 + 5353 + ]; + }; } diff --git a/hosts/hulk/services.nix b/hosts/hulk/services.nix index fb0b294..6ec9dba 100644 --- a/hosts/hulk/services.nix +++ b/hosts/hulk/services.nix @@ -32,6 +32,11 @@ }; }; + services.geoclue2 = { + enableWifi = true; + geoProviderUrl = "https://api.beacondb.net/v1/geolocate"; + }; + services.dbus.enable = true; services.pipewire = { enable = true; diff --git a/profiles/hulk/default.nix b/profiles/hulk/default.nix index c9b26fe..b93c1b2 100644 --- a/profiles/hulk/default.nix +++ b/profiles/hulk/default.nix @@ -8,7 +8,6 @@ in { ./packages.nix # Packages to install ./programs.nix # Programs to enable ./theme.nix # System-wide/GTK theme - ./portal.nix # Desktop portals ]; home = { @@ -25,3 +24,4 @@ in { programs.home-manager.enable = true; home.stateVersion = "24.11"; # DO NOT change this unless you know what you're doing! } + diff --git a/profiles/hulk/portal.nix b/profiles/hulk/portal.nix deleted file mode 100644 index 4ac27ae..0000000 --- a/profiles/hulk/portal.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, ... }: - -let - portals = [ - pkgs.xdg-desktop-portal - pkgs.xdg-desktop-portal-hyprland - pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal-wlr - ]; - - packages = portals ++ [ - pkgs.darkman - ]; -in { - xdg.portal = { - enable = true; - extraPortals = portals; - config = { - common.default = "hyprland"; - "org.freedesktop.impl.portal.Settings".default = "darkman"; - }; - }; - - home.packages = packages; -} diff --git a/profiles/hulk/programs.nix b/profiles/hulk/programs.nix index d7c14c6..f4e7e8c 100644 --- a/profiles/hulk/programs.nix +++ b/profiles/hulk/programs.nix @@ -1,8 +1,6 @@ { inputs, pkgs, ... }: -let - userConfig = import ../../user-config.nix; -in { +{ imports = [ ./fish ]; programs.pywal.enable = true; @@ -56,8 +54,6 @@ in { pywalfox = "command -v pywalfox &>/dev/null && pywalfox light && pywalfox update"; }; - settings.usegeoclue = userConfig.geoclue; - settings.lat = userConfig.latitude; - settings.lng = userConfig.longtitude; + settings.usegeoclue = true; }; } diff --git a/user-config.nix.template b/user-config.nix.template deleted file mode 100644 index 647354c..0000000 --- a/user-config.nix.template +++ /dev/null @@ -1,5 +0,0 @@ -{ - geoclue = true; - latitude = 0; - longtitude = 0; -}