1

Compare commits

...

3 Commits

4 changed files with 47 additions and 8 deletions

38
flake.lock generated
View File

@ -18,6 +18,27 @@
"type": "github"
}
},
"disko": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1746728054,
"narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
"owner": "nix-community",
"repo": "disko",
"rev": "ff442f5d1425feb86344c028298548024f21256d",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "latest",
"repo": "disko",
"type": "github"
}
},
"flake-compat": {
"locked": {
"lastModified": 1747046372,
@ -157,6 +178,21 @@
"type": "github"
}
},
"impermanence": {
"locked": {
"lastModified": 1737831083,
"narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "impermanence",
"type": "github"
}
},
"ixx": {
"inputs": {
"flake-utils": [
@ -400,8 +436,10 @@
"root": {
"inputs": {
"devshell": "devshell",
"disko": "disko",
"hardware": "hardware",
"home-manager": "home-manager",
"impermanence": "impermanence",
"nix-alien": "nix-alien",
"nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs_2",

View File

@ -22,7 +22,7 @@
# Opt-in state
impermanence.url = "github:nix-community/impermanence";
impermanence.inputs.nixpkgs.follows = "nixpkgs";
# impermanence.inputs.nixpkgs.follows = "nixpkgs";
# Manage secrets with sops
sops-nix.url = "github:Mic92/sops-nix";

View File

@ -73,11 +73,12 @@ in {
};
# Generate fish completions
home.activation = {
beets-fish-completions = lib.hm.dag.entryAfter ["writeBoundary"] ''
echo "Generating beet completions for fish shell at ~/.config/fish/completions/beet.fish"
beet fish
'';
};
# TODO: This doesn't work if ~/Music is mounted after the activation...
# home.activation = {
# beets-fish-completions = lib.hm.dag.entryAfter ["writeBoundary"] ''
# echo "Generating beet completions for fish shell at ~/.config/fish/completions/beet.fish"
# beet fish
# '';
# };
};
}

View File

@ -137,7 +137,7 @@ in {
cdd = "zi";
b = "z -"; # jump to previous dir
mkdir = "mkdir -p"; # also create parents (-p)
blk = batify "lsblk -o NAME,LABEL,ID,UUID,FSTYPE,SIZE,FSUSE%,MOUNTPOINT,MODEL";
blk = batify "lsblk -o NAME,LABEL,PARTLABEL,FSTYPE,SIZE,FSUSE%,MODEL,ID,UUID,MOUNTPOINT";
watch = "watch -d -c -n 0.5";
nd = "nix develop";
nb = "nix build -L";