fix: auto formatter

This commit is contained in:
Ranomier 2025-05-08 20:36:52 +02:00
parent 59f507bc06
commit 7724f8cc5f
14 changed files with 47 additions and 52 deletions

View file

@ -1,14 +1,13 @@
inArgs: hostname: hostOptions: inArgs: hostname: hostOptions: let
let
nixosSystem = nixosSystem =
if (hostOptions ? unstable && hostOptions.unstable) if (hostOptions ? unstable && hostOptions.unstable)
then inArgs.nixos-unstable.lib.nixosSystem then inArgs.nixos-unstable.lib.nixosSystem
else inArgs.nixpkgs.lib.nixosSystem; else inArgs.nixpkgs.lib.nixosSystem;
in in
nixosSystem { nixosSystem {
specialArgs = {inherit inArgs;}; specialArgs = {inherit inArgs;};
modules = [ modules = [
(./hosts/${hostname}) ./hosts/${hostname}
{ {
networking.hostName = hostname; networking.hostName = hostname;

View file

@ -5,7 +5,6 @@
nixos-unstable, nixos-unstable,
... ...
}: { }: {
#nixpkgs.overlays = [ overlays.unstable-packages ]; #nixpkgs.overlays = [ overlays.unstable-packages ];
nixpkgs = { nixpkgs = {
# You can add overlays here # You can add overlays here
@ -25,11 +24,8 @@
# }); # });
# }) # })
]; ];
}; };
imports = [ imports = [
# steam and other stuff seems to depend on perl # steam and other stuff seems to depend on perl
#"${modulesPath}/profiles/perlless.nix" #"${modulesPath}/profiles/perlless.nix"

View file

@ -4,13 +4,10 @@
modulesPath, modulesPath,
... ...
}: { }: {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../system_profiles/defaults.nix ../../system_profiles/defaults.nix
../../system_profiles/mini-container.nix ../../system_profiles/mini-container.nix
]; ];
} }

View file

@ -1,6 +1,3 @@
{ {lib, ...}: {
lib,
...
}: {
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
} }

View file

@ -9,7 +9,6 @@
allowUnfree = true; allowUnfree = true;
}; };
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix

View file

@ -1,6 +1,3 @@
{ {lib, ...}: {
lib,
...
}: {
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
} }

View file

@ -1,9 +1,9 @@
{ {
networking.firewall = { networking.firewall = {
enable = false; enable = false;
# Open ports in the firewall. # Open ports in the firewall.
allowedTCPPorts = [8080 10001 10002]; allowedTCPPorts = [8080 10001 10002];
allowedUDPPorts = [8080 10001 10002]; allowedUDPPorts = [8080 10001 10002];
}; };
} }

View file

@ -1,3 +1,3 @@
{pkgs, ...}: { {pkgs, ...}: {
environment.systemPackages = [ pkgs.brave ]; environment.systemPackages = [pkgs.brave];
} }

View file

@ -1,55 +1,67 @@
{ {
services.flatpak = { services.flatpak = {
packages = [ packages = [
{ # flatpak permisssion gui {
# flatpak permisssion gui
origin = "flathub"; origin = "flathub";
appId = "com.github.tchx84.Flatseal"; appId = "com.github.tchx84.Flatseal";
} }
{ # Local chat AI {
# Local chat AI
origin = "flathub"; origin = "flathub";
appId = "io.gpt4all.gpt4all"; appId = "io.gpt4all.gpt4all";
} }
{ # note taking and brain organising {
# note taking and brain organising
origin = "flathub"; origin = "flathub";
appId = "md.obsidian.Obsidian"; appId = "md.obsidian.Obsidian";
} }
{ # remote dekstop {
# remote dekstop
origin = "flathub"; origin = "flathub";
appId = "com.parsecgaming.parsec"; appId = "com.parsecgaming.parsec";
} }
{ # electron media player (youtube and co) {
# electron media player (youtube and co)
origin = "flathub"; origin = "flathub";
appId = "org.js.nuclear.Nuclear"; appId = "org.js.nuclear.Nuclear";
} }
# messenger # messenger
{ # good e2ee, but centralized {
# good e2ee, but centralized
origin = "flathub"; origin = "flathub";
appId = "org.signal.Signal"; appId = "org.signal.Signal";
} }
{ # bad/no e2ee, but centralized :3 {
# bad/no e2ee, but centralized :3
origin = "flathub"; origin = "flathub";
appId = "org.telegram.desktop"; appId = "org.telegram.desktop";
} }
{ # discord, no privacy {
# discord, no privacy
origin = "flathub"; origin = "flathub";
appId = "dev.vencord.Vesktop"; appId = "dev.vencord.Vesktop";
} }
{ # soundboard for chat apps {
# soundboard for chat apps
origin = "flathub"; origin = "flathub";
appId = "io.github.Soundux"; appId = "io.github.Soundux";
} }
# games # games
{ # shooter {
# shooter
origin = "flathub"; origin = "flathub";
appId = "com.etlegacy.ETLegacy"; appId = "com.etlegacy.ETLegacy";
} }
{ # Lego for adults {
# Lego for adults
origin = "flathub"; origin = "flathub";
appId = "com.mojang.Minecraft"; appId = "com.mojang.Minecraft";
} }
{ # Lego for real adults {
# Lego for real adults
origin = "flathub"; origin = "flathub";
appId = "net.minetest.Minetest"; appId = "net.minetest.Minetest";
} }

View file

@ -15,7 +15,8 @@
(nerdfonts.override { (nerdfonts.override {
fonts = [ fonts = [
"FiraCode" "FiraCode"
"DroidSansMono""JetBrainsMono" "DroidSansMono"
"JetBrainsMono"
]; ];
}) })
]; ];

View file

@ -10,7 +10,6 @@ inArgs: let
# This is a function that generates an attribute by calling a function you # This is a function that generates an attribute by calling a function you
# pass to it, with each system as an argument # pass to it, with each system as an argument
forAllSystems = inArgs.nixpkgs.lib.genAttrs systems; forAllSystems = inArgs.nixpkgs.lib.genAttrs systems;
in { in {
# NixOS configuration entrypoint # NixOS configuration entrypoint
# Available through 'nixos-rebuild --flake .#your-hostname' # Available through 'nixos-rebuild --flake .#your-hostname'
@ -18,10 +17,12 @@ in {
crocoite = {stateVersion = "24.05";}; crocoite = {stateVersion = "24.05";};
jitsi = {stateVersion = "24.11";}; jitsi = {stateVersion = "24.11";};
game-luanti = {stateVersion = "25.05"; unstable = true;}; game-luanti = {
stateVersion = "25.05";
unstable = true;
};
}; };
# Your custom packages # Your custom packages
# Accessible through 'nix build', 'nix shell', etc # Accessible through 'nix build', 'nix shell', etc
#packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); #packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});

View file

@ -1,6 +1,5 @@
# This file defines overlays # This file defines overlays
{inArgs, ...}: { {inArgs, ...}: {
# This one brings our custom packages from the 'pkgs' directory # This one brings our custom packages from the 'pkgs' directory
additions = final: _prev: import ../pkgs final.pkgs; additions = final: _prev: import ../pkgs final.pkgs;

View file

@ -9,9 +9,9 @@
nixpkgs.config.allowUnfree = lib.mkDefault true; nixpkgs.config.allowUnfree = lib.mkDefault true;
nix = { nix = {
# https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager, # https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager,
# focused on correctness, usability, and growth # focused on correctness, usability, and growth
# and committed to doing right by its community. # and committed to doing right by its community.
package = lib.mkDefault pkgs.lix; package = lib.mkDefault pkgs.lix;
channel.enable = lib.mkDefault false; channel.enable = lib.mkDefault false;

View file

@ -1,9 +1,6 @@
{ {lib, ...}: {
lib,
...
}: {
boot.isContainer = lib.mkDefault true; boot.isContainer = lib.mkDefault true;
boot.kernel.enable = lib.mkDefault false; boot.kernel.enable = lib.mkDefault false;
imports = [ ./mini.nix ]; imports = [./mini.nix];
} }