gwg313/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

squash me

Browse source
This commit is contained in:
gwg313 2025-02-09 22:12:22 -05:00
parent fe34badada
commit 21ced62c07
Signed by: gwg313
GPG key ID: 60FF63B4826B7400
4 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
home-manager/machines/grymforge.nix
View file

@ -19,14 +19,14 @@
# You can also split up your configuration and import pieces of it here: # You can also split up your configuration and import pieces of it here:
./candlekeep/variables.nix ./grymforge/variables.nix
../modules/hyprpanel.nix ../modules/hyprpanel.nix
../modules/hyprlock.nix ../modules/hyprlock.nix
# ../modules/hypridle.nix # ../modules/hypridle.nix
# ./nvim.nix # ./nvim.nix
../modules/common.nix ../modules/common.nix
../modules/hyprland
../modules/hyprland.nix # ../modules/hyprland.nix
../modules/common-gui.nix ../modules/common-gui.nix
../modules/linux-gui.nix ../modules/linux-gui.nix
../modules/devenv.nix ../modules/devenv.nix

2
hosts/candlekeep/syncthing.nix
View file

@ -19,7 +19,7 @@
settings = { settings = {
devices = { devices = {
"grymforge" = { "grymforge" = {
id = "N2TYFZ4-ODIIHIZ-UP27V4V-NYMAZNI-SIATS5S-5NTM6JX-A67HCZ5-ZB4TVQJ"; id = "MYJZ7YS-WWHZDW7-KMADKI7-WZNEV3V-AZP2J6Z-4AJOYHZ-G3HLEDO-KTVZPAF";
}; };
}; };

15
hosts/grymforge/configuration.nix
View file

@ -57,8 +57,9 @@
systemd-boot.enable = true; systemd-boot.enable = true;
efi.canTouchEfiVariables = 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-ab8d2b18-14de-44ff-a7b5-91d5f5d0e937".device =
"/dev/disk/by-uuid/ab8d2b18-14de-44ff-a7b5-91d5f5d0e937";
}; };
# sops # sops
@ -122,11 +123,11 @@
}; };
environment = { environment = {
# loginShellInit = '' loginShellInit = ''
# # if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then # if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
# # exec Hyprland # exec Hyprland
# # fi # fi
# ''; # Will automatically open Hyprland when logged into tty1 ''; # Will automatically open Hyprland when logged into tty1
variables = { variables = {
TERMINAL = "alacritty"; TERMINAL = "alacritty";
EDITOR = "nvim"; EDITOR = "nvim";

24
hosts/grymforge/hardware-configuration.nix
View file

@ -7,7 +7,8 @@
pkgs, pkgs,
modulesPath, modulesPath,
... ...
}: { }:
{
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
../../common/nixos/nfs.nix ../../common/nixos/nfs.nix
@ -20,23 +21,30 @@
"usb_storage" "usb_storage"
"sd_mod" "sd_mod"
]; ];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [ ];
boot.kernelModules = ["kvm-amd"]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = []; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/c4c90d75-9f16-45a2-94f8-dd0ba0fecc43"; device = "/dev/disk/by-uuid/95565731-9a95-4fcc-857d-1f066f4e4acf";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-35f61924-e22a-458a-841c-9cc8dc3e35e4".device = "/dev/disk/by-uuid/35f61924-e22a-458a-841c-9cc8dc3e35e4"; boot.initrd.luks.devices."luks-c140b0df-2cce-4710-a2fa-94dd3016a7e6".device =
"/dev/disk/by-uuid/c140b0df-2cce-4710-a2fa-94dd3016a7e6";
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/2ECE-9C7E"; device = "/dev/disk/by-uuid/34C4-ECCE";
fsType = "vfat"; fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
}; };
swapDevices = [{device = "/dev/disk/by-uuid/04f457e4-1bd2-417f-bcb7-f8b770e71c21";}]; swapDevices = [
{ device = "/dev/disk/by-uuid/2fea88dc-b9a8-40d6-a87d-f7383548e60d"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's