diff --git a/flake.lock b/flake.lock index 5c04e0a..e64c402 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "actual": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1722699490, + "narHash": "sha256-sh0Fny196SJ4btq7bdHSWtFlbVj8GJ0UbpwIcDJ30mA=", + "ref": "refs/heads/main", + "rev": "e1f68d537270d3ca896cbdfd316e6940024da0b3", + "revCount": 12, + "type": "git", + "url": "https://git.xeno.science/xenofem/actual-nix.git" + }, + "original": { + "type": "git", + "url": "https://git.xeno.science/xenofem/actual-nix.git" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -115,13 +133,12 @@ } }, "flake-compat": { - "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -146,10 +163,44 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -164,7 +215,25 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "inputs": { "systems": [ "stylix", @@ -259,11 +328,69 @@ "type": "github" } }, - "nix-minecraft": { + "nix-alien": { "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nix-filter": "nix-filter", + "nix-index-database": "nix-index-database", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1725216861, + "narHash": "sha256-GaCobLXfPYBuhxy2TdlEDAfS3PD4mrUj6NQIPOzQq48=", + "owner": "thiagokokada", + "repo": "nix-alien", + "rev": "f92c20327b240ce2098d227c3674d7c02beea51b", + "type": "github" + }, + "original": { + "owner": "thiagokokada", + "repo": "nix-alien", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nix-alien", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723352546, + "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-index-database", + "type": "github" + } + }, + "nix-minecraft": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1720748198, @@ -280,6 +407,38 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1723362943, + "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a58bc8ad779655e790115244571758e8de055e3d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1715266358, "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", @@ -295,7 +454,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_4": { "locked": { "lastModified": 1724224976, "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", @@ -311,7 +470,23 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_5": { + "locked": { + "lastModified": 1622516815, + "narHash": "sha256-ZjBd81a6J3TwtlBr3rHsZspYUwT9OdhDk+a/SgSEf7I=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7e9b0dff974c89e070da1ad85713ff3c20b0ca97", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "21.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1714912032, "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", @@ -329,12 +504,34 @@ }, "root": { "inputs": { + "actual": "actual", "home-manager": "home-manager", + "nix-alien": "nix-alien", "nix-minecraft": "nix-minecraft", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_4", + "shabitica": "shabitica", "stylix": "stylix" } }, + "shabitica": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1724518687, + "narHash": "sha256-rPKeUG3aKLHF/9t5zAQPvy/QKm/eBXFKP6X+Cr9E7Go=", + "owner": "lomenzel", + "repo": "shabitica", + "rev": "6013624a276b326530ebf8c616fc89e2f23fd3af", + "type": "github" + }, + "original": { + "owner": "lomenzel", + "repo": "shabitica", + "type": "github" + } + }, "stylix": { "inputs": { "base16": "base16", @@ -344,12 +541,12 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_4", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_3", - "systems": "systems_2" + "nixpkgs": "nixpkgs_6", + "systems": "systems_4" }, "locked": { "lastModified": 1724444244, @@ -394,6 +591,36 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 652a9e7..05532d2 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,8 @@ stylix.url = "github:danth/stylix"; nix-minecraft.url = "git+ssh://git@codeberg.org/nix-astral/nix-minecraft.git"; shabitica.url = "github:lomenzel/shabitica"; + actual.url = "git+https://git.xeno.science/xenofem/actual-nix.git"; + nix-alien.url = "github:thiagokokada/nix-alien"; }; outputs = inputs@{ nixpkgs, home-manager, stylix, ... }: diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index d64e3c3..74780f1 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -7,6 +7,11 @@ in { imports = [ ./hardware-configuration.nix inputs.shabitica.nixosModules."x86_64-linux".default + inputs.actual.nixosModules.default + ]; + + environment.systemPackages = with inputs.nix-alien.packages.${system}; [ + nix-alien ]; # System @@ -34,9 +39,10 @@ in { mods.server.sync.enable = true; mods.tailscale.enable = true; mods.openvpn.enable = false; - mods.wireguard.enable = false; + mods.wireguard.enable = true; services.xserver.windowManager.i3.enable = true; + services.actual.enable = true; # Proprietary