diff --git a/home-manager/home.nix b/home-manager/home.nix index 63017ddf..3d040e70 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -48,6 +48,7 @@ r2modman parsec-bin notesnook + anytype ungoogled-chromium ]; file."${config.home.homeDirectory}/.xprofile".text = '' diff --git a/hosts/server/default.nix b/hosts/server/default.nix index 13390552..9b4eb0c3 100644 --- a/hosts/server/default.nix +++ b/hosts/server/default.nix @@ -42,6 +42,11 @@ }; }; + programs.neovim = { + enable = true; + defaultEditor = true; + }; + # enable vaapi on OS-level nixpkgs.config.packageOverrides = pkgs: { vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; diff --git a/hosts/server/secrets.nix b/hosts/server/secrets.nix index 0c2ec5fe..9ecf15f8 100644 --- a/hosts/server/secrets.nix +++ b/hosts/server/secrets.nix @@ -1,9 +1,9 @@ { age = { secrets = { - mullvad_wireguard.file = ../../mullvad_wireguard.age; - homepage.file = ../../homepage.age; - wireguard_server.file = ../../wireguard_server.age; + mullvad_wireguard.file = ../../secrets/mullvad_wireguard.age; + homepage.file = ../../secrets/homepage.age; + wireguard_server.file = ../../secrets/wireguard_server.age; }; }; } diff --git a/hosts/server/wireguard.nix b/hosts/server/wireguard.nix index e5160411..bd8aa8ba 100644 --- a/hosts/server/wireguard.nix +++ b/hosts/server/wireguard.nix @@ -55,7 +55,7 @@ in { } { publicKey = "0XXP3UgA67bcImCB4UOvyno3fhiBx7v6ufd4y4MH1xE="; - allowedIPs = [ "10.0.0.2/28" "fdc9:281f:04d7:9ee9::2/64" ]; + allowedIPs = [ "10.0.0.16/28" "fdc9:281f:04d7:9ee9::2/64" ]; } ]; }; diff --git a/nixos-modules/allowed-unfree.nix b/nixos-modules/allowed-unfree.nix index b11ac700..5b1f6b4a 100644 --- a/nixos-modules/allowed-unfree.nix +++ b/nixos-modules/allowed-unfree.nix @@ -13,6 +13,7 @@ "steam-original" "steam-unwrapped" "parsec-bin" + "anytype" "libXNVCtrl" # for some NVIDIA driver shit # This is required for pkgs.nodePackages_latest.vscode-langservers-extracted on NixOS # however VS Code should NOT be installed on this system! diff --git a/secrets.nix b/secrets.nix index c1b1368f..937b7522 100644 --- a/secrets.nix +++ b/secrets.nix @@ -11,7 +11,7 @@ let "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILUa3f8x3mb2fHF5JXjGKdWF5EUX8GQj7hMhEUn7LffI root@nixos-server" ]; in { - "mullvad_wireguard.age".publicKeys = users ++ systems; - "homepage.age".publicKeys = users ++ systems; - "wireguard_server.age".publicKeys = users ++ systems; + "secrets/mullvad_wireguard.age".publicKeys = users ++ systems; + "secrets/homepage.age".publicKeys = users ++ systems; + "secrets/wireguard_server.age".publicKeys = users ++ systems; } diff --git a/homepage.age b/secrets/homepage.age similarity index 100% rename from homepage.age rename to secrets/homepage.age diff --git a/mullvad_wireguard.age b/secrets/mullvad_wireguard.age similarity index 100% rename from mullvad_wireguard.age rename to secrets/mullvad_wireguard.age diff --git a/wireguard_server.age b/secrets/wireguard_server.age similarity index 100% rename from wireguard_server.age rename to secrets/wireguard_server.age