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

This commit is contained in:
ari committed 2024-08-12 09:15:05 -04:00
commit bcc25860b7
18 files changed
+68 -143

No files matched your search

Generated
+1 -85
View File
@@ -1,38 +1,5 @@
{
"nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -54,41 +21,6 @@
"type": "github"
}
},
"lix": {
"flake": false,
"locked": {
"lastModified": 1720626042,
"narHash": "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=",
"rev": "2a4376be20d70feaa2b0e640c5041fb66ddc67ed",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a4376be20d70feaa2b0e640c5041fb66ddc67ed.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.90.0.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1720641669,
"narHash": "sha256-yEO2cGNgzm9x/XxiDQI+WckSWnZX63R8aJLBRSXtYNE=",
"rev": "5c48c833c15bb80d127a398a8c2484d42fdd8257",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5c48c833c15bb80d127a398a8c2484d42fdd8257.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": [
@@ -144,11 +76,10 @@
"root": {
"inputs": {
"home-manager": "home-manager",
"lix-module": "lix-module",
"nix-darwin": "nix-darwin",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"systems": "systems_2",
"systems": "systems",
"unstable": "unstable",
"unstable-home-manager": "unstable-home-manager"
}
@@ -168,21 +99,6 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"unstable": {
"locked": {
"lastModified": 1722630782,
-7
View File
@@ -6,11 +6,6 @@
# Nixpkgs
unstable.url = "github:NixOS/nixpkgs/master";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
# Lix
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
# Home manager
home-manager = {
url = "github:nix-community/home-manager/release-24.05";
@@ -33,7 +28,6 @@
, nixpkgs
, systems
, unstable
, lix-module
, home-manager
, unstable-home-manager
, nix-darwin
@@ -83,7 +77,6 @@
# Lib Config
libConfig = {
nix-darwin = nix-darwin;
lix-module = lix-module;
hlCommonSettings = hlCommonSettings;
systems = systems;
};
+9
View File
@@ -34,7 +34,16 @@ in
amdctl
# python
python312
# crypto
trezor-suite
trezord
ledger-live-desktop
];
# udev rules for crypto wallets
services.udev.packages = with pkgs; [ ledger-udev-rules trezor-udev-rules ];
# trezor groups
users.groups.trezord = { };
users.groups.trezord.members = [ user.name ];
# # Opengl
hardware.opengl = {
driSupport = true;
+1 -1
View File
@@ -21,7 +21,7 @@
options = [ "nofail" ];
};
# Services
homelab.services.audiobookshelf = {
skyg.homelab.services.audiobookshelf = {
enable = true;
host = "0.0.0.0";
openFirewall = true;
+1 -1
View File
@@ -9,7 +9,7 @@
boot.loader.efi.canTouchEfiVariables = true;
# Special udev rule for google's coral tpu
homelab.udevrules.coraltpu.enable = true;
skyg.homelab.udevrules.coraltpu.enable = true;
# Containers
virtualisation.oci-containers = {
-37
View File
@@ -20,41 +20,4 @@
# Mobile Connect
programs.kdeconnect.enable = true;
# Web
# Personal Desktop App
users.users.${user.name}.packages = with pkgs; [
# web
brave
# mail
thunderbird
# password
bitwarden-desktop
rofi-rbw-wayland
rofi-rbw-x11
# development
vscode
# socials
zoom-us
betterdiscordctl
discord
signal-desktop
whatsapp-for-linux
caprine-bin # facebook messenger
# crypto
trezor-suite
trezord
ledger-live-desktop
# documents
onlyoffice-bin_latest
# video
vlc
vlc-bittorrent
# terminal
alacritty
alacritty-theme
];
# udev rules for crypto wallets
services.udev.packages = with pkgs; [ ledger-udev-rules trezor-udev-rules ];
# trezor groups
users.groups.trezord = { };
users.groups.trezord.members = [ user.name ];
}
+33
View File
@@ -43,6 +43,39 @@ in
devbox
terraform
kubectl
# socials
slack
zoom-us
betterdiscordctl
discord
signal-desktop
whatsapp-for-linux
caprine-bin # facebook messenger
# development
vscode
# web
brave
# mail
thunderbird
# password
bitwarden-desktop
# documents
onlyoffice-bin_latest
# video
vlc
vlc-bittorrent
# terminal
alacritty
alacritty-theme
] else
[ ]);
};
-2
View File
@@ -1,7 +1,6 @@
{ nixpkgs
, home-manager
, nix-darwin
, lix-module
, systems
, hlCommonSettings
}:
@@ -33,7 +32,6 @@ let
attrs = joinedttrs;
extraConfiguration = [
home-manager.nixosModules.default
lix-module.nixosModules.default
];
});
};
+1 -2
View File
@@ -18,8 +18,7 @@
{ pkgs, ... }: {
imports = [
(import ./skyg)
(import ./hl-services)
(import ./hl-hardware)
(import ./nixos)
] ++ (if desktop.enable then
[ (import ./desktop ({ user = user; } // desktop)) ]
else
+6
View File
@@ -0,0 +1,6 @@
{ ... }:
{
imports = [
./hardware
];
}
File renamed without changes.
@@ -5,7 +5,7 @@
, ...
}:
let
cfg = config.homelab.hardware.fan2go;
cfg = config.skyg.hardware.fan2go;
fan2goConfig = pkgs.writeText "fan2go.yaml" ''
dbPath: ${cfg.dbPath}
@@ -65,7 +65,7 @@ let
'';
in
{
options.homelab.hardware.fan2go = with lib; {
options.skyg.hardware.fan2go = with lib; {
enable = mkEnableOption "fan2go";
dbPath = mkOption {
@@ -4,10 +4,10 @@
, ...
}:
let
cfg = config.homelab.hardware.fancontrol;
cfg = config.skyg.hardware.fancontrol;
in
{
options.homelab.hardware.fancontrol = with lib; {
options.skyg.hardware.fancontrol = with lib; {
enable = mkEnableOption "fancontrol";
configName = mkOption {
type = types.str;
+7
View File
@@ -0,0 +1,7 @@
{ ... }:
{
imports = [
./common
./server
];
}
+1
View File
@@ -0,0 +1 @@
@@ -2,10 +2,10 @@
with lib;
let cfg = config.homelab.services.audiobookshelf;
let cfg = config.skyg.homelab.services.audiobookshelf;
in {
options = {
homelab.services.audiobookshelf = {
skyg.homelab.services.audiobookshelf = {
enable = mkEnableOption
"Audiobookshelf, self-hosted audiobook and podcast server.";
@@ -1,9 +1,9 @@
{ config, lib, ... }:
with lib;
let cfg = config.homelab.udevrules.coraltpu;
let cfg = config.skyg.homelab.udevrules.coraltpu;
in {
options = {
homelab.udevrules.coraltpu = {
skyg.homelab.udevrules.coraltpu = {
enable = mkEnableOption
"Enable Coral TPU Udev rules";
symlinkName = mkOption {
File renamed without changes.