hermit: working system

This commit is contained in:
Charlie Root 2024-10-14 12:06:17 +02:00
commit f6ca946c04
Signed by: faukah
SSH key fingerprint: SHA256:jpYIt4Vkz1NBTQcks/N9OPTfTFxE6KF2W/rV7hrfrIw
6 changed files with 15 additions and 33 deletions

View file

@ -20,13 +20,11 @@
printing.enable = true; printing.enable = true;
}; };
meta = {
users = ["vali"];
# mainUser = "vali";
};
modules = { modules = {
system = { system = {
impermanence.enable = true;
hardware = { hardware = {
nvidia.enable = true;
bluetooth = { bluetooth = {
enable = true; enable = true;
powerOnBoot = false; powerOnBoot = false;
@ -39,11 +37,9 @@
neovim.enable = true; neovim.enable = true;
# sadly just not advanced enough, yet. # sadly just not advanced enough, yet.
helix.enable = true; helix.enable = true;
kakoune.enable = false;
}; };
discord.enable = true; discord.enable = true;
nushell.enable = true; # nushell.enable = true;
oh-my-posh.enable = true;
eza.enable = true; eza.enable = true;
firefox.enable = true; firefox.enable = true;
spotify.enable = true; spotify.enable = true;
@ -51,7 +47,6 @@
zellij.enable = true; zellij.enable = true;
terminals = { terminals = {
foot.enable = true; foot.enable = true;
kitty.enable = true;
}; };
}; };
sound.enable = true; sound.enable = true;
@ -75,7 +70,7 @@
media.mpd = { media.mpd = {
enable = true; enable = true;
musicDirectory = "/home/${config.modules.other.system.username}/Nextcloud/media/Music"; musicDirectory = "/home/${config.modules.other.system.username}/cloud/media/Music";
}; };
}; };
@ -87,8 +82,7 @@
other = { other = {
system = { system = {
hostname = "hermit"; hostname = "hermit";
username = "vali"; username = "cr";
gitPath = "/home/vali/projects/nichts";
}; };
home-manager = { home-manager = {
@ -99,7 +93,7 @@
ssh.enable = true; ssh.enable = true;
btop.enable = true; btop.enable = true;
newsboat.enable = true; newsboat.enable = true;
# fish.enable = true; fish.enable = true;
nh.enable = true; nh.enable = true;
waybar.enable = true; waybar.enable = true;
}; };

View file

@ -4,5 +4,6 @@ _: {
./programs.nix ./programs.nix
./hardware-configuration.nix ./hardware-configuration.nix
./hardware ./hardware
./filesystem
]; ];
} }

View file

@ -1,9 +1,9 @@
{ {
config = { config = {
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/96e8f3d6-8d2d-4e2d-abd9-3eb7f48fed02"; boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/70952ef8-1d73-49ae-bd86-b7614f01fa86";
fileSystems = { fileSystems = {
"/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/7825-451F"; device = "/dev/disk/by-uuid/466A-F45E";
fsType = "vfat"; fsType = "vfat";
}; };
# root on tmpfs # root on tmpfs
@ -13,23 +13,23 @@
options = ["defaults" "size=25%" "mode=755"]; options = ["defaults" "size=25%" "mode=755"];
}; };
"/nix" = { "/nix" = {
device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548"; device = "/dev/disk/by-uuid/7fd4eb96-c9e6-450d-a7d6-1b2ef137a9f5";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=nix" "compress=zstd" "noatime"]; options = ["subvol=nix" "compress=zstd" "noatime"];
}; };
"/persist" = { "/persist" = {
device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548"; device = "/dev/disk/by-uuid/7fd4eb96-c9e6-450d-a7d6-1b2ef137a9f5";
neededForBoot = true; neededForBoot = true;
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=persist" "compress=zstd" "noatime"]; options = ["subvol=persist" "compress=zstd" "noatime"];
}; };
"/home" = { "/home" = {
device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548"; device = "/dev/disk/by-uuid/7fd4eb96-c9e6-450d-a7d6-1b2ef137a9f5";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=home" "compress=zstd" "noatime"]; options = ["subvol=home" "compress=zstd" "noatime"];
}; };
"/swap" = { "/swap" = {
device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548"; device = "/dev/disk/by-uuid/7fd4eb96-c9e6-450d-a7d6-1b2ef137a9f5";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=swap" "compress=lzo" "noatime"]; options = ["subvol=swap" "compress=lzo" "noatime"];

View file

@ -1 +1 @@
_: {imports = [./monitors.nix ./fs.nix];} _: {imports = [./monitors.nix];}

View file

@ -1,14 +0,0 @@
{
fileSystems."/" = {
device = "/dev/disk/by-uuid/b51d0f6c-2980-4117-b9df-5cc2c8ddd2d6";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-f1b24c23-8211-433e-983e-2ebad020826e".device = "/dev/disk/by-uuid/f1b24c23-8211-433e-983e-2ebad020826e";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/E355-67EA";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};
}

View file

@ -18,6 +18,7 @@
eza eza
fftw fftw
grc grc
gparted
git git
halloy halloy
helvum helvum