xyno/nix-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bla

Browse source
This commit is contained in:
Lucy Hochkamp 2023-11-20 23:51:41 +01:00
parent 121f4a1a68
commit 71c3a9d42a
No known key found for this signature in database
4 changed files with 75 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

72
flake.lock generated
View file

@ -68,11 +68,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699437533, "lastModified": 1699867978,
"narHash": "sha256-lMoPz9c89CpPVuJ95OFFesM9JagCF0soGbQatj3ZhqM=", "narHash": "sha256-+arl45HUOcBdKiRGrKXZYXDyBQ6MQGkYPZa/28f6Yzo=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "eb2b9b64238349bd351561e32e260cac15db6f9a", "rev": "e67f2bf515343da378c3f82f098df8ca01bccc5f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,11 +89,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699099781, "lastModified": 1699781810,
"narHash": "sha256-2WAs839yL6xmIPBLNVwbft46BDh0/RAjq1bAKNRqeR4=", "narHash": "sha256-LD+PIUbm1yQmQmGIbSsc/PB1dtJtGqXFgxRc1C7LlfQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "548962c50b8afad7b8c820c1d6e21dc8394d6e65", "rev": "2d7d77878c5d70f66f3d676ff66708d8d4f9d7df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -298,11 +298,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695108154, "lastModified": 1699748081,
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", "narHash": "sha256-MOmMapBydd7MTjhX4eeQZzKlCABWw8W6iSHSG4OeFKE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "07682fff75d41f18327a871088d20af2710d4744", "rev": "04bac349d585c9df38d78e0285b780a140dc74a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -396,11 +396,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699401982, "lastModified": 1700069490,
"narHash": "sha256-TpuSsI2ZizxDVdcx1LF04jnfu1TCpWebqDK2fiui0Dg=", "narHash": "sha256-lzFqp58RQofM2zXKMPGHt3AH7uPmJy49CCJnn/dsTdI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "100a4df311f50bf5fa6a19fedde51a69f7f3ade1", "rev": "b4eb6912388de7e8952383c0764e5ef8fa66f48a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -416,11 +416,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1699406699, "lastModified": 1700097605,
"narHash": "sha256-Y/cuCmpmkAIhhKmoF97k4ZG4I2hRH6kcZe00BH3KN3U=", "narHash": "sha256-nVqtih7bV5zso/y8tCSYwqmkEdMDU6R5NBb8D7w5mEY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "57af5d8164187dcb4015e9efc823f7bd33d9c6fc", "rev": "4192069cbb3f98b114e6f0bc0e7e4720c6c98c09",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -437,11 +437,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697038389, "lastModified": 1699966122,
"narHash": "sha256-hbzFPXyQQxJObRdb+CsylUXii29UfFV7866WWgWYs6Y=", "narHash": "sha256-zEN3ET7jfXpIKYeYh/z4xekOBOoaFS+n0q3oL3sVh+0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixd", "repo": "nixd",
"rev": "29904e121cc775e7caaf4fffa6bc7da09376a43b", "rev": "b3bb9ea7cd3c2f07c89779a474d6468b2c11e303",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -452,11 +452,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1699159446, "lastModified": 1699997707,
"narHash": "sha256-cL63IjsbPl2otS7R4kdXbVOJOXYMpGw5KGZoWgdCuCM=", "narHash": "sha256-ugb+1TGoOqqiy3axyEZpfF6T4DQUGjfWZ3Htry1EfvI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "627bc9b88256379578885a7028c9e791c29fb581", "rev": "5689f3ebf899f644a1aabe8774d4f37eb2f6c2f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -468,11 +468,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1699099776, "lastModified": 1699781429,
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -484,11 +484,11 @@
}, },
"nixpkgs-darwin": { "nixpkgs-darwin": {
"locked": { "locked": {
"lastModified": 1699375123, "lastModified": 1700097215,
"narHash": "sha256-ny0+k0LQPVAhntYZo/FMVFxUlejpn4pIQVOo5Vdek/I=", "narHash": "sha256-ODQ3gBTv1iHd7lG21H+ErVISB5wVeOhd/dEogOqHs/I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bceb3bff2ee78424c1073d0b4676858265f926d1", "rev": "9fb122519e9cd465d532f736a98c1e1eb541ef6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -518,11 +518,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1699448320, "lastModified": 1700138465,
"narHash": "sha256-P6uVanihahwKdRYh+LQdw81XbTmmDzYjqLtfUY7XL3A=", "narHash": "sha256-VrudVHHmqJyolo4bXYEZcm1mitcwGKLWyhcsgMGl5VY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "628bd7800494edf7c0e0d79f4839b65942fcf46c", "rev": "6d1c5c20eb207f0937444aa9c45ef670ab8e92d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -550,11 +550,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1699291058, "lastModified": 1699994397,
"narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=", "narHash": "sha256-xxNeIcMNMXH2EA9IAX6Cny+50mvY22LhIBiGZV363gc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "41de143fda10e33be0f47eab2bfe08a50f234267", "rev": "d4b5a67bbe9ef750bd2fdffd4cad400dd5553af8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -851,11 +851,11 @@
"zsh-completions": { "zsh-completions": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1698288378, "lastModified": 1700095262,
"narHash": "sha256-cxA+WH/dKk00s6HVN+w1sh/1skHvH4Ji+3rLSSNQGJU=", "narHash": "sha256-+X7RzRcId5+GDhWhx432OyiyJQHJMsdkwybTVOctUT8=",
"owner": "zsh-users", "owner": "zsh-users",
"repo": "zsh-completions", "repo": "zsh-completions",
"rev": "a0f027a1de9272d22ce20465d660d7b611f30cf0", "rev": "634736c009a8c982b798b2edee93a0dfc6ef1a54",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
hm-imports/vscode/default.nix
View file

@ -14,6 +14,7 @@ in
]; ];
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.unstable.vscode;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
vscodevim.vim # vim mode (hopefully good) vscodevim.vim # vim mode (hopefully good)
jdinhlife.gruvbox # theme jdinhlife.gruvbox # theme
@ -38,7 +39,8 @@ in
golang.go # go golang.go # go
marketplace.ms-python.python # python marketplace.ms-python.python # python
marketplace.donjayamanne.python-environment-manager # python marketplace.donjayamanne.python-environment-manager # python
ms-dotnettools.csharp # c# und so #ms-dotnettools.csharp # c# und so
(marketplace.ms-dotnettools.csdevkit.overrideAttrs (super: a: { sourceRoot = "."; }))
rust-lang.rust-analyzer # rust rust-lang.rust-analyzer # rust
marketplace.sswg.swift-lang # swift marketplace.sswg.swift-lang # swift
marketplace.vadimcn.vscode-lldb # swift marketplace.vadimcn.vscode-lldb # swift

64
hosts/daedalus/default.nix
View file

@ -52,9 +52,12 @@ with lib.my;
tmMountPath = "/tmp/timeMachineSnapshotForBorg"; tmMountPath = "/tmp/timeMachineSnapshotForBorg";
in in
{ {
enable = false; enable = true;
configurations."daedalus-ds9" = { configurations."daedalus-ds9" = {
source_directories = [ tmMountPath ]; source_directories = [
# tmMountPath
"/Users/ragon"
];
exclude_if_present = [ ".nobackup" ]; exclude_if_present = [ ".nobackup" ];
repositories = [ repositories = [
{ path = "ssh://ragon@ds9/backups/daedalus/borgmatic"; label = "ds9"; } { path = "ssh://ragon@ds9/backups/daedalus/borgmatic"; label = "ds9"; }
@ -68,33 +71,33 @@ with lib.my;
keep_weekly = 4; keep_weekly = 4;
keep_monthly = 12; keep_monthly = 12;
keep_yearly = 10; keep_yearly = 10;
before_backup = [ # before_backup = [
(pkgs.writeShellScript # (pkgs.writeShellScript
"apfsSnapshot" # "apfsSnapshot"
'' # ''
tmutil localsnapshot # tmutil localsnapshot
SNAPSHOT=$(tmutil listlocalsnapshots / | grep TimeMachine | tail -n 1) # SNAPSHOT=$(tmutil listlocalsnapshots / | grep TimeMachine | tail -n 1)
mkdir -p "${tmMountPath}" # mkdir -p "${tmMountPath}"
mount_apfs -s $SNAPSHOT /System/Volumes/Data "${tmMountPath}" # mount_apfs -s $SNAPSHOT /System/Volumes/Data "${tmMountPath}"
'') # '')
]; # ];
after_backup = [ # after_backup = [
(pkgs.writeShellScript # (pkgs.writeShellScript
"apfsSnapshotUnmount" # "apfsSnapshotUnmount"
'' # ''
diskutil unmount "${tmMountPath}" # diskutil unmount "${tmMountPath}"
SNAPSHOT=$(tmutil listlocalsnapshots / | grep TimeMachine | tail -n 1) # SNAPSHOT=$(tmutil listlocalsnapshots / | grep TimeMachine | tail -n 1)
tmutil deletelocalsnapshots $(echo $SNAPSHOT | sed 's/com\.apple\.TimeMachine\.\(.*\)\.local/\1/g') # tmutil deletelocalsnapshots $(echo $SNAPSHOT | sed 's/com\.apple\.TimeMachine\.\(.*\)\.local/\1/g')
'') # '')
]; # ];
on_error = [ # on_error = [
#
(pkgs.writeShellScript # (pkgs.writeShellScript
"apfsSnapshotUnmountError" # "apfsSnapshotUnmountError"
'' # ''
diskutil unmount "${tmMountPath}" # diskutil unmount "${tmMountPath}"
'') # '')
]; # ];
}; };
}; };
@ -144,6 +147,9 @@ with lib.my;
pandoc pandoc
#unstable.qutebrowser
unstable.python311Packages.adblock
]; ];
# home.activation = { # home.activation = {

2
nixos-modules/services/bitwarden.nix
View file

@ -17,7 +17,7 @@ in
#backupDir = "/persistent/backups/vaultwarden"; #backupDir = "/persistent/backups/vaultwarden";
config = { config = {
domain = "https://${cfg.domainPrefix}.${domain}"; domain = "https://${cfg.domainPrefix}.${domain}";
signupsAllowed = false; signupsAllowed = true;
rocketPort = 8222; rocketPort = 8222;
rocketAddress = "127.0.0.1"; rocketAddress = "127.0.0.1";
databaseUrl = "postgresql://%2Frun%2Fpostgresql/vaultwarden"; databaseUrl = "postgresql://%2Frun%2Fpostgresql/vaultwarden";