From 32c45a6cb77d7a8be2cd6acdb19b4b3071ca3c99 Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 20 Nov 2024 21:19:04 -0600 Subject: [PATCH] novnc --- flake.lock | 41 ++-- flake.nix | 2 +- home-manager/impermanence/default.nix | 11 +- home-manager/packages/scripts/default.nix | 1 + home-manager/programs/wayvnc/default.nix | 1 + .../configuration/homebox/default.nix | 4 +- system-config/services/containers/default.nix | 1 - .../containers/nixos-remote/default.nix | 202 ------------------ .../services/containers/traefik/default.nix | 3 +- 9 files changed, 39 insertions(+), 227 deletions(-) delete mode 100644 system-config/services/containers/nixos-remote/default.nix diff --git a/flake.lock b/flake.lock index dbc1732..1248833 100644 --- a/flake.lock +++ b/flake.lock @@ -1179,12 +1179,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-5Vm/6rheFRtNpvbMDxdudkXpVkE7Rbo1HDs5G602hkc=", - "path": "/nix/store/5c0w6wxg1pbd8zxjmavhm8i80w6anrx8-source/home-manager", + "narHash": "sha256-UlD6Lt31nfGFbjLfMpp2ajkfzMeT2nqDBWV2U/GjTEM=", + "path": "/nix/store/4sqp8rqa6la9siihnc0wp63gzhm4ybd5-source/home-manager", "type": "path" }, "original": { - "path": "/nix/store/5c0w6wxg1pbd8zxjmavhm8i80w6anrx8-source/home-manager", + "path": "/nix/store/4sqp8rqa6la9siihnc0wp63gzhm4ybd5-source/home-manager", "type": "path" } }, @@ -1551,16 +1551,17 @@ "nixvim": "nixvim_4" }, "locked": { - "dirtyRev": "e6cb7d523142dc038c816fe5be57c19cf7a8d5f3-dirty", - "dirtyShortRev": "e6cb7d5-dirty", - "lastModified": 1727986301, - "narHash": "sha256-EXfHCw4gd6Ck8pu8tyHrg6pjv4Nw9u0ZD9YRN/LjMwM=", + "lastModified": 1732083712, + "narHash": "sha256-z2dKLuUHnJ8tlsZf6l+z+vbnpnb8nYBVFgwjxu609+U=", + "ref": "refs/heads/master", + "rev": "ee443227054f76f7d5177f7fe82bc58e3566760e", + "revCount": 4, "type": "git", - "url": "file:///ssd1/Projects/Nixvim" + "url": "file:///home/nathan/Projects/Nixvim" }, "original": { "type": "git", - "url": "file:///ssd1/Projects/Nixvim" + "url": "file:///home/nathan/Projects/Nixvim" } }, "nixvim_4": { @@ -1646,11 +1647,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-bdsn3cBMySV5RHcYNRe3gp7PWEv6Y8dg9EgLUQU+1os=", - "path": "/nix/store/xk5s091i4yw1dhpyzfi8pkh8li984lp0-source/packages", + "path": "/nix/store/pa72c531bddbrdnz7zss6w0g8pmfghls-source/packages", "type": "path" }, "original": { - "path": "/nix/store/xk5s091i4yw1dhpyzfi8pkh8li984lp0-source/packages", + "path": "/nix/store/pa72c531bddbrdnz7zss6w0g8pmfghls-source/packages", "type": "path" } }, @@ -1719,11 +1720,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-hkYAqDH7SGBTDyADxBxoO2O05iUKVy3eyfOS9C5neAY=", - "path": "/nix/store/xk5s091i4yw1dhpyzfi8pkh8li984lp0-source/programs", + "path": "/nix/store/pa72c531bddbrdnz7zss6w0g8pmfghls-source/programs", "type": "path" }, "original": { - "path": "/nix/store/xk5s091i4yw1dhpyzfi8pkh8li984lp0-source/programs", + "path": "/nix/store/pa72c531bddbrdnz7zss6w0g8pmfghls-source/programs", "type": "path" } }, @@ -1734,11 +1735,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-QahOuoQdXshu38W5uO7hLhG/yFkT7S2l8Dxicq0wdGk=", - "path": "/nix/store/2dmlx8691iid3z7snajqg17x3zjirg45-source/programs", + "path": "/nix/store/6738bz1zq8420nhaa37dsvxqx5knk79m-source/programs", "type": "path" }, "original": { - "path": "/nix/store/2dmlx8691iid3z7snajqg17x3zjirg45-source/programs", + "path": "/nix/store/6738bz1zq8420nhaa37dsvxqx5knk79m-source/programs", "type": "path" } }, @@ -1806,11 +1807,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-0Ztx5DVQ2I7hvCK/qjGa4XTdRgbzM8rhf19m0al8lVM=", - "path": "/nix/store/2dmlx8691iid3z7snajqg17x3zjirg45-source/services/sddm", + "path": "/nix/store/6738bz1zq8420nhaa37dsvxqx5knk79m-source/services/sddm", "type": "path" }, "original": { - "path": "/nix/store/2dmlx8691iid3z7snajqg17x3zjirg45-source/services/sddm", + "path": "/nix/store/6738bz1zq8420nhaa37dsvxqx5knk79m-source/services/sddm", "type": "path" } }, @@ -1841,12 +1842,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-MrACNZd3xvImQGCvwlnYN7MyGjf4unB5v8VcUj2vnCA=", - "path": "/nix/store/5c0w6wxg1pbd8zxjmavhm8i80w6anrx8-source/system-config", + "narHash": "sha256-j+hJofUljxc7sAkUNuv+kQeTvUSnye8bYkg5Jx85gNE=", + "path": "/nix/store/4sqp8rqa6la9siihnc0wp63gzhm4ybd5-source/system-config", "type": "path" }, "original": { - "path": "/nix/store/5c0w6wxg1pbd8zxjmavhm8i80w6anrx8-source/system-config", + "path": "/nix/store/4sqp8rqa6la9siihnc0wp63gzhm4ybd5-source/system-config", "type": "path" } }, diff --git a/flake.nix b/flake.nix index 9f8c590..92e21da 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ system.url = "./system-config"; - nixvim.url = "/ssd1/Projects/Nixvim"; + nixvim.url = "/home/nathan/Projects/Nixvim"; nathan.url = "./home-manager"; diff --git a/home-manager/impermanence/default.nix b/home-manager/impermanence/default.nix index f54524e..890e161 100644 --- a/home-manager/impermanence/default.nix +++ b/home-manager/impermanence/default.nix @@ -1,8 +1,15 @@ -{ inputs, ... }: { +{ config, lib, inputs, ... }: { imports = [ inputs.impermanence.nixosModules.home-manager.impermanence ]; + + options.homeconfig.impermanence.enable = lib.options.mkOption { + type = lib.types.bool; + default = true; + }; + + config = lib.mkIf config.homeconfig.impermanence.enable { home.persistence."/persist/home/nathan" = { @@ -21,4 +28,6 @@ ]; allowOther = true; }; + + }; } diff --git a/home-manager/packages/scripts/default.nix b/home-manager/packages/scripts/default.nix index 686b008..1b25055 100644 --- a/home-manager/packages/scripts/default.nix +++ b/home-manager/packages/scripts/default.nix @@ -83,6 +83,7 @@ hyprctl setcursor Bibata-Modern-Classic 16 & wayvnc & hyprctl reload & + novnc & '') (pkgs.writeShellScriptBin "colorPrefix" '' diff --git a/home-manager/programs/wayvnc/default.nix b/home-manager/programs/wayvnc/default.nix index e57e85a..e99be07 100644 --- a/home-manager/programs/wayvnc/default.nix +++ b/home-manager/programs/wayvnc/default.nix @@ -8,6 +8,7 @@ config = lib.mkIf config.homeconfig.wayvnc.enable { home.packages = with pkgs; [ wayvnc + novnc ]; }; } diff --git a/system-config/configuration/homebox/default.nix b/system-config/configuration/homebox/default.nix index 81b3c1c..ca5e01e 100644 --- a/system-config/configuration/homebox/default.nix +++ b/system-config/configuration/homebox/default.nix @@ -90,7 +90,7 @@ hostName = "homebox"; nameservers = [ "1.1.1.1" "1.0.0.1" ]; networkmanager.enable = true; - firewall.allowedTCPPorts = [ 22 80 443 9000 8080 8081 ]; + firewall.allowedTCPPorts = [ 22 80 443 9000 8080 6080 ]; hosts = { "192.168.100.11" = [ "blunkall.us" "*.blunkall.us" "*.local.blunkall.us" ]; }; @@ -209,6 +209,7 @@ inputs.nathan.homeManagerModule { config.homeconfig = { + impermanence.enable = true; hyprland.enable = true; swaylock.enable = true; wal.enable = true; @@ -259,6 +260,7 @@ gitlab.enable = true; + nixos-remote.enable = true; }; }; }; diff --git a/system-config/services/containers/default.nix b/system-config/services/containers/default.nix index 1e2623c..5bd7b9d 100644 --- a/system-config/services/containers/default.nix +++ b/system-config/services/containers/default.nix @@ -8,6 +8,5 @@ ./jellyfin ./pihole ./nextcloud - ./nixos-remote ]; } diff --git a/system-config/services/containers/nixos-remote/default.nix b/system-config/services/containers/nixos-remote/default.nix deleted file mode 100644 index eefb981..0000000 --- a/system-config/services/containers/nixos-remote/default.nix +++ /dev/null @@ -1,202 +0,0 @@ -{ config, lib, pkgs, inputs, ... }: { - - options.sysconfig.opts.virtualization.nixos-remote.enable = lib.options.mkOption { - type = lib.types.bool; - default = false; - }; - - config = lib.mkIf config.sysconfig.opts.virtualization.nixos-remote.enable { - - containers.nixos-remote = { - - autoStart = false; - privateNetwork = true; - hostAddress = "192.168.100.10"; - localAddress = "192.168.100.17"; - - forwardPorts = [ - { - containerPort = 5900; - hostPort = 5910; - } - ]; - - extraFlags = [ "-U" ]; - - config = { - - imports = [ - inputs.home-manager.nixosModules.default - ]; - - users.users.nixos = { - isNormalUser = true; - extraGroups = [ "wheel" ]; - initialPassword = "1234"; - }; - - home-manager = { - extraSpecialArgs = { inherit inputs; }; - backupFileExtension = "backup"; - users.nixos = { - - home.username = "nixos"; - - home.homeDirectory = "/home/nixos"; - - home.file = { - ".config/hypr/hyprland.conf".text = '' - -monitor=HEADLESS-2,1920x1080@60,0x0,1 - -execOnce = ${pkgs.dunst}/bin/dunst & ${pkgs.wayvnc}/bin/wayvnc 0.0.0.0 & - -input { - kb_layout = us - kb_variant = - kb_model = - kb_options = - kb_rules = - - follow_mouse = 1 - - touchpad { - natural_scroll = yes - } - - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. -} - -cursor { - no_hardware_cursors = true -} - -general { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - gaps_in = 5 - gaps_out = 4 - border_size = 2 - col.active_border = $color1 $color5 100deg - col.inactive_border = $color0 - - layout = dwindle -} -decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more - - rounding = 2 - - blur { - enabled = false - } - - - drop_shadow = yes - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) -} - -animations { - enabled = yes - - # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - - animation = windows, 1, 7, myBezier - animation = windowsOut, 1, 7, default, popin 80% - animation = border, 1, 10, default - animation = borderangle, 1, 8, default - animation = fade, 1, 7, default - animation = workspaces, 1, 6, default -} - - - -dwindle { - # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more - pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = yes # you probably want this -} - -master { - # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - new_status = "master" -} - -gestures { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = off -} - -misc { - disable_hyprland_logo = false - disable_splash_rendering = true - force_default_wallpaper = 2 -} - -$mainMod = ALT - -bind = $mainMod, E, exec, kitty - -bind = $mainMod, B, exec, firefox - -bind = $mainMod, Q, killactive, - - - ''; - }; - }; - }; - - nix = { - nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; - settings.experimental-features = [ "nix-command" "flakes" ]; - }; - - services = { - xserver = { - enable = true; - videoDrivers = [ "nvidia" ]; - }; - displayManager = { - enable = true; - sddm = { - enable = true; - wayland.enable = true; - settings = { - Autologin = { - User = "nixos"; - Session = "hyprland"; - Relogin = true; - }; - }; - }; - }; - }; - - environment = { - sessionVariables = { - WLR_BACKENDS = "headless"; - WLR_LIBINPUT_NO_DEVICES = "1"; - NIXOS_OZONE_WL = "1"; - }; - systemPackages = with pkgs; [ - kitty - firefox-wayland - ]; - }; - - programs.hyprland = { - enable = true; - xwayland.enable = true; - }; - - - - system.stateVersion = "24.05"; - }; - }; - }; -} diff --git a/system-config/services/containers/traefik/default.nix b/system-config/services/containers/traefik/default.nix index 9b02fd2..714268c 100644 --- a/system-config/services/containers/traefik/default.nix +++ b/system-config/services/containers/traefik/default.nix @@ -165,7 +165,6 @@ rule = "Host(`gitlab.blunkall.us`)"; service = "gitlab"; tls.certResolver = "cloudflare"; - #middlewares = [ "authentik" ]; }; nextcloud = { @@ -230,6 +229,8 @@ pihole.loadBalancer.servers = [ { url = "http://192.168.100.10:8080"; } ]; + novnc.loadBalancer.servers = [ { url = "http://192.168.100.10:6080"; } ]; + nextcloud.loadBalancer.servers = [ { url = "http://192.168.100.15:80"; } ]; }; };