diff --git a/flake.lock b/flake.lock index 0b92549..13400e1 100644 --- a/flake.lock +++ b/flake.lock @@ -51,11 +51,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1666221385, - "narHash": "sha256-HZW4iiNqlPhp1tCAzG07svfsVg8rH3wvVKr2fRTKOTA=", + "lastModified": 1666555794, + "narHash": "sha256-MfGeJoRypj7RzvfsTohCJHEHGw+//EVCP08BU3HfvCM=", "owner": "zhaofengli", "repo": "colmena", - "rev": "956c3363b875695fba30a5a8033dc543c2cd4326", + "rev": "2bd563e847817a3e96b2aa9932109c83bc64e566", "type": "github" }, "original": { @@ -420,11 +420,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1666253070, - "narHash": "sha256-MtaNgghmfp+ywh5mv9FcspFT4ACaYINSN+D98PCkrP0=", + "lastModified": 1666558342, + "narHash": "sha256-qiH0Zgig28yaSyebehrrYiX1y53Y/xFcQW+EFMRSVI0=", "owner": "nix-community", "repo": "home-manager", - "rev": "c485669ca529e01c1505429fa9017c9a93f15559", + "rev": "186d9399f9eb64fb06ea4385732c1cf1624ae2b6", "type": "github" }, "original": { @@ -439,11 +439,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1666436256, - "narHash": "sha256-ULd4wRwyCSuUZyzBhSMIMLHGswc5tQib0zL60UFDjr0=", + "lastModified": 1666473034, + "narHash": "sha256-UfnSWkp4gWf2AA6hyru9Gv1Rb5Ixvsx1RkZ2iVhgC3w=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3a27ef5e12f0336b0a4bfce0ba98be45f0f5ef51", + "rev": "10303259f7c6f3e64e74e9ca8a31d4223071d5f0", "type": "github" }, "original": { @@ -550,11 +550,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1666230919, - "narHash": "sha256-gVbo0uLZIGW2RPtVY02ZRPlXRAYHtWl4WWZmmDzdurs=", + "lastModified": 1666489879, + "narHash": "sha256-8F7YIR/zoYGRj+7CskPJE9DgoqMfBKixLAZ4TnJPqRU=", "owner": "jyooru", "repo": "nix-minecraft-servers", - "rev": "36451bfa96b82304a34f44c190aa26aaa7cec7fc", + "rev": "c5a5fc2b24c27add833eed1708ab106a6026fa27", "type": "github" }, "original": { @@ -706,11 +706,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1665643254, - "narHash": "sha256-IBVWNJxGCsshwh62eRfR6+ry3bSXmulB3VQRzLQo3hk=", + "lastModified": 1666377499, + "narHash": "sha256-dZZCGvWcxc7oGnUgFVf0UeNHsJ4VhkTM0v5JRe8EwR8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba187fbdc5e35322c7dff556ef2c47bddfd6e8d7", + "rev": "301aada7a64812853f2e2634a530ef5d34505048", "type": "github" }, "original": { @@ -737,11 +737,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1666437276, - "narHash": "sha256-VX+/acMDz8CFONswygzNXfvBwa4/nQs2AzdDAFnAffk=", + "lastModified": 1666558397, + "narHash": "sha256-YEBilpg0HAK8DxxY44a2BKfdxdjTB3qvAFzbi/6zAlE=", "owner": "NULLx76", "repo": "nixpkgs", - "rev": "903bb07c98e793b163bb5ee4be4c301fd20b08f4", + "rev": "95da315931c323adb23401f5903f59979c744a38", "type": "github" }, "original": { @@ -1111,11 +1111,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1665405587, - "narHash": "sha256-lVL48azhjGA/oEIcUSZQNwomNs0EzPxCcjgzyDST0PM=", + "lastModified": 1666466001, + "narHash": "sha256-ZjxAnqtcGmHQHKL1Z9sIraDnzIqrJleWcJXfPtzAm74=", "owner": "wlroots", "repo": "wlroots", - "rev": "221ee83d440fb7dcbfd141ef3a459a5a973331b6", + "rev": "c2d2773df57750081b16d56da13b5015d752cbd7", "type": "gitlab" }, "original": { diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix index 8aa16ed..4896852 100644 --- a/nixos/hosts/thalassa/null/home/default.nix +++ b/nixos/hosts/thalassa/null/home/default.nix @@ -41,6 +41,7 @@ in { libnotify neofetch nixpkgs-review + mullvad-vpn plex-media-player plexamp python3 @@ -57,7 +58,7 @@ in { wf-recorder # Screenrecorder wl-clipboard # Clipboard manager wofi # Wayland rofi - wpa_gui + wpa_supplicant_gui ]; xdg.mimeApps = { @@ -143,6 +144,7 @@ in { }; extensions = with pkgs.vscode-extensions; with pkgs.v.vscode-extensions; [ + astro-build.astro-vscode brettm12345.nixfmt-vscode catppuccin.catppuccin-vsc codezombiech.gitignore diff --git a/nixos/hosts/thalassa/null/networking.nix b/nixos/hosts/thalassa/null/networking.nix index a89c356..0de1672 100644 --- a/nixos/hosts/thalassa/null/networking.nix +++ b/nixos/hosts/thalassa/null/networking.nix @@ -5,6 +5,9 @@ openFirewall = false; mode = "laptop"; }; + + services.mullvad-vpn.enable = true; + networking = { useDHCP = true; dhcpcd.wait = "background"; diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix index 981a3a7..b13c7d8 100644 --- a/nixos/pkgs/default.nix +++ b/nixos/pkgs/default.nix @@ -21,9 +21,6 @@ final: prev: { vscode-extensions = { platformio.platformio-ide = prev.callPackage ./vscode-extensions/platformio.nix { }; - - # ms-vscode.live-server = - # prev.callPackage ./vscode-extensions/live-server.nix; }; }; } diff --git a/nixos/pkgs/vscode-extensions/astro.nix b/nixos/pkgs/vscode-extensions/astro.nix new file mode 100644 index 0000000..5f874c6 --- /dev/null +++ b/nixos/pkgs/vscode-extensions/astro.nix @@ -0,0 +1,10 @@ +{ vscode-utils, lib }: +let inherit (vscode-utils) buildVscodeMarketplaceExtension; +in buildVscodeMarketplaceExtension { + mktplcRef = { + name = "astro-vscode"; + publisher = "astro-build"; + version = "0.5.2022102001"; + sha256 = lib.fakeSha256; + }; +}