added nixfmt-tree as formatter

also ran it, which is why so many files were modified
This commit is contained in:
Gabriella Bere 2025-06-03 16:10:04 +01:00
parent e8487933ec
commit f482d6f06b
14 changed files with 125 additions and 108 deletions

View file

@ -52,7 +52,8 @@
musnix.url = "github:musnix/musnix"; musnix.url = "github:musnix/musnix";
}; };
outputs = { outputs =
{
self, self,
nixpkgs-stable, nixpkgs-stable,
nixpkgs, nixpkgs,
@ -60,11 +61,14 @@
nur, nur,
home-manager, home-manager,
... ...
} @ inputs: let }@inputs:
let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config = {allowUnfree = true;}; config = {
allowUnfree = true;
};
overlays = [ overlays = [
overlay-stable overlay-stable
overlay-master overlay-master
@ -75,7 +79,7 @@
{ {
nix.registry.nixos.flake = inputs.self; nix.registry.nixos.flake = inputs.self;
environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath; environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
nix.nixPath = ["nixpkgs=${nixpkgs.outPath}"]; nix.nixPath = [ "nixpkgs=${nixpkgs.outPath}" ];
} }
]; ];
genericHomeModule = [ genericHomeModule = [
@ -100,16 +104,15 @@
config.allowUnfree = true; config.allowUnfree = true;
}; };
}; };
in { in
{
nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem { nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
inherit pkgs; inherit pkgs;
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
}; };
modules = modules = genericModules ++ [
genericModules
++ [
# Import nixos modules here # Import nixos modules here
./hosts/gabbielaptop/configuration.nix ./hosts/gabbielaptop/configuration.nix
./modules/nh.nix ./modules/nh.nix
@ -122,16 +125,14 @@
# inputs.stylix.nixosModules.stylix # inputs.stylix.nixosModules.stylix
# inputs.home-manager.nixosModules.home-manager # inputs.home-manager.nixosModules.home-manager
# inputs.nixvim.homeManagerModules.nixvim # inputs.nixvim.homeManagerModules.nixvim
{nix.settings = inputs.aagl.nixConfig;} # Setup cachix for aagl projects { nix.settings = inputs.aagl.nixConfig; } # Setup cachix for aagl projects
# { home-manager.users.blue = ./home-manager/home.nix; } # { home-manager.users.blue = ./home-manager/home.nix; }
]; ];
}; };
nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem { nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
inherit pkgs; inherit pkgs;
modules = modules = genericModules ++ [
genericModules
++ [
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
inputs.satisfactory-server.nixosModules.satisfactory inputs.satisfactory-server.nixosModules.satisfactory
./hosts/biggerpi/configuration.nix ./hosts/biggerpi/configuration.nix
@ -153,5 +154,6 @@
inputs.nix-flatpak.homeManagerModules.nix-flatpak inputs.nix-flatpak.homeManagerModules.nix-flatpak
]; ];
}; };
formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-tree;
}; };
} }

View file

@ -1,4 +1,5 @@
{config, ...}: { { ... }:
{
programs.direnv = { programs.direnv = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
programs.eza = { programs.eza = {
enable = true; enable = true;

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
programs.floorp = { programs.floorp = {
enable = true; enable = true;
profiles.blue = { profiles.blue = {

View file

@ -2,7 +2,8 @@
pkgs, pkgs,
lib, lib,
... ...
}: { }:
{
home.username = "blue"; home.username = "blue";
home.homeDirectory = "/home/blue"; home.homeDirectory = "/home/blue";

View file

@ -1,9 +1,10 @@
{...}: { { ... }:
{
# Enable Hyprland compositor # Enable Hyprland compositor
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
xwayland.enable = true; xwayland.enable = true;
systemd.variables = ["--all"]; systemd.variables = [ "--all" ];
settings = { settings = {
misc = { misc = {
enable_anr_dialog = false; enable_anr_dialog = false;

View file

@ -1,4 +1,5 @@
{pkgs, lib, ... }: { { pkgs, lib, ... }:
{
programs.hyprlock = { programs.hyprlock = {
enable = true; enable = true;
settings = { settings = {

View file

@ -2,7 +2,8 @@
config, config,
pkgs, pkgs,
... ...
}: { }:
{
programs.nvf = { programs.nvf = {
enable = true; enable = true;
settings = { settings = {

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
programs.obs-studio = { programs.obs-studio = {
enable = true; enable = true;
plugins = with pkgs.obs-studio-plugins; [ plugins = with pkgs.obs-studio-plugins; [

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
stylix = { stylix = {
enable = true; enable = true;
base16Scheme = "${pkgs.base16-schemes}/share/themes/heetch.yaml"; base16Scheme = "${pkgs.base16-schemes}/share/themes/heetch.yaml";
@ -31,7 +32,7 @@
}; };
polarity = "dark"; polarity = "dark";
targets = { targets = {
floorp.profileNames = ["blue"]; floorp.profileNames = [ "blue" ];
}; };
}; };
} }

View file

@ -1,4 +1,5 @@
{config, ...}: { { config, ... }:
{
programs.waybar = { programs.waybar = {
enable = true; enable = true;
systemd.enable = true; # using these instead of exec-once beacuse SOME packages (swaync) dont let you disable them systemd.enable = true; # using these instead of exec-once beacuse SOME packages (swaync) dont let you disable them
@ -7,7 +8,7 @@
layer = "top"; layer = "top";
position = "top"; position = "top";
height = 30; height = 30;
modules-left = ["hyprland/workspaces"]; modules-left = [ "hyprland/workspaces" ];
modules-center = [ modules-center = [
"clock" "clock"
"custom/swaync" "custom/swaync"

View file

@ -1,4 +1,5 @@
{...}: { { ... }:
{
programs.zellij = { programs.zellij = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;

View file

@ -3,7 +3,8 @@
pkgs, pkgs,
config, config,
... ...
}: { }:
{
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
@ -26,9 +27,9 @@
]; ];
}; };
boot.initrd.kernelModules = ["amdgpu"]; boot.initrd.kernelModules = [ "amdgpu" ];
boot.extraModulePackages = [config.boot.kernelPackages.v4l2loopback]; boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
boot.kernelModules = ["v4l2loopback"]; boot.kernelModules = [ "v4l2loopback" ];
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
networking.hostName = "gabbielaptop"; # Define your hostname. networking.hostName = "gabbielaptop"; # Define your hostname.
@ -36,7 +37,7 @@
hardware.graphics = { hardware.graphics = {
enable = true; enable = true;
enable32Bit = true; enable32Bit = true;
extraPackages = [pkgs.stable.rocmPackages.clr.icd]; # Needed for davinci-resolve to utilize the gpu, otherwise it refuses to launch extraPackages = [ pkgs.stable.rocmPackages.clr.icd ]; # Needed for davinci-resolve to utilize the gpu, otherwise it refuses to launch
}; };
# Enable networking # Enable networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
@ -72,7 +73,10 @@
}; };
programs.regreet = { programs.regreet = {
enable = true; enable = true;
cageArgs = ["-m" "last"]; cageArgs = [
"-m"
"last"
];
}; };
# Enable the Hyprland WM functionality for NixOS (xdg portals etc.) # Enable the Hyprland WM functionality for NixOS (xdg portals etc.)

View file

@ -1,12 +1,13 @@
{ {
pkgs, pkgs,
... ...
}: { }:
{
# All system packages required from nixos-unstable by default # All system packages required from nixos-unstable by default
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wineWowPackages.stable wineWowPackages.stable
wine wine
(wine.override {wineBuild = "wine64";}) (wine.override { wineBuild = "wine64"; })
wine64 wine64
wineWowPackages.staging wineWowPackages.staging
winetricks winetricks