From 9d6ee59233e01d4e3c38d454d86d280ee4967022 Mon Sep 17 00:00:00 2001 From: albert Date: Mon, 18 Nov 2024 20:48:16 +0100 Subject: [PATCH] Testing --- nixos/common/packages/small.nix | 2 +- nixos/default.nix | 3 +-- nixos/hosts/nixos-desktop/default.nix | 5 +---- nixos/hosts/nixos-framework/default.nix | 1 + nixos/hosts/nixos-linode-img/default.nix | 6 +++--- nixos/hosts/nuc-server/cron.nix | 2 +- nixos/hosts/steamdeck/default.nix | 3 +-- nixos/minimal.nix | 2 +- nixos/small.nix | 1 - 9 files changed, 10 insertions(+), 15 deletions(-) diff --git a/nixos/common/packages/small.nix b/nixos/common/packages/small.nix index c3f0b3e2..93210aec 100644 --- a/nixos/common/packages/small.nix +++ b/nixos/common/packages/small.nix @@ -1,4 +1,4 @@ -{ pkgs, system, ... }: { +{ pkgs, ... }: { # List packages installed in system profile environment.systemPackages = with pkgs; [ unzip # Better unzip packages diff --git a/nixos/default.nix b/nixos/default.nix index 8015f842..f112cc3c 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,4 +1,4 @@ -{ inputs, lib, pkgs, hostname, stateVersion, username, desktop, system, ... }: { +{ inputs, lib, hostname, username, desktop, ... }: { imports = [ # Modules inputs.disko.nixosModules.disko @@ -11,7 +11,6 @@ ./common/services/tailscale.nix ./common/services/gnupg-agent.nix ./common/services/opensnitch.nix - ./common/services/geoclue.nix # Software ./common/software/cli/clean-hm.nix diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix index 22352f6f..95e6a5cc 100644 --- a/nixos/hosts/nixos-desktop/default.nix +++ b/nixos/hosts/nixos-desktop/default.nix @@ -10,6 +10,7 @@ ../../common/services/podman.nix ../../common/services/tailscale-autoconnect.nix ../../common/modules/builder.nix + ../../common/services/geoclue.nix ]; #### TEMPORARY TODO #### @@ -37,10 +38,6 @@ powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # Set your time zone. - time.timeZone = "Europe/Warsaw"; - services.automatic-timezoned.enable = true; - # Set the networking hostname: networking.hostName = "nixos-desktop"; diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix index fa53146f..477bde5e 100644 --- a/nixos/hosts/nixos-framework/default.nix +++ b/nixos/hosts/nixos-framework/default.nix @@ -11,6 +11,7 @@ # ../../common/modules/yubikey-auth.nix ../../common/modules/builder.nix ../../common/services/podman.nix + ../../common/services/geoclue.nix ]; hardware.bluetooth.enable = true; # enables support for Bluetooth diff --git a/nixos/hosts/nixos-linode-img/default.nix b/nixos/hosts/nixos-linode-img/default.nix index d1125e84..f45fc3d2 100644 --- a/nixos/hosts/nixos-linode-img/default.nix +++ b/nixos/hosts/nixos-linode-img/default.nix @@ -1,11 +1,11 @@ -{ config, lib, pkgs, modulesPath, desktop, username, ... }: { +{ lib, ... }: { boot = { initrd.kernelModules = [ ]; kernelModules = [ "iptable_nat" "iptable_filter" "xt_nat" ]; extraModulePackages = [ ]; }; - time.timeZone = "Asia/Tokyo"; + time.timeZone = "Europe/UTC"; networking = { hostName = "nixos-linode-img"; @@ -13,4 +13,4 @@ enableIPv6 = lib.mkForce false; firewall.allowedTCPPorts = [ 22 ]; }; -} \ No newline at end of file +} diff --git a/nixos/hosts/nuc-server/cron.nix b/nixos/hosts/nuc-server/cron.nix index 9b8110b6..14a6774b 100644 --- a/nixos/hosts/nuc-server/cron.nix +++ b/nixos/hosts/nuc-server/cron.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ ... }: { services.cron = { enable = true; systemCronJobs = [ diff --git a/nixos/hosts/steamdeck/default.nix b/nixos/hosts/steamdeck/default.nix index 0b09cb83..efac9b65 100644 --- a/nixos/hosts/steamdeck/default.nix +++ b/nixos/hosts/steamdeck/default.nix @@ -4,6 +4,7 @@ ./disks.nix ../../common/modules/boot.nix ../../common/services/tailscale-autoconnect.nix + ../../common/services/geoclue.nix ]; nixpkgs.config.permittedInsecurePackages = [ "electron-27.3.11" @@ -19,8 +20,6 @@ hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot - # Set your time zone. - time.timeZone = "Asia/Tokyo"; # Set the networking hostname: networking.hostName = hostname; diff --git a/nixos/minimal.nix b/nixos/minimal.nix index 8cd6907c..67e75116 100644 --- a/nixos/minimal.nix +++ b/nixos/minimal.nix @@ -1,4 +1,4 @@ -{ inputs, lib, pkgs, hostname, stateVersion, username, desktop, system, ... }: { +{ inputs, lib, hostname, username, desktop, ... }: { imports = [ # Modules inputs.disko.nixosModules.disko diff --git a/nixos/small.nix b/nixos/small.nix index 03d1babe..de5aebe6 100644 --- a/nixos/small.nix +++ b/nixos/small.nix @@ -9,7 +9,6 @@ ./common/services/tailscale.nix ./common/services/promtail.nix ./common/services/telegraf.nix - ./common/services/geoclue.nix # Software ./common/software/cli/clean-hm.nix