fix: auto formatter
This commit is contained in:
parent
59f507bc06
commit
7724f8cc5f
14 changed files with 47 additions and 52 deletions
|
@ -1,5 +1,4 @@
|
||||||
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
|
||||||
|
@ -8,7 +7,7 @@ in
|
||||||
nixosSystem {
|
nixosSystem {
|
||||||
specialArgs = {inherit inArgs;};
|
specialArgs = {inherit inArgs;};
|
||||||
modules = [
|
modules = [
|
||||||
(./hosts/${hostname})
|
./hosts/${hostname}
|
||||||
{
|
{
|
||||||
networking.hostName = hostname;
|
networking.hostName = hostname;
|
||||||
|
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
{
|
{lib, ...}: {
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
{
|
{lib, ...}: {
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
environment.systemPackages = [ pkgs.brave ];
|
environment.systemPackages = [pkgs.brave];
|
||||||
}
|
}
|
||||||
|
|
|
@ -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";
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,8 @@
|
||||||
(nerdfonts.override {
|
(nerdfonts.override {
|
||||||
fonts = [
|
fonts = [
|
||||||
"FiraCode"
|
"FiraCode"
|
||||||
"DroidSansMono""JetBrainsMono"
|
"DroidSansMono"
|
||||||
|
"JetBrainsMono"
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
|
@ -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,9 +17,11 @@ 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
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -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];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue