diff --git a/flake.lock b/flake.lock index bb67e24..475b2a7 100644 --- a/flake.lock +++ b/flake.lock @@ -92,11 +92,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "narHash": "sha256-Pbw1yggqIzmY23DuxrmSSf9IbOy5olAqVWectq97j20=", - "rev": "4cd8c02f1fdafceee67602203d9672ae1b256946", - "revCount": 287, + "narHash": "sha256-gyxlVSraZIVAyOaJk90fub4b8g1w4KXwqa1ecNAC7xA=", + "rev": "d72db6283e6b6bef7216c8586c16d9f648652400", + "revCount": 353, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.6/018b00f0-e7c5-7bc1-9eff-4921edc6e8c6/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.7/018b3a46-fd61-77fb-9a59-239ed49dfff1/source.tar.gz" }, "original": { "type": "tarball", @@ -127,19 +127,16 @@ } }, "flake-compat": { - "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.0.1.tar.gz" } }, "flake-parts": { diff --git a/home-manager/_mixins/users/gburd/default.nix b/home-manager/_mixins/users/gburd/default.nix index 578bf5d..9bd0d03 100644 --- a/home-manager/_mixins/users/gburd/default.nix +++ b/home-manager/_mixins/users/gburd/default.nix @@ -146,6 +146,10 @@ tig ripgrep plocate + dig + tree + htop + unstable.flyctl ]; sessionVariables = { # PAGER = "moar"; diff --git a/nixos/_mixins/desktop/chromium.nix b/nixos/_mixins/desktop/chromium.nix index 95119fa..68a1439 100644 --- a/nixos/_mixins/desktop/chromium.nix +++ b/nixos/_mixins/desktop/chromium.nix @@ -8,7 +8,7 @@ enable = true; extensions = [ "cdglnehniifkbagbbombnjghhcihifij" # kagi-search-for-chrome - "ghmbeldphafepmbegfdlkpapadhbakde" # proton-pass-free-password + #"ghmbeldphafepmbegfdlkpapadhbakde" # proton-pass-free-password "aeblfdkhhhdcdjpifhhbdiojplfjncoa" # 1Password ]; extraOpts = { diff --git a/nixos/_mixins/desktop/ungoogled-chromium.nix b/nixos/_mixins/desktop/ungoogled-chromium.nix index a4dba86..15ca40f 100644 --- a/nixos/_mixins/desktop/ungoogled-chromium.nix +++ b/nixos/_mixins/desktop/ungoogled-chromium.nix @@ -8,7 +8,7 @@ enable = true; extensions = [ "cdglnehniifkbagbbombnjghhcihifij" # kagi-search-for-chrome - "ghmbeldphafepmbegfdlkpapadhbakde" # proton-pass-free-password + #"ghmbeldphafepmbegfdlkpapadhbakde" # proton-pass-free-password "chphlpgkkbolifaimnlloiipkdnihall" # OneTab ]; extraOpts = { diff --git a/nixos/_mixins/virt/default.nix b/nixos/_mixins/virt/default.nix index 28f2890..5d07da1 100644 --- a/nixos/_mixins/virt/default.nix +++ b/nixos/_mixins/virt/default.nix @@ -18,7 +18,6 @@ options.overlay.mountopt = "nodev,metacopy=on,acltype=posixacl"; }; }; - docker.storageDriver = "btrfs"; }; } diff --git a/nixos/_mixins/virt/docker.nix b/nixos/_mixins/virt/docker.nix index d15a4d3..41073e3 100644 --- a/nixos/_mixins/virt/docker.nix +++ b/nixos/_mixins/virt/docker.nix @@ -5,10 +5,10 @@ virtualisation.docker = { enable = true; - rootless = { - enable = true; - setSocketVariable = true; - }; + # rootless = { TODO + # enable = true; + # setSocketVariable = true; + # }; }; } diff --git a/nixos/floki/default.nix b/nixos/floki/default.nix index 3eebe1e..92b7e44 100644 --- a/nixos/floki/default.nix +++ b/nixos/floki/default.nix @@ -55,6 +55,9 @@ lidSwitchExternalPower = "lock"; }; + virtualisation.docker.storageDriver = "btrfs"; +# virtualisation.podman.storageDriver = "btrfs"; + nixpkgs.hostPlatform = lib.mkDefault "${platform}"; }