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

160
flake.nix
View file

@ -52,64 +52,67 @@
musnix.url = "github:musnix/musnix";
};
outputs = {
self,
nixpkgs-stable,
nixpkgs,
nixpkgs-master,
nur,
home-manager,
...
} @ inputs: let
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
config = {allowUnfree = true;};
overlays = [
overlay-stable
overlay-master
nur.overlays.default
outputs =
{
self,
nixpkgs-stable,
nixpkgs,
nixpkgs-master,
nur,
home-manager,
...
}@inputs:
let
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
config = {
allowUnfree = true;
};
overlays = [
overlay-stable
overlay-master
nur.overlays.default
];
};
genericModules = [
{
nix.registry.nixos.flake = inputs.self;
environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
nix.nixPath = [ "nixpkgs=${nixpkgs.outPath}" ];
}
];
};
genericModules = [
{
nix.registry.nixos.flake = inputs.self;
environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
nix.nixPath = ["nixpkgs=${nixpkgs.outPath}"];
}
];
genericHomeModule = [
{
nix.registry.nixos.flake = inputs.self;
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
}
];
# Overlay definitions
# nixpkgs-unstable
overlay-stable = final: prev: {
stable = import nixpkgs-stable {
genericHomeModule = [
{
nix.registry.nixos.flake = inputs.self;
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
}
];
# Overlay definitions
# nixpkgs-unstable
overlay-stable = final: prev: {
stable = import nixpkgs-stable {
inherit system;
config.allowUnfree = true;
};
};
# nixpkgs-master
overlay-master = final: prev: {
master = import nixpkgs-master {
inherit system;
config.allowUnfree = true;
};
};
in
{
nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
inherit system;
config.allowUnfree = true;
};
};
# nixpkgs-master
overlay-master = final: prev: {
master = import nixpkgs-master {
inherit system;
config.allowUnfree = true;
};
};
in {
nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
inherit system;
inherit pkgs;
specialArgs = {
inherit inputs;
};
modules =
genericModules
++ [
inherit pkgs;
specialArgs = {
inherit inputs;
};
modules = genericModules ++ [
# Import nixos modules here
./hosts/gabbielaptop/configuration.nix
./modules/nh.nix
@ -122,36 +125,35 @@
# inputs.stylix.nixosModules.stylix
# inputs.home-manager.nixosModules.home-manager
# 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; }
];
};
nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem {
inherit system;
inherit pkgs;
modules =
genericModules
++ [
};
nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem {
inherit system;
inherit pkgs;
modules = genericModules ++ [
inputs.disko.nixosModules.disko
inputs.satisfactory-server.nixosModules.satisfactory
./hosts/biggerpi/configuration.nix
./modules/satisfactory-server.nix
];
};
# Standalone home-manager config
homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
inherit inputs;
};
# Import home-manager modules here
modules = [
./home-manager/home.nix
inputs.nvf.homeManagerModules.default
inputs.stylix.homeModules.stylix
inputs.nix-flatpak.homeManagerModules.nix-flatpak
];
# Standalone home-manager config
homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
inherit inputs;
};
# Import home-manager modules here
modules = [
./home-manager/home.nix
inputs.nvf.homeManagerModules.default
inputs.stylix.homeModules.stylix
inputs.nix-flatpak.homeManagerModules.nix-flatpak
];
};
formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-tree;
};
};
}

View file

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

View file

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

View file

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

View file

@ -2,7 +2,8 @@
pkgs,
lib,
...
}: {
}:
{
home.username = "blue";
home.homeDirectory = "/home/blue";
@ -70,7 +71,7 @@
ardour # DAW
gimp3 # GNU Image Manipulation Program, pretty self explanatory
networkmanagerapplet # Tray icon for managing networking
blueman # Tray icon for managing bluetooth
];

View file

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

View file

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

View file

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

View file

@ -1,8 +1,9 @@
{pkgs, ...}: {
programs.obs-studio = {
enable = true;
plugins = with pkgs.obs-studio-plugins; [
obs-pipewire-audio-capture
];
};
{ pkgs, ... }:
{
programs.obs-studio = {
enable = true;
plugins = with pkgs.obs-studio-plugins; [
obs-pipewire-audio-capture
];
};
}

View file

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

View file

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

View file

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

View file

@ -3,7 +3,8 @@
pkgs,
config,
...
}: {
}:
{
imports = [
./hardware-configuration.nix
];
@ -26,9 +27,9 @@
];
};
boot.initrd.kernelModules = ["amdgpu"];
boot.extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
boot.kernelModules = ["v4l2loopback"];
boot.initrd.kernelModules = [ "amdgpu" ];
boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
boot.kernelModules = [ "v4l2loopback" ];
boot.kernelPackages = pkgs.linuxPackages_latest;
networking.hostName = "gabbielaptop"; # Define your hostname.
@ -36,7 +37,7 @@
hardware.graphics = {
enable = 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
networking.networkmanager.enable = true;
@ -72,7 +73,10 @@
};
programs.regreet = {
enable = true;
cageArgs = ["-m" "last"];
cageArgs = [
"-m"
"last"
];
};
# Enable the Hyprland WM functionality for NixOS (xdg portals etc.)

View file

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