formatted everything with nixfmt

This commit is contained in:
Gabriella Bere 2024-10-23 21:59:06 +01:00
parent 3675fbdcc1
commit b42a379322
20 changed files with 343 additions and 240 deletions

View file

@ -44,7 +44,14 @@
musnix.url = "github:musnix/musnix";
};
outputs = { self, nixpkgs, stablepkgs, home-manager, ... } @ inputs:
outputs =
{
self,
nixpkgs,
stablepkgs,
home-manager,
...
}@inputs:
let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
@ -53,7 +60,9 @@
{
nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = { inherit inputs; };
specialArgs = {
inherit inputs;
};
modules = [
# Import nixos modules here
./hosts/gabbielaptop/configuration.nix
@ -84,7 +93,9 @@
# Standalone home-manager config
homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = { inherit inputs; };
extraSpecialArgs = {
inherit inputs;
};
# Import home-manager modules here
modules = [
./home-manager/home.nix

View file

@ -1,3 +1,4 @@
{config, ... }:{
{ config, ... }:
{
programs.git.enable = true;
}

View file

@ -1,4 +1,10 @@
{ config, pkgs, lib, inputs, ... }:
{
config,
pkgs,
lib,
inputs,
...
}:
{
home.username = "blue";

View file

@ -10,8 +10,7 @@
systemd.enable = true;
settings = {
# Monitor config for home desk layout
monitor =
[
monitor = [
"eDP-2, 2560x1600@165, 0x0, auto" # main laptop monitor
"DP-2, 1920x1080@119.98, -960x-1080, auto" # left external monitor
"DP-3, 1920x1080@119.98, 960x-1080, auto" # right external monitor
@ -39,8 +38,7 @@
];
# Declare all keybinds
bind =
[
bind = [
# Keybinds for starting programs
"$mod, F, exec, firefox"
"$mod, 1, exec, alacritty"

View file

@ -1,4 +1,9 @@
{ config, pkgs, stablepkgs, ... }:
{
config,
pkgs,
stablepkgs,
...
}:
{
programs.librewolf = {
enable = true;

View file

@ -1,4 +1,5 @@
{ config, pkgs, ... }: {
{ config, pkgs, ... }:
{
services.nextcloud-client = {
enable = true;
startInBackground = true;

View file

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

View file

@ -1,4 +1,5 @@
{ config, ... }: {
{ config, ... }:
{
stylix = {
enable = true;
# base16Scheme = "${pkgs.base16-schemes}/share/themes/icy.yaml";

View file

@ -1,4 +1,10 @@
{ config, pkgs, lib, inputs, ... }:
{
config,
pkgs,
lib,
inputs,
...
}:
{
programs.waybar = {
enable = true;
@ -14,8 +20,16 @@
"DP-3"
];
modules-left = [ "wlr/taskbar" ];
modules-center = [ "clock" "custom/swaync" ];
modules-right = [ "pulseaudio/slider" "backlight/slider" "battery" "tray" ];
modules-center = [
"clock"
"custom/swaync"
];
modules-right = [
"pulseaudio/slider"
"backlight/slider"
"battery"
"tray"
];
"clock" = {
"format" = "{:%A %d %b %T}";
# "tooltip" = true;

View file

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
{
programs.zsh = {

View file

@ -2,17 +2,25 @@
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
{
imports =
[ # Include the results of the hardware scan.
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
./disk-config.nix
];
# Enable flakes
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
nixpkgs.config.allowUnfree = true;
@ -89,4 +97,3 @@
system.stateVersion = "24.05"; # Did you read the comment?
}

View file

@ -1,14 +1,26 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];

View file

@ -2,12 +2,17 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, lib, pkgs, inputs, ... }:
{
config,
lib,
pkgs,
inputs,
...
}:
{
imports =
[
imports = [
./hardware-configuration.nix
];
@ -25,7 +30,10 @@
};
};
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
# default kernel causes issues with wpa_supplicant meaning shutdown times are > 10 mins updating to kernel 69+ fixes this
# boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen;
@ -119,7 +127,6 @@
musnix.enable = true;
# pam.services = [
# { name = "gnome_keyring"
# text = ''
@ -133,13 +140,21 @@
services.gnome.gnome-keyring.enable = true;
nix.settings.trusted-users = [ "root" "blue" ];
nix.settings.trusted-users = [
"root"
"blue"
];
programs.zsh.enable = true;
users.users.blue = {
isNormalUser = true;
description = "Gabriella Bere";
extraGroups = [ "networkmanager" "wheel" "dialout" "audio" ];
extraGroups = [
"networkmanager"
"wheel"
"dialout"
"audio"
];
shell = pkgs.zsh;
};

View file

@ -1,31 +1,47 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"thunderbolt"
"usb_storage"
"usbhid"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/c5c7a251-2bd1-4c10-99fa-17069bc66161";
fileSystems."/" = {
device = "/dev/disk/by-uuid/c5c7a251-2bd1-4c10-99fa-17069bc66161";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/3650-CF80";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/3650-CF80";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
options = [
"fmask=0077"
"dmask=0077"
];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/7b70ea86-8c19-4089-ac1c-0fdcf24bfa8e";
fileSystems."/home" = {
device = "/dev/disk/by-uuid/7b70ea86-8c19-4089-ac1c-0fdcf24bfa8e";
fsType = "ext4";
};

View file

@ -1,3 +1,4 @@
{config, ... }: {
{ config, ... }:
{
programs.honkers-railway-launcher.enable = true;
}

View file

@ -1,4 +1,11 @@
{ config, lib, pkgs, stablepkgs, ... }: {
{
config,
lib,
pkgs,
stablepkgs,
...
}:
{
# All packaged needed from nixos-unstable
environment.systemPackages =
(with pkgs; [

View file

@ -1,4 +1,5 @@
{ config, pkgs, ... }: {
{ config, pkgs, ... }:
{
services.satisfactory = {
enable = true;

View file

@ -1,4 +1,5 @@
{ config, ... }: {
{ config, ... }:
{
stylix = {
enable = true;
# base16Scheme = "${pkgs.base16-schemes}/share/themes/icy.yaml";