Merge branch 'master' of ssh://git.joshuabell.xyz:3032/ringofstorms/dotfiles
This commit is contained in:
commit
282208d537
6 changed files with 215 additions and 91 deletions
36
hosts/juni/flake.lock
generated
36
hosts/juni/flake.lock
generated
|
|
@ -38,40 +38,28 @@
|
|||
},
|
||||
"common": {
|
||||
"locked": {
|
||||
"dir": "flakes/common",
|
||||
"lastModified": 1768255305,
|
||||
"narHash": "sha256-XcXl5M0WNYhCCqE9qc9Aj2/2Jb/T0NHZnu2ZuVBvlHw=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "15769eda748f6fcc6fdab04f79f14ed9b1ffc548",
|
||||
"revCount": 1125,
|
||||
"type": "git",
|
||||
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
|
||||
"path": "../../flakes/common",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"dir": "flakes/common",
|
||||
"type": "git",
|
||||
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
|
||||
}
|
||||
"path": "../../flakes/common",
|
||||
"type": "path"
|
||||
},
|
||||
"parent": []
|
||||
},
|
||||
"de_plasma": {
|
||||
"inputs": {
|
||||
"plasma-manager": "plasma-manager"
|
||||
},
|
||||
"locked": {
|
||||
"dir": "flakes/de_plasma",
|
||||
"lastModified": 1768255305,
|
||||
"narHash": "sha256-XcXl5M0WNYhCCqE9qc9Aj2/2Jb/T0NHZnu2ZuVBvlHw=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "15769eda748f6fcc6fdab04f79f14ed9b1ffc548",
|
||||
"revCount": 1125,
|
||||
"type": "git",
|
||||
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
|
||||
"path": "../../flakes/de_plasma",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"dir": "flakes/de_plasma",
|
||||
"type": "git",
|
||||
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
|
||||
}
|
||||
"path": "../../flakes/de_plasma",
|
||||
"type": "path"
|
||||
},
|
||||
"parent": []
|
||||
},
|
||||
"flatpaks": {
|
||||
"inputs": {
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
impermanence.url = "github:nix-community/impermanence";
|
||||
|
||||
# Use relative to get current version for testin
|
||||
# common.url = "path:../../flakes/common";
|
||||
common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/common";
|
||||
common.url = "path:../../flakes/common";
|
||||
# common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/common";
|
||||
# secrets-bao.url = "path:../../flakes/secrets-bao";
|
||||
secrets-bao.url = "path:../../flakes/secrets-bao";
|
||||
# flatpaks.url = "path:../../flakes/flatpaks";
|
||||
flatpaks.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/flatpaks";
|
||||
# beszel.url = "path:../../flakes/beszel";
|
||||
beszel.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/beszel";
|
||||
# de_plasma.url = "path:../../flakes/de_plasma";
|
||||
de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma";
|
||||
de_plasma.url = "path:../../flakes/de_plasma";
|
||||
# de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma";
|
||||
|
||||
opencode.url = "github:sst/opencode";
|
||||
ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
|
||||
|
|
@ -63,8 +63,8 @@
|
|||
gpu.intel.enable = true;
|
||||
sddm.autologinUser = "josh";
|
||||
wallpapers = [
|
||||
../../_shared_assets/wallpapers/pixel_neon.png
|
||||
../../_shared_assets/wallpapers/pixel_neon_v.png
|
||||
../../hosts/_shared_assets/wallpapers/pixel_neon.png
|
||||
../../hosts/_shared_assets/wallpapers/pixel_neon_v.png
|
||||
];
|
||||
};
|
||||
})
|
||||
|
|
@ -84,6 +84,7 @@
|
|||
inputs.common.nixosModules.hardening
|
||||
inputs.common.nixosModules.nix_options
|
||||
inputs.common.nixosModules.timezone_auto
|
||||
({ services.automatic-timezoned.persistDir = "/persist/var/lib/timezone-persist"; })
|
||||
inputs.common.nixosModules.tty_caps_esc
|
||||
inputs.common.nixosModules.zsh
|
||||
inputs.common.nixosModules.tailnet
|
||||
|
|
|
|||
|
|
@ -32,8 +32,6 @@
|
|||
files = [
|
||||
"/machine-key.json"
|
||||
"/etc/machine-id"
|
||||
"/etc/localtime"
|
||||
"/etc/timezone"
|
||||
"/etc/adjtime"
|
||||
# NOTE: if you want mutable passwords across reboots, persist these,
|
||||
# but you must do a one-time migration (see notes in chat).
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue