diff --git a/hostHelper.nix b/hostHelper.nix index 24d9342..3602016 100644 --- a/hostHelper.nix +++ b/hostHelper.nix @@ -1,14 +1,13 @@ -inArgs: hostname: hostOptions: -let +inArgs: hostname: hostOptions: let nixosSystem = if (hostOptions ? unstable && hostOptions.unstable) - then inArgs.nixos-unstable.lib.nixosSystem - else inArgs.nixpkgs.lib.nixosSystem; + then inArgs.nixos-unstable.lib.nixosSystem + else inArgs.nixpkgs.lib.nixosSystem; in nixosSystem { specialArgs = {inherit inArgs;}; modules = [ - (./hosts/${hostname}) + ./hosts/${hostname} { networking.hostName = hostname; diff --git a/hosts/crocoite/default.nix b/hosts/crocoite/default.nix index 0859c5d..2b546da 100644 --- a/hosts/crocoite/default.nix +++ b/hosts/crocoite/default.nix @@ -5,7 +5,6 @@ nixos-unstable, ... }: { - #nixpkgs.overlays = [ overlays.unstable-packages ]; nixpkgs = { # You can add overlays here @@ -25,11 +24,8 @@ # }); # }) ]; - }; - - imports = [ # steam and other stuff seems to depend on perl #"${modulesPath}/profiles/perlless.nix" @@ -57,7 +53,7 @@ ../../modules/wm_and_de ../../modules/pkg_mgrmnt - + ../../system_profiles/defaults.nix # ../../tests ]; diff --git a/hosts/game-luanti/default.nix b/hosts/game-luanti/default.nix index 234c358..9072876 100644 --- a/hosts/game-luanti/default.nix +++ b/hosts/game-luanti/default.nix @@ -4,13 +4,10 @@ modulesPath, ... }: { - - imports = [ ./hardware-configuration.nix ../../system_profiles/defaults.nix ../../system_profiles/mini-container.nix - ]; } diff --git a/hosts/game-luanti/hardware-configuration.nix b/hosts/game-luanti/hardware-configuration.nix index 1a421a1..f8c86aa 100644 --- a/hosts/game-luanti/hardware-configuration.nix +++ b/hosts/game-luanti/hardware-configuration.nix @@ -1,6 +1,3 @@ -{ - lib, - ... -}: { +{lib, ...}: { nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/hosts/jitsi/default.nix b/hosts/jitsi/default.nix index f76da0b..1893723 100644 --- a/hosts/jitsi/default.nix +++ b/hosts/jitsi/default.nix @@ -9,7 +9,6 @@ allowUnfree = true; }; - imports = [ ./hardware-configuration.nix diff --git a/hosts/jitsi/hardware-configuration.nix b/hosts/jitsi/hardware-configuration.nix index 1a421a1..f8c86aa 100644 --- a/hosts/jitsi/hardware-configuration.nix +++ b/hosts/jitsi/hardware-configuration.nix @@ -1,6 +1,3 @@ -{ - lib, - ... -}: { +{lib, ...}: { nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/modules/firewall.nix b/modules/firewall.nix index cc4dba0..f8cb4bb 100644 --- a/modules/firewall.nix +++ b/modules/firewall.nix @@ -1,9 +1,9 @@ { networking.firewall = { - enable = false; + enable = false; - # Open ports in the firewall. - allowedTCPPorts = [8080 10001 10002]; - allowedUDPPorts = [8080 10001 10002]; + # Open ports in the firewall. + allowedTCPPorts = [8080 10001 10002]; + allowedUDPPorts = [8080 10001 10002]; }; } diff --git a/modules/software/browser/brave.nix b/modules/software/browser/brave.nix index 331b055..751639f 100644 --- a/modules/software/browser/brave.nix +++ b/modules/software/browser/brave.nix @@ -1,3 +1,3 @@ {pkgs, ...}: { - environment.systemPackages = [ pkgs.brave ]; + environment.systemPackages = [pkgs.brave]; } diff --git a/modules/software/flatpak.nix b/modules/software/flatpak.nix index f7df487..830250e 100644 --- a/modules/software/flatpak.nix +++ b/modules/software/flatpak.nix @@ -1,55 +1,67 @@ { services.flatpak = { packages = [ - { # flatpak permisssion gui + { + # flatpak permisssion gui origin = "flathub"; appId = "com.github.tchx84.Flatseal"; } - { # Local chat AI + { + # Local chat AI origin = "flathub"; appId = "io.gpt4all.gpt4all"; } - { # note taking and brain organising + { + # note taking and brain organising origin = "flathub"; appId = "md.obsidian.Obsidian"; } - { # remote dekstop + { + # remote dekstop origin = "flathub"; appId = "com.parsecgaming.parsec"; } - { # electron media player (youtube and co) + { + # electron media player (youtube and co) origin = "flathub"; appId = "org.js.nuclear.Nuclear"; } # messenger - { # good e2ee, but centralized + { + # good e2ee, but centralized origin = "flathub"; appId = "org.signal.Signal"; } - { # bad/no e2ee, but centralized :3 + { + # bad/no e2ee, but centralized :3 origin = "flathub"; appId = "org.telegram.desktop"; } - { # discord, no privacy + { + # discord, no privacy origin = "flathub"; appId = "dev.vencord.Vesktop"; } - { # soundboard for chat apps + { + # soundboard for chat apps origin = "flathub"; appId = "io.github.Soundux"; } # games - { # shooter + { + # shooter origin = "flathub"; appId = "com.etlegacy.ETLegacy"; } - { # Lego for adults + { + # Lego for adults origin = "flathub"; appId = "com.mojang.Minecraft"; } - { # Lego for real adults + { + # Lego for real adults origin = "flathub"; appId = "net.minetest.Minetest"; } diff --git a/modules/software/fonts.nix b/modules/software/fonts.nix index 5b7fcad..1d1c26e 100644 --- a/modules/software/fonts.nix +++ b/modules/software/fonts.nix @@ -15,7 +15,8 @@ (nerdfonts.override { fonts = [ "FiraCode" - "DroidSansMono""JetBrainsMono" + "DroidSansMono" + "JetBrainsMono" ]; }) ]; diff --git a/outputs.nix b/outputs.nix index 4fce707..aab3468 100644 --- a/outputs.nix +++ b/outputs.nix @@ -10,7 +10,6 @@ inArgs: let # This is a function that generates an attribute by calling a function you # pass to it, with each system as an argument forAllSystems = inArgs.nixpkgs.lib.genAttrs systems; - in { # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' @@ -18,10 +17,12 @@ in { crocoite = {stateVersion = "24.05";}; jitsi = {stateVersion = "24.11";}; - game-luanti = {stateVersion = "25.05"; unstable = true;}; + game-luanti = { + stateVersion = "25.05"; + unstable = true; + }; }; - # Your custom packages # Accessible through 'nix build', 'nix shell', etc #packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); diff --git a/overlays/default.nix b/overlays/default.nix index 1246d25..b650538 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,5 @@ # This file defines overlays {inArgs, ...}: { - # This one brings our custom packages from the 'pkgs' directory additions = final: _prev: import ../pkgs final.pkgs; diff --git a/system_profiles/defaults.nix b/system_profiles/defaults.nix index 51652c0..8fb3c00 100644 --- a/system_profiles/defaults.nix +++ b/system_profiles/defaults.nix @@ -9,9 +9,9 @@ nixpkgs.config.allowUnfree = lib.mkDefault true; nix = { - # https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager, - # focused on correctness, usability, and growth – - # and committed to doing right by its community. + # https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager, + # focused on correctness, usability, and growth – + # and committed to doing right by its community. package = lib.mkDefault pkgs.lix; channel.enable = lib.mkDefault false; diff --git a/system_profiles/mini-container.nix b/system_profiles/mini-container.nix index 958d0e8..ce05d95 100644 --- a/system_profiles/mini-container.nix +++ b/system_profiles/mini-container.nix @@ -1,9 +1,6 @@ -{ - lib, - ... -}: { +{lib, ...}: { boot.isContainer = lib.mkDefault true; boot.kernel.enable = lib.mkDefault false; - imports = [ ./mini.nix ]; + imports = [./mini.nix]; }