This commit is contained in:
ari committed 2025-12-16 09:50:09 -05:00
1 parent bccb61ec27
commit f1613955f7
6 files changed
+187 -137

No files matched your search

-6
View File
@@ -1,6 +0,0 @@
$terminal = ghostty
$fileManager = dolphin
$menu = walker
$browser = chromium
source = ~/.config/hypr/hyprland.d/*.conf
+1
View File
@@ -0,0 +1 @@
/nix/store/rkwj8mcdsv8gsmw2nlr52cfh3gkb5179-home-manager-files/.config/hypr/hyprland.conf
+6
View File
@@ -0,0 +1,6 @@
$terminal = ghostty
$fileManager = dolphin
$menu = walker
$browser = chromium
source = ~/.config/hypr/hyprland.d/*.conf
Generated
+46 -46
View File
@@ -110,12 +110,12 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1763536872,
"narHash": "sha256-QCYGGghBya+qsY59f1zzgYzxEzz+N9S7YRkVWDIDbgo=",
"rev": "f4e598cbb10021c93f73dd4c0cf01ec791ea53f9",
"revCount": 315,
"lastModified": 1765254444,
"narHash": "sha256-kAO/ZeBnjaF+uqOP6qweXlRk2ylocLuv/9Dn8FsuPlU=",
"rev": "3ccc0297525e51ac3d7905509e0616c9c8350108",
"revCount": 316,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.13.2/019a9b01-c0c6-7e1c-959e-98ac5b7675de/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.14.0/019b0160-c5de-7941-9c26-cb47bc17eec3/source.tar.gz"
},
"original": {
"type": "tarball",
@@ -125,37 +125,37 @@
"determinate-nixd-aarch64-darwin": {
"flake": false,
"locked": {
"narHash": "sha256-g1r0dPwlUi1h96c4BuHzv9M2lWDqRy9bPDW9tRSq35I=",
"narHash": "sha256-6PWoqx52nvlWzlElTjcn7KAPKitfcKZYEFSsC3PoEoE=",
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/macOS"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/macOS"
},
"original": {
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/macOS"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/macOS"
}
},
"determinate-nixd-aarch64-linux": {
"flake": false,
"locked": {
"narHash": "sha256-xn324irXG/EpUdUfUGFrlJNg23JN2cVArd5LsFPjGKc=",
"narHash": "sha256-b1e25BUPL7Qf0QVbYlfZ/+QiClrP/SHIjMPtA47aOLc=",
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/aarch64-linux"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/aarch64-linux"
},
"original": {
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/aarch64-linux"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/aarch64-linux"
}
},
"determinate-nixd-x86_64-linux": {
"flake": false,
"locked": {
"narHash": "sha256-VPM5FOGwEjl56b7Edvg3sduvauPHCyXZ11fN9hcUdTU=",
"narHash": "sha256-8EI2f8IftPcRFlR6K4+cpIEAVf5UIeMCjHysEtVqDw0=",
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/x86_64-linux"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/x86_64-linux"
},
"original": {
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/x86_64-linux"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/x86_64-linux"
}
},
"firefox-gnome-theme": {
@@ -300,11 +300,11 @@
]
},
"locked": {
"lastModified": 1764776959,
"narHash": "sha256-d+5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA=",
"lastModified": 1765605144,
"narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e1680d594a9281651cbf7d126941a8c8e2396183",
"rev": "90b62096f099b73043a747348c11dbfcfbdea949",
"type": "github"
},
"original": {
@@ -417,11 +417,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1764812569,
"narHash": "sha256-WvdCYnwzGmXYDsYMcBISom+6tIAk18jKq4zZvEoYlnw=",
"lastModified": 1765324959,
"narHash": "sha256-Odz0We13yF+cHNeymyy1Xx+1fVg6f/oi8BWQZ+Qwyl4=",
"owner": "hyprwm",
"repo": "hyprlauncher",
"rev": "64cc3c75ec0257a1970f64d403e390466f4577e4",
"rev": "e380fdc517aacdf93a60a8ac648e88eda5e499cd",
"type": "github"
},
"original": {
@@ -560,12 +560,12 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1763534330,
"narHash": "sha256-gTuB2qBdSKCKnZwENTqScs/pPBaZQOv6zZ1KJvV/ohk=",
"rev": "be871f9baf5366a220b5f25634eebab6f452a017",
"revCount": 23278,
"lastModified": 1765252170,
"narHash": "sha256-p98D44tYJMgB5Qet5S8cTQFdffk/GmoaGkpQtZ3hqJU=",
"rev": "1ddd28880651054346c34009d7bb9de36f1db2c1",
"revCount": 23362,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.13.2/019a9af6-3d7b-71bc-bccd-8b18e147ad77/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.14.0/019b0159-8907-7fab-a120-9d287c7e6d2e/source.tar.gz"
},
"original": {
"type": "tarball",
@@ -579,11 +579,11 @@
]
},
"locked": {
"lastModified": 1764161084,
"narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=",
"lastModified": 1765684049,
"narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "e95de00a471d07435e0527ff4db092c84998698e",
"rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33",
"type": "github"
},
"original": {
@@ -672,12 +672,12 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1764667669,
"narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
"rev": "418468ac9527e799809c900eda37cbff999199b6",
"revCount": 905402,
"lastModified": 1765779637,
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
"revCount": 912002,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.905402%2Brev-418468ac9527e799809c900eda37cbff999199b6/019ae5d7-2ce4-7dbb-90bd-21ec6e69adb4/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.912002%2Brev-1306659b587dc277866c7b69eb97e5f07864d8c4/019b2463-7b8e-7042-8b7e-490d08a3cd7a/source.tar.gz"
},
"original": {
"type": "tarball",
@@ -686,12 +686,12 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1763375004,
"narHash": "sha256-e81Xfa7xhRZfqGB4s3xEvrg4p1v+fToM6CIQlXUyaX0=",
"rev": "8b6600824693a9c706ef09bd86711ca393703466",
"revCount": 897465,
"lastModified": 1764611609,
"narHash": "sha256-yU9BNcP0oadUKupw0UKmO9BKDOVIg9NStdJosEbXf8U=",
"rev": "8c29968b3a942f2903f90797f9623737c215737c",
"revCount": 905078,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.897465%2Brev-8b6600824693a9c706ef09bd86711ca393703466/019a9577-b407-75dd-b18b-3308def1c215/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.905078%2Brev-8c29968b3a942f2903f90797f9623737c215737c/019add91-3add-7a0d-8a25-9569cbe01efe/source.tar.gz"
},
"original": {
"type": "tarball",
@@ -716,12 +716,12 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1764522689,
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"revCount": 902477,
"lastModified": 1765762245,
"narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=",
"rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d",
"revCount": 903561,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.902477%2Brev-8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f/019adb02-05a7-7ad2-9f74-6687e899006d/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.903561%2Brev-c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d/019b231b-8461-7fef-af86-fa7662ea16ad/source.tar.gz"
},
"original": {
"type": "tarball",
@@ -788,11 +788,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1764795851,
"narHash": "sha256-DgtI/SwRiVnAfAVrXoRFymVP1AGvB3ZxYL6XMOZFvJQ=",
"lastModified": 1765802640,
"narHash": "sha256-rLGl6MaC4pwGcLJ14sfFb8r5rbvWb6ZRTfztcLJHwIU=",
"owner": "nix-community",
"repo": "stylix",
"rev": "cfde343ff369c8aa898f263ed3dad8c5eb095491",
"rev": "4e63fa32d8beefd2f222181e8ca8d41eb9a7e153",
"type": "github"
},
"original": {
+47 -17
View File
@@ -1,5 +1,10 @@
{ user }:
{ pkgs, hyprlauncher, system, ... }:
{
pkgs,
hyprlauncher,
system,
...
}:
let
zshFWBook = builtins.filterSource (p: t: true) ./scripts/fwbook;
zshFunctions = zshFWBook + "/functions.sh";
@@ -97,7 +102,9 @@ in
# Enable CUPS to print documents.
services.printing.enable = true;
# Bluetooth
hardware.bluetooth.settings.General = { ControllerMode = "bredr"; };
hardware.bluetooth.settings.General = {
ControllerMode = "bredr";
};
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
# Bootloader.
@@ -110,11 +117,13 @@ in
# Packages
environment.systemPackages =
let
gdk = pkgs.google-cloud-sdk.withExtraComponents
(with pkgs.google-cloud-sdk.components; [
gdk = pkgs.google-cloud-sdk.withExtraComponents (
with pkgs.google-cloud-sdk.components;
[
gke-gcloud-auth-plugin
kubectl
]);
]
);
in
(with pkgs; [
@@ -126,6 +135,7 @@ in
openfortivpn
openfortivpn-webview
openfortivpn-webview-qt
nodejs
# Util
libusb1
@@ -246,8 +256,10 @@ in
# # Brother Printer
hardware.sane.brscan5.enable = true;
# # Display Managers
services.xserver.videoDrivers =
[ "modesetting" "fbdev" ];
services.xserver.videoDrivers = [
"modesetting"
"fbdev"
];
# Kernel
boot.kernelPackages = pkgs.linuxPackages_zen;
@@ -256,18 +268,36 @@ in
fileSystems."/mnt/EightTerra/FamilyStorage" = {
device = "tnas1.lab.internal:/mnt/EightTerra/FamilyStorage";
fsType = "nfs";
options = [ "x-systemd.automount" "noauto" ];
options = [
"x-systemd.automount"
"noauto"
];
};
fileSystems."/mnt/EightTerra/k3s-cluster" = {
device = "tnas1.lab.internal:/mnt/EightTerra/k3s-cluster";
fsType = "nfs";
options = [
"x-systemd.automount"
"noauto"
];
};
# Remote Builder
nix.buildMachines = [{
hostName = "root@bigbox1.lab.internal";
system = "x86_64-linux";
protocol = "ssh-ng";
maxJobs = 1;
speedFactor = 2;
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
mandatoryFeatures = [ ];
}];
nix.buildMachines = [
{
hostName = "root@bigbox1.lab.internal";
system = "x86_64-linux";
protocol = "ssh-ng";
maxJobs = 1;
speedFactor = 2;
supportedFeatures = [
"nixos-test"
"benchmark"
"big-parallel"
"kvm"
];
mandatoryFeatures = [ ];
}
];
nix.distributedBuilds = true;
# optional, useful when the builder has a faster internet connection than yours
nix.extraOptions = ''
+27 -18
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
with lib;
@@ -25,11 +30,13 @@ in
type = types.str;
};
extraGitConfigs = mkOption {
type = types.listOf (types.submodule {
path = mkOption {
type = types.str;
};
});
type = types.listOf (
types.submodule {
path = mkOption {
type = types.str;
};
}
);
default = [ ];
};
};
@@ -37,18 +44,20 @@ in
config =
let
hm = (import ../home {
stateVersion = cfg.home-manager.version;
});
hm = (
import ../home {
stateVersion = cfg.home-manager.version;
}
);
in
mkIf cfg.user.enable
{
programs.zsh.enable = true;
home-manager.users.root =
(hm.makeRootUser { hostName = config.skyg.core.hostName; }) { pkgs = pkgs; };
home-manager.users.${cfg.user.name} =
((hm.makeCommonUser cfg.user) { pkgs = pkgs; }) // {
imports = cfg.home-manager.extraImports;
};
mkIf cfg.user.enable {
programs.zsh.enable = true;
home-manager.users.root = (hm.makeRootUser { hostName = config.skyg.core.hostName; }) {
pkgs = pkgs;
};
home-manager.backupFileExtension = ".bak";
home-manager.users.${cfg.user.name} = ((hm.makeCommonUser cfg.user) { pkgs = pkgs; }) // {
imports = cfg.home-manager.extraImports;
};
};
}
+60 -50
View File
@@ -16,64 +16,74 @@ let
};
in
{
makeRootUser = { hostName }: { pkgs, ... }: {
home = homeModule // {
packages = with pkgs; [
jq
kubectl
kubectx
htop
btop
duf
];
};
programs = (programsModule {
pkgs = pkgs;
user = {
name = "root";
makeRootUser =
{ hostName }:
{ pkgs, ... }:
{
home = homeModule // {
packages = with pkgs; [
jq
kubectl
kubectx
htop
btop
duf
];
};
}) // (makeCommonGitConfigs {
userName = "root";
userEmail = "root@${hostName}";
extraGitConfigs = [ ];
});
services = servicesModule { pkgs = pkgs; };
fonts = fontsModule;
};
programs =
(programsModule {
pkgs = pkgs;
user = {
name = "root";
};
})
// (makeCommonGitConfigs {
userName = "root";
userEmail = "root@${hostName}";
extraGitConfigs = [ ];
});
services = servicesModule { pkgs = pkgs; };
fonts = fontsModule;
};
makeCommonUser =
{ fullName
, email
, extraGitConfigs ? [ ]
, name
, ...
}@user: { pkgs, ... }: {
{
fullName,
email,
extraGitConfigs ? [ ],
name,
...
}@user:
{ pkgs, ... }:
{
fonts = fontsModule;
# xdg.configFile."mimeapps.list".force = true;
home = homeModule // {
username = name;
homeDirectory = "/home/${name}";
packages = with pkgs;
[
jq
nixpkgs-fmt
ipfetch
nixd
htop
btop
fastfetch
kubectl
kubectx
terraform
dust
];
packages = with pkgs; [
jq
nixpkgs-fmt
ipfetch
nixd
htop
btop
fastfetch
kubectl
kubectx
terraform
dust
];
};
programs = (programsModule {
inherit pkgs user;
}) // (makeCommonGitConfigs {
userName = fullName;
userEmail = email;
extraGitConfigs = extraGitConfigs;
});
programs =
(programsModule {
inherit pkgs user;
})
// (makeCommonGitConfigs {
userName = fullName;
userEmail = email;
extraGitConfigs = extraGitConfigs;
});
services = servicesModule { pkgs = pkgs; };
};
}