sam
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed admin deploykey in home and reverted persistance change

This commit is contained in:
mrsu 2024-06-28 18:16:15 +01:00
parent 739018e98f
commit 05ee6da5ee
7 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flake.lock
View File

@ -278,11 +278,11 @@
"nix-secrets": { "nix-secrets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1719585068, "lastModified": 1719594307,
"narHash": "sha256-SXos1BQQBWvuY55/N9C0MNQNp3vrokYFReFBJVssOsI=", "narHash": "sha256-n2fZDRl/X5rlx0fer7MMKAevtqflDKDsqKvHYuI9iR8=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "cbe3ecf4789c1dfcbfb531e50843941207653086", "rev": "97a12374b7ab681794f8cc7b1bee0414136cbf51",
"revCount": 123, "revCount": 131,
"type": "git", "type": "git",
"url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git" "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git"
}, },
@ -384,11 +384,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1719584730, "lastModified": 1719592641,
"narHash": "sha256-O24Ms0iM0JE+duoXGlouxbzfaHRSXWUu0NKFKdveQ4c=", "narHash": "sha256-xgz6AcTVH1i8G3LPSitKNOQflfYU7wMTfAcUrO5FG+Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d06168ffaa627c12e0d0ea2f993387b715934e1a", "rev": "ee1f0944028ebd11098d45c8e13658cffcac3550",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
home/common/core/default.nix
View File

@ -4,7 +4,6 @@
inputs.nix-colors.homeManagerModules.default inputs.nix-colors.homeManagerModules.default
./zsh.nix ./zsh.nix
./nixvim ./nixvim
./fonts.nix
]; ];
nixpkgs.overlays = [ nixpkgs.overlays = [

1
hosts/common/core/default.nix
View File

@ -4,6 +4,7 @@ let
in in
{ {
imports = [ imports = [
inputs.impermanence.nixosModules.impermanence
./sops.nix ./sops.nix
./locale.nix ./locale.nix
]; ];

5
hosts/common/users/admin/default.nix
View File

@ -36,11 +36,6 @@ in
mode = "0644"; mode = "0644";
owner = "${username}"; owner = "${username}";
}; };
"ssh_keys/deploy_key/id_ed25519" = {
path = "/home/${username}/.ssh/deploy_key-ssh-ed25519";
mode = "0644";
owner = "${username}";
};
}; };
programs.zsh.enable = true; programs.zsh.enable = true;

11
hosts/nebula/default.nix
View File

@ -6,7 +6,6 @@ let
encrypted = false; # currrently only applies to btrfs encrypted = false; # currrently only applies to btrfs
btrfsMountDevice = if encrypted then "/dev/mapper/crypted" else "/dev/root_vg/root"; btrfsMountDevice = if encrypted then "/dev/mapper/crypted" else "/dev/root_vg/root";
user = "admin"; user = "admin";
enablePersistance = false;
in in
{ {
imports = imports =
@ -24,13 +23,17 @@ in
# Import optional options # Import optional options
../common/optional/openssh.nix ../common/optional/openssh.nix
(import ../common/optional/persistence.nix {enable = enablePersistance;})
]; ];
boot.loader.grub.enable = true; boot = {
boot.loader.grub.device = "/dev/sda"; loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
timeout = 3;
};
};
networking = { networking = {
hostName = "nebula"; hostName = "nebula";

4
hosts/semita/default.nix
View File

@ -6,7 +6,6 @@ let
encrypted = true; # currrently only applies to btrfs encrypted = true; # currrently only applies to btrfs
btrfsMountDevice = if encrypted then "/dev/mapper/crypted" else "/dev/root_vg/root"; btrfsMountDevice = if encrypted then "/dev/mapper/crypted" else "/dev/root_vg/root";
user = "sam"; user = "sam";
enablePersistance = true;
in in
{ {
imports = imports =
@ -19,7 +18,6 @@ in
(import ../common/disks { device = dev; fsType = fsType; encrypted = encrypted; }) (import ../common/disks { device = dev; fsType = fsType; encrypted = encrypted; })
# Impermanence # Impermanence
inputs.impermanence.nixosModules.impermanence
(import ../common/disks/btrfs-impermanence.nix { btrfsMountDevice = btrfsMountDevice; lib = lib; }) (import ../common/disks/btrfs-impermanence.nix { btrfsMountDevice = btrfsMountDevice; lib = lib; })
# Import core options # Import core options
@ -27,7 +25,7 @@ in
../common/core ../common/core
# Import optional options # Import optional options
(import ../common/optional/persistence.nix {enable = enablePersistance;}) ../common/optional/persistence.nix
../common/optional/pipewire.nix ../common/optional/pipewire.nix
../common/optional/openssh.nix ../common/optional/openssh.nix
../common/optional/dwm.nix ../common/optional/dwm.nix

4
hosts/sparky/default.nix
View File

@ -5,7 +5,6 @@ let
dev = "/dev/sda"; # depends on target hardware dev = "/dev/sda"; # depends on target hardware
encrypted = false; # currrently only applies to btrfs encrypted = false; # currrently only applies to btrfs
btrfsMountDevice = if encrypted then "/dev/mapper/crypted" else "/dev/root_vg/root"; btrfsMountDevice = if encrypted then "/dev/mapper/crypted" else "/dev/root_vg/root";
enablePersistance = true;
in in
{ {
imports = imports =
@ -18,7 +17,6 @@ in
(import ../common/disks { device = dev; fsType = fsType; encrypted = encrypted; }) (import ../common/disks { device = dev; fsType = fsType; encrypted = encrypted; })
# Impermanence # Impermanence
inputs.impermanence.nixosModules.impermanence
(import ../common/disks/btrfs-impermanence.nix { btrfsMountDevice = btrfsMountDevice; lib = lib; }) (import ../common/disks/btrfs-impermanence.nix { btrfsMountDevice = btrfsMountDevice; lib = lib; })
# Import core options # Import core options
@ -27,7 +25,7 @@ in
# Import optional options # Import optional options
../common/optional/openssh.nix ../common/optional/openssh.nix
(import ../common/optional/persistence.nix {enable = enablePersistance;}) ../common/optional/persistence.nix
../common/optional/gaming.nix ../common/optional/gaming.nix
]; ];