diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix index 32ca10d..9ea00f3 100644 --- a/hosts/brontes/configuration.nix +++ b/hosts/brontes/configuration.nix @@ -14,11 +14,15 @@ ./home.nix ]; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot.loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; - hardware.bluetooth.enable = true; - hardware.bluetooth.powerOnBoot = true; + hardware.bluetooth = { + enable = true; + powerOnBoot = true; + }; services.blueman.enable = true; @@ -33,6 +37,7 @@ services = { displayManager.sddm.enable = true; dbus.enable = true; + tailscale = { enable = true; extraUpFlags = [ @@ -52,6 +57,7 @@ firefox.enable = true; thunderbird.enable = true; sway.enable = true; + hyprland.enable = true; }; security.polkit.enable = true; diff --git a/hosts/raptus/forgejo/default.nix b/hosts/raptus/forgejo/default.nix index e5ed1d1..d020d65 100644 --- a/hosts/raptus/forgejo/default.nix +++ b/hosts/raptus/forgejo/default.nix @@ -6,14 +6,11 @@ environment = { "USER_GID" = "1000"; "USER_UID" = "1000"; - FORGEJO__migrations__ALLOWED_DOMAINS = true; - FORGEJO__server__SSH_PORT = 222; + FORGEJO__migrations__ALLOWED_DOMAINS = "github.com,*.github.com"; + FORGEJO__server__SSH_PORT = "222"; }; volumes = [ - #"/etc/localtime:/etc/localtime:ro" - #"/etc/timezone:/etc/timezone:ro" "test_forgejo:/data:rw" - "${./app.ini}:/data/gitea/app.ini:ro" ]; ports = [ "3000:3000/tcp" diff --git a/modules/users/ny.nix b/modules/users/ny.nix index 2388d0d..eeb8512 100644 --- a/modules/users/ny.nix +++ b/modules/users/ny.nix @@ -1,11 +1,12 @@ -{ username, ... }: +{ username, pkgs, ... }: { users.users.${username} = { isNormalUser = true; createHome = true; - useDefaultShell = true; extraGroups = [ "wheel" ]; + shell = pkgs.fish; }; + programs.fish.enable = true; }