Compare commits
No commits in common. "4efc1d3e6143109d1f1181eb94a002eb075d3243" and "66523171c98c52fdffc450c9cca5483c501d82f8" have entirely different histories.
4efc1d3e61
...
66523171c9
24
flake.lock
24
flake.lock
|
@ -182,11 +182,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716908526,
|
||||
"narHash": "sha256-Zl6e/sEVDh07K47XxDGPsXTYT4nI6llUDbQ4xMIwp7k=",
|
||||
"lastModified": 1716847642,
|
||||
"narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "373ead20606efa9181cd15ba19a5deac7ead1492",
|
||||
"rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -255,11 +255,11 @@
|
|||
"nix-secrets": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1716917146,
|
||||
"narHash": "sha256-YopICr9b8EqsysVABoJAIDBPtk5PiJjqz+eRWjYHLP0=",
|
||||
"lastModified": 1716900655,
|
||||
"narHash": "sha256-YQBKCTcP+CKP0LWSjVlP+qQ4kbk8ZWjir/nTPIl4+Bs=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "1669319dcc94896a4591dc1118f90818f2591433",
|
||||
"revCount": 73,
|
||||
"rev": "c000be534d2c23315a746555e82a30b512c42f65",
|
||||
"revCount": 69,
|
||||
"type": "git",
|
||||
"url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git"
|
||||
},
|
||||
|
@ -270,12 +270,10 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1716715802,
|
||||
"narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f",
|
||||
"type": "github"
|
||||
"lastModified": 0,
|
||||
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
|
||||
"path": "/nix/store/3pif36ks3f56py4wb1dkq6sh0nkf3ygj-source",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
|
|
|
@ -17,15 +17,4 @@
|
|||
./common/optional/syncthing.nix
|
||||
|
||||
];
|
||||
monitors = [
|
||||
{
|
||||
name = "HDMI-1";
|
||||
width = 2560;
|
||||
height = 1440;
|
||||
refreshRate = 59.95;
|
||||
x = 0;
|
||||
workspace = "1";
|
||||
primary = true;
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
enable = true;
|
||||
matchBlocks = {
|
||||
"git.bitlab21.com" = {
|
||||
user = "git";
|
||||
identitiesOnly = true;
|
||||
identityFile = [ "~/.ssh/deploy_key-ssh-ed25519" ];
|
||||
};
|
||||
|
@ -47,3 +46,4 @@
|
|||
|
||||
programs.home-manager.enable = true;
|
||||
}
|
||||
|
||||
|
|
|
@ -40,7 +40,6 @@ in
|
|||
".local"
|
||||
];
|
||||
files = [
|
||||
".config/cinnamon-monitors.xml"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
let
|
||||
# Disko setup
|
||||
fsType = "btrfs"; # one of ext4 or btrfs. Use btrfs if using impermanence
|
||||
dev = "/dev/sda"; # depends on target hardware
|
||||
dev = "/dev/vda"; # depends on target hardware
|
||||
encrypted = false; # currrently only applies to btrfs
|
||||
btrfsMountDevice = if encrypted then "/dev/mapper/crypted" else "/dev/root_vg/root";
|
||||
in
|
||||
|
|
2
justfile
2
justfile
|
@ -25,7 +25,7 @@ edit-sops:
|
|||
|
||||
# update keys in secrets.yaml and push to remote
|
||||
update-sops-secrets:
|
||||
cd ../nix-secrets && (\
|
||||
cd $HOME/nix-secrets && (\
|
||||
nix-shell -p sops --run "sops updatekeys -y secrets.yaml" && \
|
||||
git add -u && (git commit -m "updated secrets" || true) && git push \
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue