formatting
This commit is contained in:
parent
afbaee8e3d
commit
66a890bab5
9 changed files with 68 additions and 51 deletions
|
|
@ -1,4 +1,11 @@
|
||||||
{pkgs, inputs, lib, config, ...}: {
|
{
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
# ../../modules
|
# ../../modules
|
||||||
../../modules/common-packages.nix
|
../../modules/common-packages.nix
|
||||||
|
|
@ -89,7 +96,6 @@
|
||||||
"mac" # TODO change mac user to osbm
|
"mac" # TODO change mac user to osbm
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
# nix.nixPath = ["nixpkgs=${pkgs.path}"];
|
# nix.nixPath = ["nixpkgs=${pkgs.path}"];
|
||||||
|
|
||||||
system.configurationRevision = inputs.self.rev or "dirty";
|
system.configurationRevision = inputs.self.rev or "dirty";
|
||||||
|
|
@ -106,11 +112,14 @@
|
||||||
alacritty
|
alacritty
|
||||||
# ghostty
|
# ghostty
|
||||||
kitty
|
kitty
|
||||||
vscode git lazygit
|
vscode
|
||||||
|
git
|
||||||
|
lazygit
|
||||||
# blender
|
# blender
|
||||||
# libreoffice
|
# libreoffice
|
||||||
# ungoogled-chromium
|
# ungoogled-chromium
|
||||||
code-cursor ollama
|
code-cursor
|
||||||
|
ollama
|
||||||
];
|
];
|
||||||
system.stateVersion = 6;
|
system.stateVersion = 6;
|
||||||
nixpkgs.hostPlatform = "x86_64-darwin";
|
nixpkgs.hostPlatform = "x86_64-darwin";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{lib, ...}:
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
myModules.enableKDE = lib.mkOption {
|
myModules.enableKDE = lib.mkOption {
|
||||||
|
|
@ -7,4 +7,4 @@
|
||||||
description = "Enable KDE Plasma";
|
description = "Enable KDE Plasma";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,6 @@
|
||||||
enableSound = true;
|
enableSound = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
|
||||||
|
|
@ -3,12 +3,13 @@
|
||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
(if !pkgs.stdenv.hostPlatform.isDarwin
|
(
|
||||||
then
|
if !pkgs.stdenv.hostPlatform.isDarwin then
|
||||||
inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default
|
inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default
|
||||||
else nano
|
else
|
||||||
|
nano
|
||||||
)
|
)
|
||||||
wget
|
wget
|
||||||
git
|
git
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
{inputs, ...}: {
|
{ inputs, ... }:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
inputs.nix-index-database.nixosModules.nix-index
|
inputs.nix-index-database.nixosModules.nix-index
|
||||||
];
|
];
|
||||||
programs.nix-index-database.comma.enable = true;
|
programs.nix-index-database.comma.enable = true;
|
||||||
programs.command-not-found.enable = false; # TODO fix ts
|
programs.command-not-found.enable = false; # TODO fix ts
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
outputs,
|
outputs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
|
|
@ -12,7 +12,10 @@
|
||||||
nix.buildMachines = [
|
nix.buildMachines = [
|
||||||
{
|
{
|
||||||
hostName = "ymir";
|
hostName = "ymir";
|
||||||
systems = ["x86_64-linux" "aarch64-linux"];
|
systems = [
|
||||||
|
"x86_64-linux"
|
||||||
|
"aarch64-linux"
|
||||||
|
];
|
||||||
supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features;
|
supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features;
|
||||||
sshKey = config.age.secrets.ssh-key-private.path;
|
sshKey = config.age.secrets.ssh-key-private.path;
|
||||||
sshUser = "osbm";
|
sshUser = "osbm";
|
||||||
|
|
@ -20,7 +23,7 @@
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
hostName = "wallfacer";
|
hostName = "wallfacer";
|
||||||
systems = ["x86_64-linux"];
|
systems = [ "x86_64-linux" ];
|
||||||
supportedFeatures = outputs.nixosConfigurations.wallfacer.config.nix.settings.system-features;
|
supportedFeatures = outputs.nixosConfigurations.wallfacer.config.nix.settings.system-features;
|
||||||
sshKey = config.age.secrets.ssh-key-private.path;
|
sshKey = config.age.secrets.ssh-key-private.path;
|
||||||
sshUser = "osbm";
|
sshUser = "osbm";
|
||||||
|
|
|
||||||
|
|
@ -18,21 +18,21 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
startWhenNeeded = true;
|
startWhenNeeded = true;
|
||||||
settings = {
|
settings = {
|
||||||
PermitRootLogin = "no";
|
PermitRootLogin = "no";
|
||||||
|
|
||||||
# only allow key based logins and not password
|
# only allow key based logins and not password
|
||||||
PasswordAuthentication = false;
|
PasswordAuthentication = false;
|
||||||
KbdInteractiveAuthentication = false;
|
KbdInteractiveAuthentication = false;
|
||||||
AuthenticationMethods = "publickey";
|
AuthenticationMethods = "publickey";
|
||||||
PubkeyAuthentication = "yes";
|
PubkeyAuthentication = "yes";
|
||||||
ChallengeResponseAuthentication = "no";
|
ChallengeResponseAuthentication = "no";
|
||||||
UsePAM = false;
|
UsePAM = false;
|
||||||
|
|
||||||
# kick out inactive sessions
|
# kick out inactive sessions
|
||||||
ClientAliveCountMax = 5;
|
ClientAliveCountMax = 5;
|
||||||
ClientAliveInterval = 60;
|
ClientAliveInterval = 60;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -5,24 +5,28 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
python = let
|
python =
|
||||||
packageOverrides = self: super: {
|
let
|
||||||
imageio = super.imageio.overridePythonAttrs (old: {
|
packageOverrides = self: super: {
|
||||||
disabledTests = [
|
imageio = super.imageio.overridePythonAttrs (old: {
|
||||||
"test_read_stream"
|
disabledTests = [
|
||||||
"test_uri_reading"
|
"test_read_stream"
|
||||||
"test_trim_filter"
|
"test_uri_reading"
|
||||||
"test_process_termination"
|
"test_trim_filter"
|
||||||
];
|
"test_process_termination"
|
||||||
});
|
];
|
||||||
plotly = super.plotly.overridePythonAttrs (old: {
|
});
|
||||||
disabledTestPaths = (old.disabledTestPaths or []) ++ [
|
plotly = super.plotly.overridePythonAttrs (old: {
|
||||||
"tests/test_optional/test_kaleido/test_kaleido.py"
|
disabledTestPaths = (old.disabledTestPaths or [ ]) ++ [
|
||||||
];
|
"tests/test_optional/test_kaleido/test_kaleido.py"
|
||||||
});
|
];
|
||||||
|
});
|
||||||
|
};
|
||||||
|
in
|
||||||
|
pkgs.python313.override {
|
||||||
|
inherit packageOverrides;
|
||||||
|
self = python;
|
||||||
};
|
};
|
||||||
in
|
|
||||||
pkgs.python313.override { inherit packageOverrides; self = python; };
|
|
||||||
wanikani-stats-flask = pkgs.writeShellApplication {
|
wanikani-stats-flask = pkgs.writeShellApplication {
|
||||||
name = "wanikani-stats-flask";
|
name = "wanikani-stats-flask";
|
||||||
runtimeInputs = [
|
runtimeInputs = [
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
{
|
{
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue