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 = [
|
||||
# ../../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";
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
enableSound = true;
|
||||
};
|
||||
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
|
|
|||
|
|
@ -5,10 +5,11 @@
|
|||
}:
|
||||
{
|
||||
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
|
||||
else nano
|
||||
else
|
||||
nano
|
||||
)
|
||||
wget
|
||||
git
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{inputs, ...}: {
|
||||
{ inputs, ... }:
|
||||
{
|
||||
imports = [
|
||||
inputs.nix-index-database.nixosModules.nix-index
|
||||
];
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
python = let
|
||||
python =
|
||||
let
|
||||
packageOverrides = self: super: {
|
||||
imageio = super.imageio.overridePythonAttrs (old: {
|
||||
disabledTests = [
|
||||
|
|
@ -22,7 +23,10 @@ let
|
|||
});
|
||||
};
|
||||
in
|
||||
pkgs.python313.override { inherit packageOverrides; self = python; };
|
||||
pkgs.python313.override {
|
||||
inherit packageOverrides;
|
||||
self = python;
|
||||
};
|
||||
wanikani-stats-flask = pkgs.writeShellApplication {
|
||||
name = "wanikani-stats-flask";
|
||||
runtimeInputs = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue