deadnix
This commit is contained in:
@@ -1,8 +1,5 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
config,
|
config,
|
||||||
namespace,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{ ... }:
|
||||||
let
|
let
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
update-boot = "sudo nixos-rebuild boot --max-jobs 10";
|
update-boot = "sudo nixos-rebuild boot --max-jobs 10";
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, namespace, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
let
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.3";
|
update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.3";
|
||||||
|
|||||||
@@ -1,24 +1,11 @@
|
|||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
system,
|
system,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
isArm = "aarch64-linux" == system;
|
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; [
|
x86_only = with pkgs; [
|
||||||
vscode-extensions.redhat.vscode-xml
|
vscode-extensions.redhat.vscode-xml
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,36 +1,5 @@
|
|||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
with 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 = {
|
options.mjallen.programs.waybar = {
|
||||||
enable = mkEnableOption "enable waybar";
|
enable = mkEnableOption "enable waybar";
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
let
|
let
|
||||||
cfg = config.mjallen.programs.waybar;
|
cfg = config.mjallen.programs.waybar;
|
||||||
|
|
||||||
pythonEnv = pkgs.python3.withPackages (ps: [
|
pythonEnv = pkgs.python3.withPackages (_ps: [
|
||||||
pkgs.${namespace}.homeassistant-api
|
pkgs.${namespace}.homeassistant-api
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ let
|
|||||||
cfg = config.mjallen.sops;
|
cfg = config.mjallen.sops;
|
||||||
|
|
||||||
user = config.${namespace}.user.name;
|
user = config.${namespace}.user.name;
|
||||||
hostname = config.${namespace}.network.hostname;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [ ./options.nix ];
|
imports = [ ./options.nix ];
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ in
|
|||||||
nixpkgs.config.packageOverrides = pkgs: {
|
nixpkgs.config.packageOverrides = pkgs: {
|
||||||
steam = pkgs.steam.override {
|
steam = pkgs.steam.override {
|
||||||
extraPkgs =
|
extraPkgs =
|
||||||
pkgs: with pkgsVersion; [
|
_pkgs: with pkgsVersion; [
|
||||||
xorg.libXcursor
|
xorg.libXcursor
|
||||||
xorg.libXi
|
xorg.libXi
|
||||||
xorg.libXinerama
|
xorg.libXinerama
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
|
||||||
namespace,
|
namespace,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
@@ -69,7 +68,6 @@ in
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
namespace,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ with lib;
|
|||||||
let
|
let
|
||||||
cfg = config.${namespace}.services.ollama;
|
cfg = config.${namespace}.services.ollama;
|
||||||
|
|
||||||
llamaPackage = pkgs.llama-cpp.overrideAttrs (old: {
|
llamaPackage = pkgs.llama-cpp.overrideAttrs (_old: {
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "ggml-org";
|
owner = "ggml-org";
|
||||||
repo = "llama.cpp";
|
repo = "llama.cpp";
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ let
|
|||||||
paperlessPort = 28981;
|
paperlessPort = 28981;
|
||||||
paperlessUserId = config.users.users.nix-apps.uid;
|
paperlessUserId = config.users.users.nix-apps.uid;
|
||||||
paperlessGroupId = config.users.groups.jallen-nas.gid;
|
paperlessGroupId = config.users.groups.jallen-nas.gid;
|
||||||
paperlessEnv = config.sops.templates."paperless.env".path;
|
|
||||||
paperlessPkg = pkgs.paperless-ngx;
|
paperlessPkg = pkgs.paperless-ngx;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, lib, ... }:
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
# Permission modes are in octal representation (same as chmod),
|
# Permission modes are in octal representation (same as chmod),
|
||||||
# the digits represent: user|group|others
|
# the digits represent: user|group|others
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{ inputs, ... }:
|
{ ... }:
|
||||||
final: prev: {
|
final: _prev: {
|
||||||
jdk = final.openjdk17;
|
jdk = final.openjdk17;
|
||||||
openjdk8 = final.openjdk17;
|
openjdk8 = final.openjdk17;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{ ... }:
|
{ ... }:
|
||||||
final: prev: {
|
_final: prev: {
|
||||||
waybar = prev.waybar.overrideAttrs (old: {
|
waybar = prev.waybar.overrideAttrs (old: {
|
||||||
mesonFlags = (old.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ];
|
mesonFlags = (old.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ];
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
{
|
{
|
||||||
lib,
|
|
||||||
python3Packages,
|
python3Packages,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
...
|
...
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
{
|
{
|
||||||
config,
|
|
||||||
inputs,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ in
|
|||||||
# Configure nixpkgs
|
# Configure nixpkgs
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
overlays = lib.mkAfter [
|
overlays = lib.mkAfter [
|
||||||
(self: super: {
|
(_self: _super: {
|
||||||
# This is used in (modulesPath + "/hardware/all-firmware.nix") when at least
|
# This is used in (modulesPath + "/hardware/all-firmware.nix") when at least
|
||||||
# enableRedistributableFirmware is enabled
|
# enableRedistributableFirmware is enabled
|
||||||
# I know no easier way to override this package
|
# I know no easier way to override this package
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, lib, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
let
|
||||||
kernelBundle = pkgs.linuxAndFirmware.latest;
|
kernelBundle = pkgs.linuxAndFirmware.latest;
|
||||||
in
|
in
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ in
|
|||||||
# Configure nixpkgs
|
# Configure nixpkgs
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
overlays = lib.mkAfter [
|
overlays = lib.mkAfter [
|
||||||
(self: super: {
|
(_self: _super: {
|
||||||
# This is used in (modulesPath + "/hardware/all-firmware.nix") when at least
|
# This is used in (modulesPath + "/hardware/all-firmware.nix") when at least
|
||||||
# enableRedistributableFirmware is enabled
|
# enableRedistributableFirmware is enabled
|
||||||
# I know no easier way to override this package
|
# I know no easier way to override this package
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ lib, config, ... }:
|
{ ... }:
|
||||||
let
|
let
|
||||||
hostname = "pi5";
|
hostname = "pi5";
|
||||||
in
|
in
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ in
|
|||||||
options.nas-apps = mkOption {
|
options.nas-apps = mkOption {
|
||||||
type = types.attrsOf (
|
type = types.attrsOf (
|
||||||
types.submodule (
|
types.submodule (
|
||||||
{ config, name, ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ 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"
|
# "https://cache.mjallen.dev"
|
||||||
# "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
|
# "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ outputs, ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
# Configure nixpkgs
|
# Configure nixpkgs
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
pkgs,
|
|
||||||
lib,
|
lib,
|
||||||
inputs,
|
|
||||||
namespace,
|
namespace,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
{ config, lib, ... }:
|
{ lib, ... }:
|
||||||
let
|
|
||||||
user = "nix-apps";
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
# Permission modes are in octal representation (same as chmod),
|
# Permission modes are in octal representation (same as chmod),
|
||||||
# the digits represent: user|group|others
|
# the digits represent: user|group|others
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
namespace,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
|||||||
@@ -1,22 +1,13 @@
|
|||||||
# Snowfall Lib provides a customized `lib` instance with access to your flake's library
|
# 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.
|
# 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.
|
# An instance of `pkgs` with your overlays and packages applied is also available.
|
||||||
pkgs,
|
|
||||||
# You also have access to your flake's inputs.
|
# You also have access to your flake's inputs.
|
||||||
inputs,
|
|
||||||
|
|
||||||
# Additional metadata is provided by Snowfall Lib.
|
# Additional metadata is provided by Snowfall Lib.
|
||||||
namespace, # The namespace used for your flake, defaulting to "internal" if not set.
|
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.
|
||||||
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.
|
|
||||||
|
|
||||||
# All other arguments come from the system system.
|
# All other arguments come from the system system.
|
||||||
config,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -42,6 +42,7 @@
|
|||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
fail-on-change = false;
|
fail-on-change = false;
|
||||||
|
no-cache = true;
|
||||||
global.excludes = [
|
global.excludes = [
|
||||||
"*.editorconfig"
|
"*.editorconfig"
|
||||||
"*.envrc"
|
"*.envrc"
|
||||||
|
|||||||
Reference in New Issue
Block a user