This commit is contained in:
gwg313 2024-12-15 14:08:33 -05:00
parent 308bdbebf9
commit badcf3aa40
Signed by: gwg313
GPG key ID: 60FF63B4826B7400
43 changed files with 1972 additions and 253 deletions

View file

@ -8,7 +8,8 @@
user,
pkgs,
...
}: {
}:
{
# You can import other NixOS modules here
imports = [
# If you want to use modules your own flake exports (from modules/nixos):
@ -16,7 +17,9 @@
../../common/nixos/common.nix
../../common/gui/hyprland.nix
../../common/style/stylix.nix
# ../../common/style/vars/candlekeep.nix
../../common/nixos/sysctl
# ../../common/nixos/tuigreet.nix
../../common/networking
../../common/nixos
@ -53,7 +56,8 @@
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
initrd.luks.devices."luks-b13379b3-2025-4d55-a40a-c0f3ad8ec801".device = "/dev/disk/by-uuid/b13379b3-2025-4d55-a40a-c0f3ad8ec801";
initrd.luks.devices."luks-1dbfdeb6-8537-41b2-abf0-09373af3eeee".device =
"/dev/disk/by-uuid/1dbfdeb6-8537-41b2-abf0-09373af3eeee";
};
# sops
@ -90,19 +94,17 @@
# This will add each flake input as a registry
# To make nix3 commands consistent with your flake
nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) (
nix.registry = (lib.mapAttrs (_: flake: { inherit flake; })) (
(lib.filterAttrs (_: lib.isType "flake")) inputs
);
# This will additionally add your inputs to the system's legacy channels
# Making legacy nix commands consistent as well, awesome!
nix.nixPath = ["/etc/nix/path"];
environment.etc =
lib.mapAttrs' (name: value: {
name = "nix/path/${name}";
value.source = value.flake;
})
config.nix.registry;
nix.nixPath = [ "/etc/nix/path" ];
environment.etc = lib.mapAttrs' (name: value: {
name = "nix/path/${name}";
value.source = value.flake;
}) config.nix.registry;
networking.hostName = "candlekeep";
# networking.networkmanager.enable = true;
@ -114,7 +116,7 @@
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILq54YrM3BbhBs0oDLOrc1bkg6FCCmkV4E3pWLZp0ejN gwg313@pm.me"
];
extraGroups = ["wheel"];
extraGroups = [ "wheel" ];
};
};
@ -129,6 +131,7 @@
EDITOR = "nvim";
VISUAL = "nvim";
PAGER = "moar";
PASSWORD_STORE_DIR = "$HOME/.local/share/password-store";
};
};
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion

View file

@ -26,19 +26,23 @@
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/f2c87d99-ea17-4ef3-9ef6-bcc6637357f2";
device = "/dev/disk/by-uuid/c79b630a-d130-42ed-8cdc-3f8545fe2993";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-58623f70-2e6b-4ee0-8d14-d2bf34c07daf".device = "/dev/disk/by-uuid/58623f70-2e6b-4ee0-8d14-d2bf34c07daf";
boot.initrd.luks.devices."luks-96e3b309-ca79-4b42-aca5-3f098b123758".device =
"/dev/disk/by-uuid/96e3b309-ca79-4b42-aca5-3f098b123758";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/2394-0AAF";
device = "/dev/disk/by-uuid/1FBA-8B80";
fsType = "vfat";
};
options = [
"fmask=0077"
"dmask=0077"
];
};
swapDevices = [
{ device = "/dev/disk/by-uuid/dd8d717a-d872-4780-af3c-af4c702b587a"; }
{ device = "/dev/disk/by-uuid/17eec89e-2381-4a25-8935-63cbcc67d07c"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking

View file

@ -8,7 +8,8 @@
pkgs,
user,
...
}: {
}:
{
# You can import other NixOS modules here
imports = [
# If you want to use modules your own flake exports (from modules/nixos):
@ -56,7 +57,8 @@
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
initrd.luks.devices."luks-276bd2e3-9d6d-4df6-9155-3684907b48f0".device = "/dev/disk/by-uuid/276bd2e3-9d6d-4df6-9155-3684907b48f0";
initrd.luks.devices."luks-276bd2e3-9d6d-4df6-9155-3684907b48f0".device =
"/dev/disk/by-uuid/276bd2e3-9d6d-4df6-9155-3684907b48f0";
};
# sops
@ -93,19 +95,17 @@
# This will add each flake input as a registry
# To make nix3 commands consistent with your flake
nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) (
nix.registry = (lib.mapAttrs (_: flake: { inherit flake; })) (
(lib.filterAttrs (_: lib.isType "flake")) inputs
);
# This will additionally add your inputs to the system's legacy channels
# Making legacy nix commands consistent as well, awesome!
nix.nixPath = ["/etc/nix/path"];
environment.etc =
lib.mapAttrs' (name: value: {
name = "nix/path/${name}";
value.source = value.flake;
})
config.nix.registry;
nix.nixPath = [ "/etc/nix/path" ];
environment.etc = lib.mapAttrs' (name: value: {
name = "nix/path/${name}";
value.source = value.flake;
}) config.nix.registry;
networking.hostName = "grymforge";
networking.networkmanager.enable = true;
@ -117,16 +117,16 @@
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILq54YrM3BbhBs0oDLOrc1bkg6FCCmkV4E3pWLZp0ejN gwg313@pm.me"
];
extraGroups = ["wheel"];
extraGroups = [ "wheel" ];
};
};
environment = {
loginShellInit = ''
if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
exec Hyprland
fi
''; # Will automatically open Hyprland when logged into tty1
# loginShellInit = ''
# # if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
# # exec Hyprland
# # fi
# ''; # Will automatically open Hyprland when logged into tty1
variables = {
TERMINAL = "alacritty";
EDITOR = "nvim";