From 98fb1316e74e49f22c47368dad619ecd68b1f877 Mon Sep 17 00:00:00 2001 From: Vivian Date: Thu, 24 Oct 2024 22:07:17 +0200 Subject: [PATCH] updates --- common/desktop/home.nix | 2 +- flake.lock | 129 +++++++++++++++++++++-------------- flake.nix | 2 +- hosts/thalassa/aoife/uni.nix | 9 +++ 4 files changed, 90 insertions(+), 52 deletions(-) diff --git a/common/desktop/home.nix b/common/desktop/home.nix index e20aba6b..d861a208 100644 --- a/common/desktop/home.nix +++ b/common/desktop/home.nix @@ -29,7 +29,7 @@ in home.packages = with pkgs; [ (python3.withPackages my-python-packages) btop - calibre + # calibre celluloid # video player element-desktop fusee-launcher diff --git a/flake.lock b/flake.lock index ba7597ed..87ec2b62 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1728577371, - "narHash": "sha256-f3bKclEV5t1eP1OH7kTGv/tLzlToSRIe0ktkdl1jihw=", + "lastModified": 1729116596, + "narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=", "owner": "zhaofengli", "repo": "attic", - "rev": "e5c8d2d50981a34602358d917e7be011b2c397a8", + "rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -606,7 +606,7 @@ "lastModified": 1711359349, "narHash": "sha256-dSHWgOtipLWgSSZFq9tvlaQF9b8Jfk/2mYCX4QS4x50=", "ref": "refs/heads/main", - "rev": "1017642795eb398881eff78a822621f2d2a93be7", + "rev": "06279869e7a26dc91ca3e3abb84a3508d7f977cb", "revCount": 10, "type": "git", "url": "https://git.0x76.dev/v/gnome-autounlock-keyring.git" @@ -623,11 +623,11 @@ ] }, "locked": { - "lastModified": 1729027341, - "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", + "lastModified": 1729716953, + "narHash": "sha256-FbRKGRRd0amsk/WS/UV9ukJ8jT1dZ2pJBISxkX+uq6A=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", + "rev": "a4353cc43d1b4dd6bdeacea90eb92a8b7b78a9d7", "type": "github" }, "original": { @@ -644,11 +644,11 @@ ] }, "locked": { - "lastModified": 1728903686, - "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", + "lastModified": 1729716953, + "narHash": "sha256-FbRKGRRd0amsk/WS/UV9ukJ8jT1dZ2pJBISxkX+uq6A=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", + "rev": "a4353cc43d1b4dd6bdeacea90eb92a8b7b78a9d7", "type": "github" }, "original": { @@ -657,6 +657,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729544999, + "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "65c207c92befec93e22086da9456d3906a4e999c", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.5", + "repo": "ixx", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane_2", @@ -712,11 +740,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1728779945, - "narHash": "sha256-RFKyZygnUbJlWq1uBn4JvEEcQKZW3AFBL3bQoywECPI=", + "lastModified": 1729726792, + "narHash": "sha256-ndjFy5kfhn9MoOOSzGnZ7f2FwRUUY1EJYwXGxK8DzsQ=", "owner": "astro", "repo": "microvm.nix", - "rev": "4d81c4115ef832880561f243efec21f06d2a8b7c", + "rev": "ef42cfface9940b9ce9614307670b60cdbda33f6", "type": "github" }, "original": { @@ -733,11 +761,11 @@ ] }, "locked": { - "lastModified": 1728901530, - "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", + "lastModified": 1729757100, + "narHash": "sha256-x+8uGaX66V5+fUBHY23Q/OQyibQ38nISzxgj7A7Jqds=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", + "rev": "04193f188e4144d7047f83ad1de81d6034d175cd", "type": "github" }, "original": { @@ -748,11 +776,11 @@ }, "nixlib": { "locked": { - "lastModified": 1728781282, + "lastModified": 1729386149, "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b", + "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "type": "github" }, "original": { @@ -769,11 +797,11 @@ ] }, "locked": { - "lastModified": 1728867876, - "narHash": "sha256-NCyOA8WZNoojmXH+kBDrQj3LwvakYNzSc0h+LTXkmPE=", + "lastModified": 1729472750, + "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "fdf142111597f6c6283cf5ffe092b6293a3911d0", + "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", "type": "github" }, "original": { @@ -784,11 +812,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1729742320, + "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", "type": "github" }, "original": { @@ -894,26 +922,26 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1729121138, - "narHash": "sha256-YwgV6ORMYDj32ucAIDjUY+6vV7Sv5RNbnnsQx4+QNw8=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f67841950fe8e33ae6597cc2dac1bc179c3c2627", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "type": "indirect" } }, "nixpkgs_5": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { @@ -952,11 +980,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1729072117, - "narHash": "sha256-vAhQlGF9m3DY/9pgLQlBQnWz7YGuQ+FP3w5Ms5HSnZc=", + "lastModified": 1729791159, + "narHash": "sha256-i5TKYCs9tJ2qaYTsjQh3WwExmj4O0EU+L1jq6ZBVMfM=", "owner": "pta2002", "repo": "nixvim", - "rev": "b9ea7f88b6117f076d3b122d9bec3f379c57a17a", + "rev": "4726334e4413ff55f1db3768c8d08722abbf09cf", "type": "github" }, "original": { @@ -967,11 +995,11 @@ }, "nur": { "locked": { - "lastModified": 1729077813, - "narHash": "sha256-61tT+dRuJ9kGfrKgDRE/ReNw9mgIL/0uep56gehEg5Y=", + "lastModified": 1729799218, + "narHash": "sha256-Zm94AkByXPxdA9LU7fgfkKp5o5pnUGLPIdcqFu+tUDc=", "owner": "nix-community", "repo": "NUR", - "rev": "0fb85cae559957a989166e8cb80a82f316959f8f", + "rev": "4680fc334df27df13fe855d30a51990a1c9975c7", "type": "github" }, "original": { @@ -983,17 +1011,18 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_6", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1728905062, - "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=", + "lastModified": 1729763753, + "narHash": "sha256-M8WAUgKFBU5TvFt92g/dHBtGJmBP33LHird+solHt0g=", "owner": "NuschtOS", "repo": "search", - "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84", + "rev": "bedc2f2ada220815a98a896e10f5e61bfc329bfc", "type": "github" }, "original": { @@ -1255,11 +1284,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1729613947, + "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca", "type": "github" }, "original": { @@ -1313,11 +1342,11 @@ ] }, "locked": { - "lastModified": 1683013874, - "narHash": "sha256-B8bQb9IMkrDvtqFUoF/PuBma8Qa2jU7Xv7cFSchg9V8=", + "lastModified": 1729410873, + "narHash": "sha256-gWcGwGxRSsHtVXGEaCw1bhmqnJaVIjbxJkt98F9HxLE=", "ref": "refs/heads/main", - "rev": "91e7262e87878609c2d6619210988b241e8f8f62", - "revCount": 11, + "rev": "f05093a8d608892d2e4499e02117428b405f82a1", + "revCount": 12, "type": "git", "url": "https://git.0x76.dev/v/vault-unseal.git" }, diff --git a/flake.nix b/flake.nix index 1489a7d0..aa50e451 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ # * https://github.com/Infinidoge/nix-minecraft inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable-small"; + nixpkgs.url = "nixpkgs/nixos-unstable"; flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus"; nur.url = "github:nix-community/NUR"; colmena.url = "github:zhaofengli/colmena"; diff --git a/hosts/thalassa/aoife/uni.nix b/hosts/thalassa/aoife/uni.nix index ed09c077..a7d63877 100644 --- a/hosts/thalassa/aoife/uni.nix +++ b/hosts/thalassa/aoife/uni.nix @@ -13,16 +13,25 @@ virtualisation = { podman.enable = true; + virtualbox.host = { + # enableKvm = true; + enable = true; + enableHardening = false; + enableExtensionPack = true; + }; docker = { enable = false; storageDriver = "btrfs"; }; }; + + users.extraUsers.vivian.extraGroups = [ # "wireshark" # "docker" # "lxd" + "vboxusers" ]; programs.nix-ld = {