diff --git a/flake.lock b/flake.lock index 9b92f9b..ab2a625 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1662241716, - "narHash": "sha256-urqPvSvvGUhkwzTDxUI8N1nsdMysbAfjmBNZaTYBZRU=", + "lastModified": 1664140963, + "narHash": "sha256-pFxDtOLduRFlol0Y4ShE+soRQX4kbhaCNBtDOvx7ykw=", "owner": "ryantm", "repo": "agenix", - "rev": "c96da5835b76d3d8e8d99a0fec6fe32f8539ee2e", + "rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0", "type": "github" }, "original": { @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1663677921, - "narHash": "sha256-NfQnUfRrjv8DXeugdbQC5El+MMhShP42ohc8iM+UAdM=", + "lastModified": 1664210064, + "narHash": "sha256-df6nKVZe/yAhmJ9csirTPahc0dldwm3HBhCVNA6qWr0=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "088c98a584a38b5f844bb9e9cd32eb28479ca6d7", + "rev": "02d2551c927b7d65ded1b3c7cd13da5cc7ae3fcf", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1663915940, - "narHash": "sha256-6P/xwD2wi05gb3lliwWyhdtK9vKdt7VcZlKFTerd7Ek=", + "lastModified": 1665124759, + "narHash": "sha256-QHusyi8aDtbuGxLHFuuE2kMQF6yGrnXUkAXKZBtJPvA=", "owner": "nix-community", "repo": "fenix", - "rev": "3c8bbc1d99e241efa29df54658615d7f8344c01f", + "rev": "57a65b818c22c56e235dea851a22f56718e0d174", "type": "github" }, "original": { @@ -359,19 +359,21 @@ "inputs": { "nixpkgs": [ "latest" + ], + "utils": [ + "flake-utils" ] }, "locked": { - "lastModified": 1656169755, - "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=", + "lastModified": 1665119273, + "narHash": "sha256-neL/ZRrwk47Ke1nfjk8ltlIm+NRZyA3MBcNbqEGSBeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a3d01fb53f52ac83194081272795aa4612c2381", + "rev": "9fcae11ff29ca5f959b05c206f3724486c28ff07", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", "repo": "home-manager", "type": "github" } @@ -394,11 +396,11 @@ }, "latest": { "locked": { - "lastModified": 1663850217, - "narHash": "sha256-tp9nXo1/IdN/xN9m06ryy0QUAEfoN6K56ObM/1QTAjc=", + "lastModified": 1664989420, + "narHash": "sha256-Q8IxomUjjmewsoJgO3htkXLfCckQ7HkDJ/ZhdYVf/fA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90", + "rev": "37bd39839acf99c5b738319f42478296f827f274", "type": "github" }, "original": { @@ -449,27 +451,26 @@ }, "nixos": { "locked": { - "lastModified": 1663855239, - "narHash": "sha256-A2B7rlFKmBikRwz/cmayWcTAhyIOdp2whjVCDGhg9Xw=", - "owner": "nixos", + "lastModified": 1664989420, + "narHash": "sha256-Q8IxomUjjmewsoJgO3htkXLfCckQ7HkDJ/ZhdYVf/fA=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcc68429a50c4ac051920c72c60e417202c19d79", + "rev": "37bd39839acf99c5b738319f42478296f827f274", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" } }, "nixos-hardware": { "locked": { - "lastModified": 1663229557, - "narHash": "sha256-1uU4nsDLXKG0AHc/VCsNBAEPkTA/07juYhcEWRb1O1E=", + "lastModified": 1665040200, + "narHash": "sha256-glqL6yj3aUm40y92inzRmowGt9aIrUrpBX7eBAMic4I=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "a0df6cd6e199df4a78c833c273781ea92fa62cfb", + "rev": "47fd70289491c1f0c0d9a1f44fb5a9e2801120c9", "type": "github" }, "original": { @@ -480,11 +481,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1663761423, - "narHash": "sha256-bDLXl2BVq7eIQz/8CduZI1SLyhG9u/CrckHd6f7bwPE=", + "lastModified": 1664989420, + "narHash": "sha256-Q8IxomUjjmewsoJgO3htkXLfCckQ7HkDJ/ZhdYVf/fA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d6490a0bd9dfb298fcd8382d3363b86870dc7340", + "rev": "37bd39839acf99c5b738319f42478296f827f274", "type": "github" }, "original": { @@ -520,11 +521,11 @@ ] }, "locked": { - "lastModified": 1663908236, - "narHash": "sha256-lcuz1GrrvaFeHnBRb3pONhEUXHz8yua5wOeLAzxFkdY=", + "lastModified": 1664550666, + "narHash": "sha256-eXfMRd9uItEp3PsYI31FSVGPG9dVC6yF++65ZrGwW8A=", "owner": "berberman", "repo": "nvfetcher", - "rev": "18f375e10d50a3cb4332d630cb2f640fe7d0bd67", + "rev": "9763ad40d59a044e90726653d9253efaeeb053b2", "type": "github" }, "original": { @@ -617,11 +618,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1663689031, - "narHash": "sha256-ElrhxG+zwTOolSsSYtkyFK7MLZKkDi19LyQ6kExoprk=", + "lastModified": 1665059630, + "narHash": "sha256-+v3oi70FpNm8ynQZyAki7PfnvOte0W+I3ucS/GHuCnk=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "5b49745d009634170493a214364261e36228274b", + "rev": "a415fb4c4e00da1b4138f5a7787ae9838e8ab576", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6bfc266..f60597e 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,8 @@ nixConfig.extra-experimental-features = "nix-command flakes"; inputs = { - nixos.url = "github:nixos/nixpkgs/nixos-22.05"; + # nixos.url = "github:nixos/nixpkgs/nixos-22.05"; + nixos.url = "nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; @@ -17,7 +18,8 @@ digga.inputs.home-manager.follows = "home"; digga.inputs.deploy.follows = "deploy"; - home.url = "github:nix-community/home-manager/release-22.05"; + home.url = "github:nix-community/home-manager"; + #home.url = "github:nix-community/home-manager/release-22.05"; # home.url = "path:/home/mae/home-manager"; home.inputs.nixpkgs.follows = "latest"; home.inputs.utils.follows = "flake-utils"; @@ -80,7 +82,6 @@ # fenix.overlay breaks the cache, because it uses the system nixpkgs (_: super: let pkgs = fenix.inputs.nixpkgs.legacyPackages.${super.system}; in fenix.overlay pkgs pkgs) agenix.overlay - nvfetcher.overlay ./pkgs/default.nix peerix.overlay diff --git a/hosts/bootstrap.nix b/hosts/bootstrap.nix deleted file mode 100644 index d491855..0000000 --- a/hosts/bootstrap.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ profiles, ... }: -{ - # build with: `bud build bootstrap bootstrapIso` - # reachable on the local link via ssh root@fe80::47%eno1 - # where 'eno1' is replaced by your own machine's network - # interface that has the local link to the target machine - imports = [ - # profiles.networking - profiles.core - profiles.users.root # make sure to configure ssh keys - profiles.users.nixos - ]; - - boot.loader.systemd-boot.enable = true; - - # will be overridden by the bootstrapIso instrumentation - fileSystems."/" = { device = "/dev/disk/by-label/nixos"; }; -} diff --git a/overlays/manix.nix b/overlays/manix.nix deleted file mode 100644 index d39baa7..0000000 --- a/overlays/manix.nix +++ /dev/null @@ -1,5 +0,0 @@ -final: prev: { - manix = prev.manix.overrideAttrs (o: rec{ - inherit (prev.sources.manix) pname version src; - }); -} diff --git a/users/modules/podman/docker-compat.nix b/users/modules/podman/docker-compat.nix index b7a0f55..0be0dba 100644 --- a/users/modules/podman/docker-compat.nix +++ b/users/modules/podman/docker-compat.nix @@ -5,7 +5,7 @@ let podmanPackage = cfg.package; docker_host = "unix:///run/user/$UID/podman/podman.sock"; - fakeDockerBinary = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" + fakeDockerBinary = pkgs.runCommand "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" { outputs = [ "out" "man" ]; inherit (podmanPackage) meta; @@ -19,12 +19,12 @@ let ln -s $f $man/share/man/man1/$basename done ''; - dockerComposeCompat = pkgs.runCommandNoCC "docker-compose-podman-compat" + dockerComposeCompat = pkgs.runCommand "docker-compose-podman-compat" { buildInputs = [ pkgs.makeWrapper ]; } '' mkdir -p $out/bin - makeWrapper '${pkgs.docker-compose_2}/libexec/docker/cli-plugins/docker-compose' "$out/bin/docker-compose" \ + makeWrapper '${pkgs.docker-compose}/libexec/docker/cli-plugins/docker-compose' "$out/bin/docker-compose" \ --set-default "DOCKER_HOST" 'unix:///run/user/$UID/podman/podman.sock' \ --set-default DOCKER_BUILDKIT 0 ''; diff --git a/users/profiles/vscode/default.nix b/users/profiles/vscode/default.nix deleted file mode 100644 index 51dbbdb..0000000 --- a/users/profiles/vscode/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: -{ - programs.vscode = { - enable = true; - package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ - ms-vsliveshare.vsliveshare - vscodevim.vim - ]; - }; -}