diff --git a/home-manager/nathan/packages/scripts/default.nix b/home-manager/nathan/packages/scripts/default.nix index 7252103..3e899db 100644 --- a/home-manager/nathan/packages/scripts/default.nix +++ b/home-manager/nathan/packages/scripts/default.nix @@ -81,7 +81,6 @@ hyprctl setcursor Bibata-Modern-Classic 16 & sleep 3 hyprctl reload & - novnc & #tmux new-session -s hyprland '') diff --git a/system-config/configuration/laptop/default.nix b/system-config/configuration/laptop/default.nix index fee0884..7978122 100644 --- a/system-config/configuration/laptop/default.nix +++ b/system-config/configuration/laptop/default.nix @@ -72,6 +72,7 @@ steam.enable = true; pipewire.enable = true; ags.enable = true; + kdePlasma6.enable = true; hyprland.enable = true; git.enable = true; nh.enable = true; diff --git a/system-config/configuration/container-nathan/default.nix b/system-config/configuration/sandbox-nathan/default.nix similarity index 94% rename from system-config/configuration/container-nathan/default.nix rename to system-config/configuration/sandbox-nathan/default.nix index de06106..de4528c 100644 --- a/system-config/configuration/container-nathan/default.nix +++ b/system-config/configuration/sandbox-nathan/default.nix @@ -15,7 +15,7 @@ }; displayManager = { enable = true; - #defaultSession = "hyprland"; + defaultSession = "plasmawayland.desktop"; autoLogin = { enable = true; user = "nathan"; @@ -25,12 +25,12 @@ }; systemd.extraConfig = "DefaultLimitNOFILE=2048"; - +/* environment.sessionVariables = { WLR_BACKENDS = "headless"; WLR_LIBINPUT_NO_DEVICES = "1"; }; - +*/ programs.zsh.enable = true; environment.shells = with pkgs; [ zsh ]; users.defaultUserShell = pkgs.zsh; @@ -57,13 +57,14 @@ services.displayManager.sddm.settings.AutoLogin = { User = "nathan"; - #Session = "hyprland"; + Session = "plasmawayland.desktop"; Relogin = true; }; networking = { nameservers = [ "1.1.1.1" "1.0.0.1" ]; networkmanager.enable = true; + firewall.allowedTCPPorts = [ 80 ]; }; system.stateVersion = "25.05"; # Did you read the comment? @@ -112,7 +113,6 @@ inputs.nathan-home-manager { config.homeconfig = { - host = "homebox"; minimal = false; wayvnc.enable = true; swaylock.enable = true; @@ -133,7 +133,7 @@ openssh.enable = true; pipewire.enable = true; ags.enable = true; - hyprland.enable = true; + kdePlasma6.enable = true; git.enable = true; nh.enable = true; netbird.enable = true; diff --git a/system-config/configuration/container-nathan/secrets.yaml b/system-config/configuration/sandbox-nathan/secrets.yaml similarity index 100% rename from system-config/configuration/container-nathan/secrets.yaml rename to system-config/configuration/sandbox-nathan/secrets.yaml diff --git a/system-config/services/containers/sandbox/default.nix b/system-config/services/containers/sandbox/default.nix new file mode 100644 index 0000000..52ac1f1 --- /dev/null +++ b/system-config/services/containers/sandbox/default.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs, ... }: { + + options.sysconfig.opts.virtualization.sandbox.enable = lib.mkOption { + type = lib.types.bool; + default = false; + }; + + config = lib.mkIf config.sysconfig.opts.virtualization.sandbox.enable { + + containers.sandbox = { + + autoStart = true; + privateNetwork = true; + hostAddress = "192.168.100.10"; + localAddress = "192.168.100.31"; + + flake = "https://gitea.blunkall.us/Blunkall-Technologies/Olympus#sandbox-nathan"; + }; + }; +} diff --git a/system-config/services/sddm/default.nix b/system-config/services/sddm/default.nix index 17ee6cc..587bdad 100644 --- a/system-config/services/sddm/default.nix +++ b/system-config/services/sddm/default.nix @@ -9,16 +9,24 @@ qt.enable = true; + environment.systemPackages = with pkgs; [ (sddm-astronaut.override { embeddedTheme = "cyberpunk"; }) ]; + services.displayManager.sddm = { enable = true; wayland.enable = true; autoNumlock = true; - theme = "${inputs.tokyo-night-sddm-theme { inherit pkgs; }}"; + theme = "sddm-astronaut-theme"; #"${inputs.tokyo-night-sddm-theme { inherit pkgs; }}"; enableHidpi = true; - extraPackages = with pkgs; [ + /*extraPackages = with pkgs; [ libsForQt5.qtsvg libsForQt5.qtquickcontrols2 libsForQt5.qtgraphicaleffects + ];*/ + + extraPackages = with pkgs; [ + kdePackages.qtsvg + kdePackages.qtvirtualkeyboard + kdePackages.qtmultimedia ]; }; };