fixed formatting
Some checks failed
Ansible Lint Check / check-ansible (push) Successful in 5s
Nix Format Check / check-format (push) Successful in 1m14s
Python Lint Check / check-python (push) Failing after 6s

This commit is contained in:
2025-09-23 13:35:37 +00:00
parent 54fc080ef2
commit c659c599f4
5 changed files with 71 additions and 44 deletions

View File

@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
{
programs.bash = {
@@ -8,7 +13,10 @@
# History configuration
historySize = 1000;
historyFileSize = 2000;
historyControl = [ "ignoredups" "ignorespace" ];
historyControl = [
"ignoredups"
"ignorespace"
];
# Bash options and extra configuration
bashrcExtra = ''
@@ -120,7 +128,8 @@
"docker-compose" = "docker compose";
# Modern tools aliases
"l" = "eza --header --long --git --group-directories-first --group --icons --color=always --sort=name --hyperlink -o --no-permissions";
"l" =
"eza --header --long --git --group-directories-first --group --icons --color=always --sort=name --hyperlink -o --no-permissions";
"ll" = "l";
"la" = "l -a";
"cat" = "bat";
@@ -139,8 +148,10 @@
"dcps" = "docker compose ps";
"dcpr" = "dcp && dcd && dcu -d && dcl -f";
"dcr" = "dcd && dcu -d && dcl -f";
"ddpul" = "docker compose down && docker compose pull && docker compose up -d && docker compose logs -f";
"docker-nuke" = "docker kill $(docker ps -q) && docker rm $(docker ps -a -q) && docker system prune --all --volumes --force && docker volume prune --force";
"ddpul" =
"docker compose down && docker compose pull && docker compose up -d && docker compose logs -f";
"docker-nuke" =
"docker kill $(docker ps -q) && docker rm $(docker ps -a -q) && docker system prune --all --volumes --force && docker volume prune --force";
# Git aliases
"g" = "git";
@@ -267,5 +278,4 @@
];
};
}

View File

@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
{
programs.git = {

View File

@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
{
programs.starship = {

View File

@@ -18,28 +18,36 @@
opnix,
}:
let
supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
supportedSystems = [
"x86_64-linux"
"aarch64-linux"
];
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
pkgsFor = system: import nixpkgs {
inherit system;
config.allowUnfree = true;
};
pkgsFor =
system:
import nixpkgs {
inherit system;
config.allowUnfree = true;
};
in
{
homeConfigurations = let
mkHomeConfig = system: hostname: isServer:
home-manager.lib.homeManagerConfiguration {
pkgs = pkgsFor system;
modules = [ ./home.nix ];
extraSpecialArgs = {
homeConfigurations =
let
mkHomeConfig =
system: hostname: isServer:
home-manager.lib.homeManagerConfiguration {
pkgs = pkgsFor system;
inherit opnix isServer hostname;
modules = [ ./home.nix ];
extraSpecialArgs = {
pkgs = pkgsFor system;
inherit opnix isServer hostname;
};
};
};
in {
"mennos-vps" = mkHomeConfig "aarch64-linux" "mennos-vps" true;
"mennos-desktop" = mkHomeConfig "x86_64-linux" "mennos-desktop" false;
"mennos-laptop" = mkHomeConfig "x86_64-linux" "mennos-laptop" false;
};
in
{
"mennos-vps" = mkHomeConfig "aarch64-linux" "mennos-vps" true;
"mennos-desktop" = mkHomeConfig "x86_64-linux" "mennos-desktop" false;
"mennos-laptop" = mkHomeConfig "x86_64-linux" "mennos-laptop" false;
};
};
}

View File

@@ -13,24 +13,23 @@
allowUnfreePredicate = pkg: true;
};
imports =
[
opnix.homeManagerModules.default
./config/default.nix
./packages/common/default.nix
]
++ (
if isServer then
[
./packages/server/default.nix
./server/default.nix
]
else
[
./packages/workstation/default.nix
./workstation/default.nix
]
);
imports = [
opnix.homeManagerModules.default
./config/default.nix
./packages/common/default.nix
]
++ (
if isServer then
[
./packages/server/default.nix
./server/default.nix
]
else
[
./packages/workstation/default.nix
./workstation/default.nix
]
);
home = {
username = "menno";