diff --git a/flake.lock b/flake.lock index 38bf172..03ac8a2 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1719827439, - "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", + "lastModified": 1735925111, + "narHash": "sha256-/NptDI4njO5hH0ZVQ2yzbvTXmBOabZaGYkjhnMJ37TY=", "owner": "nix-community", "repo": "home-manager", - "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", + "rev": "ef64efdbaca99f9960f75efab991e4c49e79a5f1", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719681865, - "narHash": "sha256-Lp+l1IsREVbz8WM35OJYZz8sAH0XOjrZWUXVB5bJ2qg=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a59f00f5ac65b19382617ba00f360f8bc07ed3ac", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719690277, - "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e5c7682..3b9dc42 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,4 @@ { - description = "System config"; inputs = { @@ -37,6 +36,76 @@ Install.WantedBy = [ "default.target" ]; }; + programs.ghostty = { + enable = true; + settings = { + window-decoration = false; + font-family = "Recursive Mono Linear Static"; + font-size = 16; + #theme = "GruvboxDarkHard"; + #theme = "Horizon"; + #theme = "IC_Green_PPL"; + #theme = "IC_Orange_PPL"; + #theme = "iceberg-dark"; + #theme = "Kanagawa Dragon"; + #theme = "Kanagawa Wave"; + #theme = "kanagawabones"; + #theme = "kurokula"; + #theme = "Later This Evening"; + #theme = "MaterialDarker"; + #theme = "MaterialOcean"; + #theme = "matrix"; + #theme = "Medallion"; + #theme = "Mellifluous"; + #theme = "Molokai"; + #theme = "MonaLisa"; + #theme = "Monokai Remastered"; + #theme = "Monokai Soda"; + theme = "NightLion v2"; + #theme = "niji"; + #theme = "Nocturnal Winter"; + #theme = "nord"; + #theme = "NvimDark"; + #theme = "Oceanic-Next"; + #theme = "OneHalfDark"; + #theme = "Paraiso Dark"; + #theme = "PaulMillr"; + #theme = "PencilDark"; + #theme = "Peppermint"; + #theme = "Pnevma"; + #theme = "Popping and Locking"; + #theme = "Red Planet"; + #theme = "rose-pine"; + #theme = "Ryuuko"; + #theme = "SeaShells"; + #theme = "Seti"; + #theme = "Shaman"; + #theme = "Slate"; + #theme = "Smyck"; + #theme = "Snazzy"; + #theme = "SoftServer"; + #theme = "Solarized Dark - Patched"; + #theme = "Solarized Dark Higher Contrast"; + #theme = "SpaceGray Bright"; + #theme = "SpaceGray Eighties"; + #theme = "SpaceGray Eighties Dull"; + #theme = "terafox"; + #theme = "Thayer Bright"; + #theme = "Tinacious Design (Dark)"; + #theme = "tokyonight"; + #theme = "tokyonight-storm"; + #theme = "Tomorrow Night Burns"; + #theme = "UltraViolent"; + #theme = "Violet Dark"; + #theme = "Whimsy"; + #theme = "WildCherry"; + #theme = "wilmersdorf"; + #theme = "Wombat"; + #theme = "xcodewwdc"; + #theme = "zenbones_dark"; + #theme = "zenwritten_dark"; + }; + }; programs.foot = { enable = true; settings = { @@ -45,7 +114,7 @@ #font = "JetBrainsMono:size=8"; #font = "Iosevka:size=18"; #font = "Monoid:size=6"; - font = "Recursive:size=16"; + font = "Recursive:size=16"; # seems to be Recursive Mono Linear Static in Ghostty #dpi-aware = "yes"; }; mouse = { @@ -256,7 +325,7 @@ enable = true; wlr.enable = true; extraPortals = [pkgs.xdg-desktop-portal-gtk ]; - gtkUsePortal = true; + #gtkUsePortal = true; }; hardware.bluetooth.enable = true; @@ -292,14 +361,16 @@ programs.steam.enable = true; environment.systemPackages = with pkgs; [ - tmux vim wget curl git w3m iftop iotop killall file unzip zip p7zip ripgrep imv killall gomuks btop htop python3 - waypipe firefox-wayland chromium gnome.nautilus - vlc mpv wayfarer libreoffice calibre foliate transmission-gtk mupdf + tmux vim wget curl git w3m iftop iotop killall file unzip zip p7zip ripgrep imv killall + btop htop python3 + waypipe firefox-wayland chromium nautilus + vlc mpv wayfarer libreoffice calibre foliate #transmission-gtk mupdf gimp pavucontrol pywal - sway wayland glib dracula-theme gnome.adwaita-icon-theme swaylock swayidle wl-clipboard + sway wayland glib dracula-theme adwaita-icon-theme swaylock swayidle wl-clipboard + circumflex #monado openxr-loader xrgears - lean4 blas elan vscode + #lean4 blas elan vscode (pkgs.writeTextFile { name = "dbus-sway-environment"; destination = "/bin/dbus-sway-environment"; @@ -360,7 +431,7 @@ nixos-hardware.nixosModules.framework-13-7040-amd home-manager.nixosModules.home-manager homeManagerSharedModule - ({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs [ pkgs.light pkgs.gpodder pkgs.evince pkgs.wezterm pkgs.gnome.gnome-tweaks pkgs.vulkan-tools pkgs.openconnect pkgs.blender pkgs.discord]) { + ({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs [ pkgs.light pkgs.gpodder pkgs.evince pkgs.wezterm pkgs.vulkan-tools pkgs.discord]) { # HARDWARE imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -757,7 +828,7 @@ address = "0.0.0.0"; port = 8789; settings.serverUrl = "https://headscale.room409.xyz"; - settings.dns_config.baseDomain = "wg.test"; + settings.dns.base_domain = "wg.test"; settings.logtail.enabled = false; }; @@ -1021,11 +1092,23 @@ }; }; + virtualHosts."batou.room409.xyz" = { + forceSSL = true; + enableACME = true; + locations."/".proxyPass = "http://100.64.0.1:8090"; + }; + #virtualHosts."4800H.room409.xyz" = { # forceSSL = true; # enableACME = true; # locations."/".proxyPass = "http://10.100.0.7:80"; #}; + virtualHosts."neel.room409.xyz" = { + forceSSL = true; + enableACME = true; + basicAuth = { neel = "el_psy_congroo"; }; + locations."/".proxyPass = "http://100.64.0.1:8080"; + }; }; services.journald.extraConfig = "SystemMaxUse=50M"; diff --git a/sway_config b/sway_config index da74ca5..0e0f472 100644 --- a/sway_config +++ b/sway_config @@ -23,8 +23,9 @@ output eDP-1 scale 1 output HDMI-A-1 mode 1920x1080@60Hz #Output DP-4 'LG Electronics LG TV SSCR2 0x00000101' +output DP-3 mode 1280x720@60Hz #output DP-4 mode 1280x720@60Hz -output DP-4 mode 3840x2160@60Hz +#output DP-4 mode 3840x2160@60Hz # reload the configuration file bindsym $mod+Shift+q reload @@ -53,6 +54,7 @@ floating_modifier $mod #bindsym $mod+Return exec st #bindsym $mod+Return exec sakura bindsym $mod+Return exec foot +bindsym $mod+Shift+Return exec ghostty # kill focused window bindsym $mod+Shift+c kill diff --git a/vps_activate_flake.sh b/vps_activate_flake.sh index 39203b0..7028078 100755 --- a/vps_activate_flake.sh +++ b/vps_activate_flake.sh @@ -1,3 +1,3 @@ #!/usr/bin/env sh -nixos-rebuild switch --fast --flake .#vps --target-host root@room409.xyz +NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild switch --fast --flake .#vps --target-host root@room409.xyz --impure