Merge branch 'main' of github.com:asosnovsky/nixos-setup

This commit is contained in:
ari committed 2026-01-02 10:37:33 -05:00
commit a980713fdf
17 files changed
+366 -507

No files matched your search

+5 -10
View File
@@ -1,10 +1,7 @@
{ user }:
{
pkgs,
hyprlauncher,
system,
nixpkgs-unstable,
...
{ pkgs
, unstablePkgs
, user
, ...
}:
let
zshFWBook = builtins.filterSource (p: t: true) ./scripts/fwbook;
@@ -13,10 +10,8 @@ let
8000
8001
];
unstable = nixpkgs-unstable.legacyPackages.${system};
in
{
imports = [ ./fwbook.hardware-configuration.nix ];
# Skyg
environment.sessionVariables.NIXPKGS_ALLOW_UNFREE = 1;
environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1;
@@ -265,7 +260,7 @@ in
port = 11434;
acceleration = "rocm";
rocmOverrideGfx = "11.0.2";
package = unstable.ollama-rocm;
package = unstablePkgs.ollama-rocm;
};
# # Brother Printer
hardware.sane.brscan5.enable = true;
-2
View File
@@ -1,7 +1,5 @@
{ ... }:
{ pkgs, config, ... }:
{
imports = [ ./hl-bigbox1.hardware-configuration.nix ];
skyg = {
user.enable = true;
server.admin.enable = true;
+6 -3
View File
@@ -1,5 +1,7 @@
{ ... }:
{ pkgs, ... }:
{ pkgs
, unstablePkgs
, ...
}:
let
ports = {
tabby = 11029;
@@ -22,7 +24,7 @@ in
amdgpu.enable = true;
};
desktop = {
stylix.enable = true;
stylix.enable = true;
enable = true;
tiler = {
enable = true;
@@ -108,6 +110,7 @@ in
host = "0.0.0.0";
port = ports.ollama;
acceleration = "rocm";
package = unstablePkgs.ollama-rocm;
};
# Tabby
services.tabby = {
-6
View File
@@ -1,10 +1,5 @@
{ user }:
{ pkgs, ... }:
let
scriptsFolder = builtins.filterSource (p: t: true) ./scripts/fw1;
in
{
imports = [ ./hl-fws1.hardware-configuration.nix ];
skyg.user.enable = true;
skyg.nixos.common.ssh-server.enable = true;
skyg.nixos.server.k3s.enable = true;
@@ -24,4 +19,3 @@ in
# Kernel
boot.kernelPackages = pkgs.linuxPackages_zen;
}
-3
View File
@@ -1,4 +1,3 @@
{ user }:
{ ... }:
let
ports = {
@@ -24,7 +23,6 @@ let
];
in
{
imports = [ ./hl-minipc1.hardware-configuration.nix ];
skyg.user.enable = true;
skyg.nixos.common.ssh-server.enable = true;
skyg.nixos.common.containers.openMetricsPort = true;
@@ -89,4 +87,3 @@ in
networking.firewall.allowedUDPPorts = openPorts;
networking.firewall.allowedTCPPorts = openPorts;
}
+1 -6
View File
@@ -1,9 +1,5 @@
{ user }:
{ pkgs
, ...
}:
{ ... }:
{
imports = [ ./hl-minipc2.hardware-configuration.nix ];
skyg.user.enable = true;
skyg.nixos.common.ssh-server.enable = true;
skyg.nixos.common.containers.openMetricsPort = true;
@@ -39,4 +35,3 @@
};
};
}
+1 -5
View File
@@ -1,9 +1,6 @@
{ user }:
{ pkgs
, ...
{ ...
}:
{
imports = [ ./hl-minipc3.hardware-configuration.nix ];
skyg.user.enable = true;
skyg.nixos.common.ssh-server.enable = true;
skyg.nixos.common.containers.openMetricsPort = true;
@@ -20,4 +17,3 @@
# Disable firewall
networking.firewall.enable = false;
}
-3
View File
@@ -1,4 +1,3 @@
{ user }:
{ pkgs, ... }:
let
openPorts = [
@@ -16,7 +15,6 @@ let
];
in
{
imports = [ ./hl-terra1.hardware-configuration.nix ];
skyg.user.enable = true;
skyg.nixos.common.ssh-server.enable = true;
skyg.nixos.desktop.enable = false;
@@ -46,4 +44,3 @@ in
'';
};
}