From c2c32e816cbaae66e82726ec043e70263c365bbe Mon Sep 17 00:00:00 2001 From: beanigen Date: Fri, 21 Feb 2025 13:16:06 +0800 Subject: [PATCH] Add a descriptive commit name --- base/apollo/configuration.nix | 4 +++ flake.lock | 57 ++++++++--------------------------- home/packages.nix | 1 - 3 files changed, 17 insertions(+), 45 deletions(-) diff --git a/base/apollo/configuration.nix b/base/apollo/configuration.nix index ae405e0..23c5c86 100644 --- a/base/apollo/configuration.nix +++ b/base/apollo/configuration.nix @@ -11,6 +11,10 @@ ]; services.blueman.enable = true; programs.steam.enable = true; + services.tailscale = { + enable = true; + useRoutingFeatures = "both"; + }; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/flake.lock b/flake.lock index 594476f..1908f14 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,12 @@ { "nodes": { - "blender-bin": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1739778001, - "narHash": "sha256-Pgt9FcqUJD/Mg+L2cMlvKw5z/WNDJRTg2ZvIho/2upE=", - "path": "/home/maya/.config/nixos/blender-bin", - "type": "path" - }, - "original": { - "path": "/home/maya/.config/nixos/blender-bin", - "type": "path" - } - }, "catppuccin": { "inputs": { "catppuccin-v1_1": "catppuccin-v1_1", "catppuccin-v1_2": "catppuccin-v1_2", "home-manager": "home-manager", "home-manager-stable": "home-manager-stable", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "nuscht-search": "nuscht-search" }, @@ -291,7 +276,7 @@ "nixgl": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1713543440, @@ -309,17 +294,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-24.11", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -351,22 +337,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1660551188, "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", @@ -381,7 +351,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1736012469, "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", @@ -397,7 +367,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1737370608, "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=", @@ -458,7 +428,7 @@ "flake-utils": "flake-utils_3", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nmd": "nmd", "plugin-aerial-nvim": "plugin-aerial-nvim", "plugin-alpha-nvim": "plugin-alpha-nvim", @@ -3302,12 +3272,11 @@ }, "root": { "inputs": { - "blender-bin": "blender-bin", "catppuccin": "catppuccin", "home-manager": "home-manager_2", "nix-index-database": "nix-index-database", "nixgl": "nixgl", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nvf": "nvf" } }, diff --git a/home/packages.nix b/home/packages.nix index c27c70b..7c17526 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -3,7 +3,6 @@ prismlauncher libgpod blender-hip - blender-bin.blender_3_3 libimobiledevice mpc strawberry