Compare commits

..

No commits in common. "6fd1466e1f922f5db07caddba8af7c9be6757db8" and "03942eca2941d746aa3b5a4e8abb4abd56418a1c" have entirely different histories.

4 changed files with 17 additions and 19 deletions

View file

@ -30,11 +30,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1705617092, "lastModified": 1704159259,
"narHash": "sha256-n9PK4O4X4S1JkwpkMuYm1wHZYJzRqif8g3RuVIPD+rY=", "narHash": "sha256-OOEFibN9JQBepVeqxSNSBr6JUmdoZiH263ogms2jk0k=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "attic", "repo": "attic",
"rev": "fbe252a5c21febbe920c025560cbd63b20e24f3b", "rev": "e6bedf1869f382cfc51b69848d6e09d51585ead6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -148,11 +148,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1705654402, "lastModified": 1705579015,
"narHash": "sha256-wuH6YbgKtwPTdtMtNuW41FjkHhIwAsxQwMPoIzsMy4A=", "narHash": "sha256-osKcl4saYzbcVUJLdunSyfEBz2OODLckhBuhp4wf4P0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "dc3dafe421095791e2dacf2b03e1686365160d35", "rev": "4baba64e8088c2cdbde661d6697d1fff3ba59f6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +438,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1705623173, "lastModified": 1705263072,
"narHash": "sha256-jecaj1Rr6SKswbXSCPfFtYtnzePGFGiF59bw6jGm6Gs=", "narHash": "sha256-DCqqaNWn9G81U+0Myyr36JrOKitcmS34oBWxqiHjabk=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "ca69f1cf1cad946ccd04e476cc3822ae7088267d", "rev": "088ba565537eaef1041a87be5a44ca0daa4e1908",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -586,11 +586,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1705458851, "lastModified": 1705331948,
"narHash": "sha256-uQvEhiv33Zj/Pv364dTvnpPwFSptRZgVedDzoM+HqVg=", "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8bf65f17d8070a0a490daf5f1c784b87ee73982c", "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -762,11 +762,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705630663, "lastModified": 1705544242,
"narHash": "sha256-f+kcR17ZtwMyCEtNAfpD0Mv6qObNKoJ41l+6deoaXi8=", "narHash": "sha256-LIi5jGx7kwJjodpJlnQY+X/PZspRpbDO2ypNSmHwOGQ=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "47cac072a313d9cce884b9ea418d2bf712fa23dd", "rev": "ff3e4b3ee418009886848d48e4ba236a2f9de789",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,5 +1,5 @@
let carapace_completer = {|spans| let carapace_completer = {|spans|
carapace $spans.0 nushell ... | from json carapace $spans.0 nushell $spans | from json
} }
# The default config record. This is where much of your global configuration is setup. # The default config record. This is where much of your global configuration is setup.

View file

@ -1,4 +1,4 @@
{ nixos-hardware, microvm, nix-ld-rs, attic, ... }: { nixos-hardware, microvm, nix-ld-rs, ... }:
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
imports = imports =
@ -9,7 +9,6 @@
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd
microvm.nixosModules.host microvm.nixosModules.host
attic.nixosModules.atticd
../../users/erwin ../../users/erwin
../../users/root ../../users/root

View file

@ -228,7 +228,6 @@ in
packages = with pkgs; [ packages = with pkgs; [
atool atool
attic-client
bitwarden bitwarden
blink1-tool blink1-tool
bottom bottom