This commit is contained in:
mjallen18
2025-07-24 11:19:19 -05:00
parent 3d213c8769
commit f3aafffcaa
29 changed files with 18 additions and 90 deletions

View File

@@ -1,8 +1,5 @@
{
pkgs,
lib,
config,
namespace,
...
}:
let

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ ... }:
let
shellAliases = {
update-boot = "sudo nixos-rebuild boot --max-jobs 10";

View File

@@ -1,4 +1,4 @@
{ pkgs, namespace, ... }:
{ pkgs, ... }:
let
shellAliases = {
update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.3";

View File

@@ -1,24 +1,11 @@
{
config,
lib,
pkgs,
system,
...
}:
let
isArm = "aarch64-linux" == system;
open-remote-ssh = pkgs.vscode-utils.buildVscodeExtension {
pname = "open-remote-ssh";
version = "0.0.49";
vscodeExtPublisher = "jeanp413";
vscodeExtName = "open-remote-ssh";
vscodeExtUniqueId = "jeanp413.open-remote-ssh";
src = pkgs.fetchurl {
url = "https://open-vsx.org/api/jeanp413/open-remote-ssh/0.0.49/file/jeanp413.open-remote-ssh-0.0.49.vsix";
sha256 = "sha256-QfJnAAx+kO2iJ1EzWoO5HLogJKg3RiC3hg1/u2Jm6t4";
name = "open-remote-ssh.zip";
};
};
x86_only = with pkgs; [
vscode-extensions.redhat.vscode-xml
];

View File

@@ -1,36 +1,5 @@
{ lib, ... }:
with lib;
let
# nord = import ../../desktop/theme/nord.nix;
# defaultOpacity = "opacity: 0.85;";
# defaultBorderRadius = "border-radius: 1rem;";
# defaultCenterOptions = ''
# padding-top: 0.2rem;
# padding-bottom: 0.2rem;
# padding-left: 0.5rem;
# padding-right: 0.5rem;
# margin: 3px 0;
# '';
# borderRight = ''
# padding-top: 0.2rem;
# padding-bottom: 0.2rem;
# padding-left: 0.5rem;
# padding-right: 0.5rem;
# margin: 3px 0;
# border-radius: 0rem 1rem 1rem 0rem;
# margin-right: 0.5rem;
# '';
# borderLeft = ''
# padding-top: 0.2rem;
# padding-bottom: 0.2rem;
# padding-left: 0.5rem;
# padding-right: 0.5rem;
# margin: 3px 0;
# border-radius: 1rem 0rem 0rem 1rem;
# margin-left: 0.5rem;
# '';
in
{
options.mjallen.programs.waybar = {
enable = mkEnableOption "enable waybar";

View File

@@ -8,7 +8,7 @@
let
cfg = config.mjallen.programs.waybar;
pythonEnv = pkgs.python3.withPackages (ps: [
pythonEnv = pkgs.python3.withPackages (_ps: [
pkgs.${namespace}.homeassistant-api
]);

View File

@@ -8,7 +8,6 @@ let
cfg = config.mjallen.sops;
user = config.${namespace}.user.name;
hostname = config.${namespace}.network.hostname;
in
{
imports = [ ./options.nix ];

View File

@@ -62,7 +62,7 @@ in
nixpkgs.config.packageOverrides = pkgs: {
steam = pkgs.steam.override {
extraPkgs =
pkgs: with pkgsVersion; [
_pkgs: with pkgsVersion; [
xorg.libXcursor
xorg.libXi
xorg.libXinerama

View File

@@ -1,7 +1,6 @@
{
config,
lib,
pkgs,
namespace,
...
}:
@@ -69,7 +68,6 @@ in
{
pkgs,
lib,
namespace,
...
}:
{

View File

@@ -9,7 +9,7 @@ with lib;
let
cfg = config.${namespace}.services.ollama;
llamaPackage = pkgs.llama-cpp.overrideAttrs (old: {
llamaPackage = pkgs.llama-cpp.overrideAttrs (_old: {
src = pkgs.fetchFromGitHub {
owner = "ggml-org";
repo = "llama.cpp";

View File

@@ -1,6 +1,5 @@
{
lib,
pkgs,
config,
...
}:

View File

@@ -11,7 +11,6 @@ let
paperlessPort = 28981;
paperlessUserId = config.users.users.nix-apps.uid;
paperlessGroupId = config.users.groups.jallen-nas.gid;
paperlessEnv = config.sops.templates."paperless.env".path;
paperlessPkg = pkgs.paperless-ngx;
in
{

View File

@@ -1,4 +1,4 @@
{ config, lib, ... }:
{ lib, ... }:
{
# Permission modes are in octal representation (same as chmod),
# the digits represent: user|group|others

View File

@@ -1,5 +1,5 @@
{ inputs, ... }:
final: prev: {
{ ... }:
final: _prev: {
jdk = final.openjdk17;
openjdk8 = final.openjdk17;
}

View File

@@ -1,5 +1,5 @@
{ ... }:
final: prev: {
_final: prev: {
waybar = prev.waybar.overrideAttrs (old: {
mesonFlags = (old.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ];
});

View File

@@ -1,5 +1,4 @@
{
lib,
python3Packages,
fetchFromGitHub,
...

View File

@@ -1,6 +1,4 @@
{
config,
inputs,
pkgs,
...
}:

View File

@@ -42,7 +42,7 @@ in
# Configure nixpkgs
nixpkgs = {
overlays = lib.mkAfter [
(self: super: {
(_self: _super: {
# This is used in (modulesPath + "/hardware/all-firmware.nix") when at least
# enableRedistributableFirmware is enabled
# I know no easier way to override this package

View File

@@ -1,4 +1,4 @@
{ pkgs, lib, ... }:
{ pkgs, ... }:
let
kernelBundle = pkgs.linuxAndFirmware.latest;
in

View File

@@ -47,7 +47,7 @@ in
# Configure nixpkgs
nixpkgs = {
overlays = lib.mkAfter [
(self: super: {
(_self: _super: {
# This is used in (modulesPath + "/hardware/all-firmware.nix") when at least
# enableRedistributableFirmware is enabled
# I know no easier way to override this package

View File

@@ -1,4 +1,4 @@
{ lib, config, ... }:
{ ... }:
let
hostname = "pi5";
in

View File

@@ -6,7 +6,7 @@ in
options.nas-apps = mkOption {
type = types.attrsOf (
types.submodule (
{ config, name, ... }:
{ ... }:
{
options = {
enable = mkOption {

View File

@@ -1,7 +1,4 @@
{ config, pkgs, ... }:
let
nix-build-mail = pkgs.writeShellScript "echo -e \"Content-Type: text/plain\\r\\nSubject: NixOS cache rebuild failed\\r\\n\\r\\nThe nix-rebuild-cache service failed at $(date).\" | sendmail jalle008@proton.me";
in
{
# "https://cache.mjallen.dev"
# "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="

View File

@@ -1,4 +1,4 @@
{ outputs, ... }:
{ ... }:
{
# Configure nixpkgs
nixpkgs = {

View File

@@ -1,8 +1,6 @@
{
config,
pkgs,
lib,
inputs,
namespace,
...
}:

View File

@@ -1,7 +1,4 @@
{ config, lib, ... }:
let
user = "nix-apps";
in
{ lib, ... }:
{
# Permission modes are in octal representation (same as chmod),
# the digits represent: user|group|others

View File

@@ -6,7 +6,6 @@
config,
lib,
pkgs,
namespace,
...
}:

View File

@@ -1,22 +1,13 @@
# Snowfall Lib provides a customized `lib` instance with access to your flake's library
{
# as well as the libraries available from your flake's inputs.
lib,
# An instance of `pkgs` with your overlays and packages applied is also available.
pkgs,
# You also have access to your flake's inputs.
inputs,
# Additional metadata is provided by Snowfall Lib.
namespace, # The namespace used for your flake, defaulting to "internal" if not set.
system, # The system architecture for this host (eg. `x86_64-linux`).
target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
format, # A normalized name for the system target (eg. `iso`).
virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
systems, # An attribute map of your defined hosts.
namespace, # The namespace used for your flake, defaulting to "internal" if not set. # The system architecture for this host (eg. `x86_64-linux`). # The Snowfall Lib target for this system (eg. `x86_64-iso`). # A normalized name for the system target (eg. `iso`). # A boolean to determine whether this system is a virtual target using nixos-generators. # An attribute map of your defined hosts.
# All other arguments come from the system system.
config,
...
}:
{

View File

@@ -42,6 +42,7 @@
settings = {
fail-on-change = false;
no-cache = true;
global.excludes = [
"*.editorconfig"
"*.envrc"