formatting

This commit is contained in:
Osman Faruk Bayram 2025-09-16 11:08:21 +03:00
parent afbaee8e3d
commit 66a890bab5
9 changed files with 68 additions and 51 deletions

View file

@ -1,4 +1,11 @@
{pkgs, inputs, lib, config, ...}: {
{
pkgs,
inputs,
lib,
config,
...
}:
{
imports = [
# ../../modules
../../modules/common-packages.nix
@ -89,7 +96,6 @@
"mac" # TODO change mac user to osbm
];
# nix.nixPath = ["nixpkgs=${pkgs.path}"];
system.configurationRevision = inputs.self.rev or "dirty";
@ -106,11 +112,14 @@
alacritty
# ghostty
kitty
vscode git lazygit
vscode
git
lazygit
# blender
# libreoffice
# ungoogled-chromium
code-cursor ollama
code-cursor
ollama
];
system.stateVersion = 6;
nixpkgs.hostPlatform = "x86_64-darwin";

View file

@ -1,4 +1,4 @@
{lib, ...}:
{ lib, ... }:
{
options = {
myModules.enableKDE = lib.mkOption {
@ -7,4 +7,4 @@
description = "Enable KDE Plasma";
};
};
}
}

View file

@ -19,7 +19,6 @@
enableSound = true;
};
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

View file

@ -3,12 +3,13 @@
inputs,
...
}:
{
environment.systemPackages = with pkgs; [
(if !pkgs.stdenv.hostPlatform.isDarwin
then
inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default
else nano
{
environment.systemPackages = with pkgs; [
(
if !pkgs.stdenv.hostPlatform.isDarwin then
inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default
else
nano
)
wget
git

View file

@ -1,8 +1,9 @@
{inputs, ...}: {
{ inputs, ... }:
{
imports = [
inputs.nix-index-database.nixosModules.nix-index
];
programs.nix-index-database.comma.enable = true;
programs.command-not-found.enable = false; # TODO fix ts
}
}

View file

@ -1,7 +1,7 @@
{
config,
outputs,
lib,
config,
outputs,
lib,
...
}:
{
@ -12,7 +12,10 @@
nix.buildMachines = [
{
hostName = "ymir";
systems = ["x86_64-linux" "aarch64-linux"];
systems = [
"x86_64-linux"
"aarch64-linux"
];
supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features;
sshKey = config.age.secrets.ssh-key-private.path;
sshUser = "osbm";
@ -20,7 +23,7 @@
}
{
hostName = "wallfacer";
systems = ["x86_64-linux"];
systems = [ "x86_64-linux" ];
supportedFeatures = outputs.nixosConfigurations.wallfacer.config.nix.settings.system-features;
sshKey = config.age.secrets.ssh-key-private.path;
sshUser = "osbm";

View file

@ -18,21 +18,21 @@
enable = true;
startWhenNeeded = true;
settings = {
PermitRootLogin = "no";
PermitRootLogin = "no";
# only allow key based logins and not password
PasswordAuthentication = false;
KbdInteractiveAuthentication = false;
AuthenticationMethods = "publickey";
PubkeyAuthentication = "yes";
ChallengeResponseAuthentication = "no";
UsePAM = false;
# only allow key based logins and not password
PasswordAuthentication = false;
KbdInteractiveAuthentication = false;
AuthenticationMethods = "publickey";
PubkeyAuthentication = "yes";
ChallengeResponseAuthentication = "no";
UsePAM = false;
# kick out inactive sessions
ClientAliveCountMax = 5;
ClientAliveInterval = 60;
# kick out inactive sessions
ClientAliveCountMax = 5;
ClientAliveInterval = 60;
};
};
};
})
];

View file

@ -5,24 +5,28 @@
...
}:
let
python = let
packageOverrides = self: super: {
imageio = super.imageio.overridePythonAttrs (old: {
disabledTests = [
"test_read_stream"
"test_uri_reading"
"test_trim_filter"
"test_process_termination"
];
});
plotly = super.plotly.overridePythonAttrs (old: {
disabledTestPaths = (old.disabledTestPaths or []) ++ [
"tests/test_optional/test_kaleido/test_kaleido.py"
];
});
python =
let
packageOverrides = self: super: {
imageio = super.imageio.overridePythonAttrs (old: {
disabledTests = [
"test_read_stream"
"test_uri_reading"
"test_trim_filter"
"test_process_termination"
];
});
plotly = super.plotly.overridePythonAttrs (old: {
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 {
name = "wanikani-stats-flask";
runtimeInputs = [

View file

@ -1,3 +1,3 @@
{
virtualisation.docker.enable = true;
}
virtualisation.docker.enable = true;
}