diff --git a/common/networking/wireless.nix b/common/networking/wireless.nix index 1f8b9cc..46389ff 100644 --- a/common/networking/wireless.nix +++ b/common/networking/wireless.nix @@ -3,15 +3,26 @@ lib, pkgs, ... -}: { +}: +{ + options = { wireless.enable = lib.mkEnableOption "Enables Wifi and adds my networks"; }; config = lib.mkIf config.wireless.enable { - sops.secrets."wireless.env" = {}; + sops.templates."wpa_supplicant.conf" = { + content = '' + network={ + } + ''; + path = "/etc/wpa_supplicant.conf"; + }; + sops.secrets."wireless.env" = { }; networking.wireless.enable = true; - environment.systemPackages = with pkgs; [wpa_supplicant_gui]; + environment.systemPackages = with pkgs; [ wpa_supplicant_gui ]; networking.wireless.userControlled.enable = true; + networking.wireless.allowAuxiliaryImperativeNetworks = true; + networking.wireless.secretsFile = config.sops.secrets."wireless.env".path; networking.wireless.networks = { "Tycho Station" = { diff --git a/home-manager/machines/grymforge.nix b/home-manager/machines/grymforge.nix index c25d69b..f0c95bb 100644 --- a/home-manager/machines/grymforge.nix +++ b/home-manager/machines/grymforge.nix @@ -34,6 +34,7 @@ ../modules/ssh.nix ../modules/neovim/default.nix ../modules/yazi.nix + ../modules/qutebrowser.nix ]; nixpkgs = { @@ -74,7 +75,7 @@ stylix = { # base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-macchiato.yaml"; base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml"; - image = ../../wallpapers/nixos-wallpaper-catppuccin-latte.png; + image = ../../wallpapers/hollow-knight.jpg; # polarity = "dark"; autoEnable = true; enable = true; diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix index 9c25983..34daf6c 100644 --- a/home-manager/modules/hyprland/default.nix +++ b/home-manager/modules/hyprland/default.nix @@ -57,6 +57,8 @@ in "$shiftMod" = "SUPER_SHIFT"; monitor = [ + "DP-1,2560x2880,0x0, 1" + "HDMI-A-1,3840x2160, 2560x0, 1" ",prefered,auto,1" ]; @@ -74,7 +76,6 @@ in "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" "ELECTRON_OZONE_PLATFORM_HINT,auto" # "GTK_THEME,FlatColor:dark" - # "GTK2_RC_FILES,/home/hadi/.local/share/themes/FlatColor/gtk-2.0/gtkrc" "__GL_GSYNC_ALLOWED,0" "__GL_VRR_ALLOWED,0" "DISABLE_QT5_COMPAT,0" diff --git a/home-manager/modules/nushell/default.nix b/home-manager/modules/nushell/default.nix index 76b2090..bf7b090 100644 --- a/home-manager/modules/nushell/default.nix +++ b/home-manager/modules/nushell/default.nix @@ -32,7 +32,6 @@ prepend /home/myuser/.apps | append /usr/bin/env ) - fastfetch ''; shellAliases = { cd = "z"; diff --git a/hosts/candlekeep/syncthing.nix b/hosts/candlekeep/syncthing.nix index b0e37a8..4a8f2c4 100644 --- a/hosts/candlekeep/syncthing.nix +++ b/hosts/candlekeep/syncthing.nix @@ -4,6 +4,7 @@ ... }: { + services.syncthing = { enable = true; dataDir = "/home/gwg313"; diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index fccb754..3e3f56f 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -1,5 +1,7 @@ restic_key: ENC[AES256_GCM,data:DzpWvFP5gyhrnLVIYgu9ouotWqkOAHehihSKf/TqJE+sHTD4vnIScfhzoKzdkoDoWfkcmQ==,iv:q83qNYuP/3mngvg+kUfOVToogL8VTvZ6HiGIztpnP/s=,tag:YNWwbma0HmPKqYCS1L5kQQ==,type:str] wireless.env: ENC[AES256_GCM,data:/5i0Kv+VFTtVpaD7tfO2ahePu20eYkUYAqoh39PA2aoMWywLddQEQy4arj2Nvcw8hsRk760Kiq4wz3c23dPDqy7rU980NF2RaP4ODMIiQISfYeQP9coD84JhlnSTW+7EkhV520naqJgIYY0IsA8OxR/5euyFMHOL75FKnBh1ILY2DPSsJNG2m2ldw+US7E+7r4REl8tDqKfCIL5tznmbVTbPrer7cwrXe+ScFaholmqSntaB06yIIO3yr88TmE6EXF6oLCXU,iv:DPOqx7M7E83+DYjGFPZy44cxrta/3953IDjXL40rLAc=,tag:KmYBpQKgshMSgxnC96T1bQ==,type:str] +wpa_supplicant-conf: ENC[AES256_GCM,data:TS07YI86+5ZarnYe+0hNZbCI5OoUanZ5kVTfPHVThe+WBHwMLzJhF662ww8zVmHl27CDIvehPfChpUsFMYZUcu47MS8ysJbqZwUm,iv:drQr17arqRIpVzAXYFiHSlKgxjUR4YSYTgu+4Xfpw3Y=,tag:I39eIopvd1WS0L6m2tGBKQ==,type:str] +syncthing_grymforge: ENC[AES256_GCM,data:aOb6/slBdrgibEkkGjsm6lDBt+qMp6RWVS9IawEDTelnou/nO1osLZFI1rbCUrL9kLVfx4EuoKSp9SW3im+o,iv:W+kdDTz07AxWIqR/DK0b1hm7y3YNlsxvTmBWE6cqWCA=,tag:D8Wf8v93vfsONJtpnSowSQ==,type:str] sops: kms: [] gcp_kms: [] @@ -15,8 +17,8 @@ sops: US9oa0pORXRVWWlyYlZZTGhXdTdOaWsKClqIK/YNJIIGFqOO0t4oni8dRTTXQniG ioIwAOdEgE/n0vcYhHXxLxWlTeqGZF076g7EFfIqiSNqrDtacRnazg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-16T02:59:51Z" - mac: ENC[AES256_GCM,data:E8dmBkTvRlVGqPuHLciY4pXyvRqJU8uJo1pjmKaTnKc5s5O/k+bSRcG4XKsD+TLAEqSIE0zQlvTknV+yvc37VNYuxYx0g5KsDzW1zHwzQ2G+87dLSo4V6cCvo+ySdZNTCumal1lKAXGXuWxul34K3U5YG72YPnQpU8WXMQ/y5sk=,iv:uER87eu8mXu5YMGINGtBqeJbULyOdErJvbCASNrqe58=,tag:0bpnLA0Us0VLWA82oyJhxA==,type:str] + lastmodified: "2025-02-15T20:28:32Z" + mac: ENC[AES256_GCM,data:myXEifSHlWh16ZFeWoxCW8XfuxSQka6vLIV8oiyHPXLrgffQseMOgBkXb5e1VPbBqaCx5xjWR3yCgD0Zgl30LKbfyfC8vCLl9/z41nz0MHt6KcKuxF75FG9gkxOMYIapy0IGq/MUiUImMd7KxLEAmLJeGtE3NTBT2h/TupeCd1w=,iv:8OGKy3lBujPt1zMuX41TGYxcYv62Q6hOEjK020Tx9TA=,tag:fgLW4XW4eXiDexYlgCDtPw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.2 diff --git a/wallpapers/hollow-knight.jpg b/wallpapers/hollow-knight.jpg new file mode 100644 index 0000000..0c28daf Binary files /dev/null and b/wallpapers/hollow-knight.jpg differ