karaolidis/nix
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor structure

Browse Source 
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
Nick Karaolidis
2025-01-09 13:50:26 +00:00
parent c8c34c40e5
commit b355f72b2e
30 changed files with 362 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hosts/eirene/default.nix
View File

@@ -2,10 +2,11 @@
{
imports = [
../../lib
inputs.disko.nixosModules.disko
(import ./format.nix { device = "/dev/disk/by-id/nvme-SAMSUNG_MZVL22T0HBLB-00BL2_S64RNE0R602762"; })
./hardware.nix
./display.nix
./hardware
../common/configs/system/bluetooth
../common/configs/system/boot
../common/configs/system/brightnessctl
@@ -43,6 +44,7 @@
../common/configs/system/users
../common/configs/system/wget
../common/configs/system/zsh
./users/nick
];

8
hosts/eirene/hardware.nix → hosts/eirene/hardware/default.nix
View File

@@ -1,5 +1,9 @@
{ pkgs, lib, ... }:
{
imports = [
./display.nix
];
# https://github.com/NixOS/nixos-hardware/tree/master/lenovo/legion/16achg6
hardware = {
enableAllFirmware = true;
@@ -58,7 +62,7 @@
powerManagement.enable = true;
systemd.services.powertop.postStart = builtins.readFile ./configs/system/scripts/mouse.sh;
systemd.services.powertop.postStart = builtins.readFile ./scripts/mouse.sh;
services = {
xserver.videoDrivers = [ "nvidia" ];
@@ -85,7 +89,7 @@
gestures.workspace_swipe_distance = 600;
};
programs.zsh.loginExtra = lib.mkBefore (builtins.readFile ./configs/system/scripts/card.sh);
programs.zsh.loginExtra = lib.mkBefore (builtins.readFile ./scripts/card.sh);
}
];
}

0
hosts/eirene/display.nix → hosts/eirene/hardware/display.nix
View File

0
hosts/eirene/configs/system/scripts/card.sh → hosts/eirene/hardware/scripts/card.sh
View File

0
hosts/eirene/configs/system/scripts/mouse.sh → hosts/eirene/hardware/scripts/mouse.sh
View File

28
hosts/eirene/users/nick/configs/console/git/default.nix Normal file
View File

@@ -0,0 +1,28 @@
{
user ? throw "user argument is required",
home ? throw "home argument is required",
}:
{ ... }:
{
home-manager.users.${user} = {
sops.secrets = {
"git/credentials" = {
sopsFile = ../../../../../../../secrets/personal/secrets.yaml;
path = "${home}/.config/git/credentials";
};
"git/cookies" = {
sopsFile = ../../../../../../../secrets/personal/secrets.yaml;
path = "${home}/.config/git/cookies";
};
};
programs.ssh.matchBlocks = {
"github.com" = {
hostname = "github.com";
user = "git";
identityFile = "${home}/.ssh/ssh_personal_ed25519_key";
extraOptions.StrictHostKeyChecking = "no";
};
};
};
}

17
hosts/eirene/users/nick/configs/console/syncthing/default.nix Normal file
View File

@@ -0,0 +1,17 @@
{
user ? throw "user argument is required",
home ? throw "home argument is required",
}:
{ ... }:
{
home-manager.users.${user}.services.syncthing.settings.folders = {
official = {
label = "Official";
path = "${home}/Documents/Official";
devices = [
"amalthea"
"ganymede"
];
};
};
}

22
hosts/eirene/users/nick/configs/gui/obsidian/default.nix Normal file
View File

@@ -0,0 +1,22 @@
{
user ? throw "user argument is required",
home ? throw "home argument is required",
}:
{ ... }:
{
home-manager.users.${user} = {
programs.obsidian.vaults."Documents/Obsidian/master".enable = true;
services.syncthing.settings.folders.obsidian = {
label = "Obsidian";
path = "${home}/Documents/Obsidian";
devices = [
"amalthea"
"ganymede"
];
};
home.file."Documents/Obsidian/.stignore".source =
../../../../../../common/configs/user/gui/obsidian/config/.stignore;
};
}

57
hosts/eirene/users/nick/default.nix
View File

@@ -8,6 +8,7 @@ in
{
imports = [
../../../common/configs/user/options.nix
(import ../../../common/configs/user/console/android { inherit user home; })
(import ../../../common/configs/user/console/bashmount { inherit user home; })
(import ../../../common/configs/user/console/bluetooth { inherit user home; })
@@ -40,6 +41,7 @@ in
(import ../../../common/configs/user/console/xdg { inherit user home; })
(import ../../../common/configs/user/console/yt-dlp { inherit user home; })
(import ../../../common/configs/user/console/zsh { inherit user home; })
(import ../../../common/configs/user/gui/astal { inherit user home; })
(import ../../../common/configs/user/gui/bluetooth { inherit user home; })
(import ../../../common/configs/user/gui/brightnessctl { inherit user home; })
@@ -71,6 +73,11 @@ in
(import ../../../common/configs/user/gui/wev { inherit user home; })
(import ../../../common/configs/user/gui/x11 { inherit user home; })
(import ../../../common/configs/user/gui/xdg { inherit user home; })
(import ./configs/console/git { inherit user home; })
(import ./configs/console/syncthing { inherit user home; })
(import ./configs/gui/obsidian { inherit user home; })
];
# echo "password" | mkpasswd -s
@@ -101,60 +108,16 @@ in
};
sops.secrets = {
"git/credentials" = {
"ssh/personal/key" = {
sopsFile = ../../../../secrets/personal/secrets.yaml;
path = "${home}/.config/git/credentials";
path = "${home}/.ssh/ssh_personal_ed25519_key";
};
"git/cookies" = {
sopsFile = ../../../../secrets/personal/secrets.yaml;
path = "${home}/.config/git/cookies";
};
"ssh/personal/git/key" = {
sopsFile = ../../../../secrets/personal/secrets.yaml;
path = "${home}/.ssh/ssh_git_personal_ed25519_key";
};
"ssh/personal/git/pass".sopsFile = ../../../../secrets/personal/secrets.yaml;
"ssh/personal/pass".sopsFile = ../../../../secrets/personal/secrets.yaml;
"gpg/personal/key".sopsFile = ../../../../secrets/personal/secrets.yaml;
"gpg/personal/pass".sopsFile = ../../../../secrets/personal/secrets.yaml;
};
programs = {
ssh.matchBlocks = {
"github.com" = {
hostname = "github.com";
user = "git";
identityFile = "${home}/.ssh/ssh_git_personal_ed25519_key";
extraOptions.StrictHostKeyChecking = "no";
};
};
obsidian.vaults."Documents/Obsidian/master".enable = true;
};
theme.wallpaper = ../../../../static/wallpapers/clouds.png;
services.syncthing.settings.folders = {
obsidian = {
label = "Obsidian";
path = "${home}/Documents/Obsidian";
devices = [
"amalthea"
"ganymede"
];
};
official = {
label = "Official";
path = "${home}/Documents/Official";
devices = [
"amalthea"
"ganymede"
];
};
};
home.file."Documents/Obsidian/.stignore".source =
../../../common/configs/user/gui/obsidian/config/.stignore;
};
}