diff --git a/homes/nathan/home-manager/programs/hypridle/default.nix b/homes/nathan/home-manager/programs/hypridle/default.nix index fec174d..f16445f 100644 --- a/homes/nathan/home-manager/programs/hypridle/default.nix +++ b/homes/nathan/home-manager/programs/hypridle/default.nix @@ -15,7 +15,7 @@ settings = { general = { - lock_cmd = "aurora ipc call lockscreen lock"; # avoid starting multiple hyprlock instances. + lock_cmd = "aurora ipc call lockscreen lock"; before_sleep_cmd = "loginctl lock-session"; # lock before suspend. after_sleep_cmd = "hyprctl --instance 0 dispatch dpms on"; # to avoid having to press a key twice to turn on the display. }; diff --git a/profiles/container/default.nix b/profiles/container/default.nix index 3f78e0c..c6d5ede 100644 --- a/profiles/container/default.nix +++ b/profiles/container/default.nix @@ -126,7 +126,6 @@ minimal = false; hyprland.enable = false; wal.enable = false; - hyprlock.enable = false; mpd.enable = true; calcurse.enable = true; rofi.enable = true; diff --git a/profiles/iso/default.nix b/profiles/iso/default.nix index da89d60..60e7aae 100644 --- a/profiles/iso/default.nix +++ b/profiles/iso/default.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: { +{ self, inputs, ... }: { flake.nixosModules.iso = { lib, pkgs, modulesPath, ... }: { @@ -6,7 +6,10 @@ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") - home-manager.nixosModules.default + self.nixosModules.default + self.nixosModules.aurora-greeter + + home-manager.nixosModules.default ]; @@ -17,7 +20,7 @@ fonts.packages = with pkgs; [ nerd-fonts.fira-code ]; environment.systemPackages = with pkgs; [ nerd-fonts.fira-code ]; - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; nixpkgs.hostPlatform = "x86_64-linux"; @@ -31,8 +34,6 @@ users.users.nixos.enable = lib.mkForce false; - services.getty.autologinUser = lib.mkForce null; - networking = { nameservers = [ "1.1.1.1" "1.0.0.1" ]; networkmanager.enable = true; @@ -60,7 +61,6 @@ homeconfig = { minimal = false; hyprland.enable = true; - hyprlock.enable = true; wal.enable = true; mpd.enable = true; rofi.enable = true; @@ -77,7 +77,6 @@ }; services = { - sddm.enable = true; openssh.enable = true; pipewire.enable = true; #kdePlasma6.enable = true; diff --git a/profiles/live/default.nix b/profiles/live/default.nix index 0252ba9..8f31c69 100644 --- a/profiles/live/default.nix +++ b/profiles/live/default.nix @@ -72,7 +72,6 @@ homeconfig = { minimal = false; hyprland.enable = true; - hyprlock.enable = true; wal.enable = true; mpd.enable = true; calcurse.enable = true; diff --git a/system/services/netbird/default.nix b/system/services/netbird/default.nix index 888c78a..bfab486 100644 --- a/system/services/netbird/default.nix +++ b/system/services/netbird/default.nix @@ -20,11 +20,11 @@ enable = config.sysconfig.services.netbird.enable; ui = { enable = true; - #package = pkgs-us.netbird-ui; - package = pkgs.netbird-ui; + package = pkgs-us.netbird-ui; + #package = pkgs.netbird-ui; }; - #package = pkgs-us.netbird; - package = pkgs.netbird; + package = pkgs-us.netbird; + #package = pkgs.netbird; }; }; }; diff --git a/templates/nixos/configuration.nix b/templates/nixos/configuration.nix index 1e31884..720564f 100644 --- a/templates/nixos/configuration.nix +++ b/templates/nixos/configuration.nix @@ -51,7 +51,6 @@ homeconfig = { minimal = false; hyprland.enable = true; - hyprlock.enable = true; wal.enable = true; mpd.enable = true; hyprpanel.enable = true;