formatted everything with nixfmt
This commit is contained in:
parent
3675fbdcc1
commit
b42a379322
20 changed files with 343 additions and 240 deletions
17
flake.nix
17
flake.nix
|
@ -44,7 +44,14 @@
|
||||||
musnix.url = "github:musnix/musnix";
|
musnix.url = "github:musnix/musnix";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, stablepkgs, home-manager, ... } @ inputs:
|
outputs =
|
||||||
|
{
|
||||||
|
self,
|
||||||
|
nixpkgs,
|
||||||
|
stablepkgs,
|
||||||
|
home-manager,
|
||||||
|
...
|
||||||
|
}@inputs:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
|
@ -53,7 +60,9 @@
|
||||||
{
|
{
|
||||||
nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
specialArgs = { inherit inputs; };
|
specialArgs = {
|
||||||
|
inherit inputs;
|
||||||
|
};
|
||||||
modules = [
|
modules = [
|
||||||
# Import nixos modules here
|
# Import nixos modules here
|
||||||
./hosts/gabbielaptop/configuration.nix
|
./hosts/gabbielaptop/configuration.nix
|
||||||
|
@ -84,7 +93,9 @@
|
||||||
# Standalone home-manager config
|
# Standalone home-manager config
|
||||||
homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
|
homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
extraSpecialArgs = { inherit inputs; };
|
extraSpecialArgs = {
|
||||||
|
inherit inputs;
|
||||||
|
};
|
||||||
# Import home-manager modules here
|
# Import home-manager modules here
|
||||||
modules = [
|
modules = [
|
||||||
./home-manager/home.nix
|
./home-manager/home.nix
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
{config, ... }:{
|
{ config, ... }:
|
||||||
|
{
|
||||||
programs.git.enable = true;
|
programs.git.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,10 @@
|
||||||
{ config, pkgs, lib, inputs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
home.username = "blue";
|
home.username = "blue";
|
||||||
|
|
|
@ -10,8 +10,7 @@
|
||||||
systemd.enable = true;
|
systemd.enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
# Monitor config for home desk layout
|
# Monitor config for home desk layout
|
||||||
monitor =
|
monitor = [
|
||||||
[
|
|
||||||
"eDP-2, 2560x1600@165, 0x0, auto" # main laptop monitor
|
"eDP-2, 2560x1600@165, 0x0, auto" # main laptop monitor
|
||||||
"DP-2, 1920x1080@119.98, -960x-1080, auto" # left external monitor
|
"DP-2, 1920x1080@119.98, -960x-1080, auto" # left external monitor
|
||||||
"DP-3, 1920x1080@119.98, 960x-1080, auto" # right external monitor
|
"DP-3, 1920x1080@119.98, 960x-1080, auto" # right external monitor
|
||||||
|
@ -39,8 +38,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
# Declare all keybinds
|
# Declare all keybinds
|
||||||
bind =
|
bind = [
|
||||||
[
|
|
||||||
# Keybinds for starting programs
|
# Keybinds for starting programs
|
||||||
"$mod, F, exec, firefox"
|
"$mod, F, exec, firefox"
|
||||||
"$mod, 1, exec, alacritty"
|
"$mod, 1, exec, alacritty"
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
{ config, pkgs, stablepkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
stablepkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
{
|
{
|
||||||
programs.librewolf = {
|
programs.librewolf = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{ config, pkgs, ... }: {
|
{ config, pkgs, ... }:
|
||||||
|
{
|
||||||
services.nextcloud-client = {
|
services.nextcloud-client = {
|
||||||
enable = true;
|
enable = true;
|
||||||
startInBackground = true;
|
startInBackground = true;
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{config, pkgs, ... }: {
|
{ config, pkgs, ... }:
|
||||||
|
{
|
||||||
programs.nixvim = {
|
programs.nixvim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{ config, ... }: {
|
{ config, ... }:
|
||||||
|
{
|
||||||
stylix = {
|
stylix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# base16Scheme = "${pkgs.base16-schemes}/share/themes/icy.yaml";
|
# base16Scheme = "${pkgs.base16-schemes}/share/themes/icy.yaml";
|
||||||
|
|
|
@ -1,4 +1,10 @@
|
||||||
{ config, pkgs, lib, inputs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
{
|
{
|
||||||
programs.waybar = {
|
programs.waybar = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -14,8 +20,16 @@
|
||||||
"DP-3"
|
"DP-3"
|
||||||
];
|
];
|
||||||
modules-left = [ "wlr/taskbar" ];
|
modules-left = [ "wlr/taskbar" ];
|
||||||
modules-center = [ "clock" "custom/swaync" ];
|
modules-center = [
|
||||||
modules-right = [ "pulseaudio/slider" "backlight/slider" "battery" "tray" ];
|
"clock"
|
||||||
|
"custom/swaync"
|
||||||
|
];
|
||||||
|
modules-right = [
|
||||||
|
"pulseaudio/slider"
|
||||||
|
"backlight/slider"
|
||||||
|
"battery"
|
||||||
|
"tray"
|
||||||
|
];
|
||||||
"clock" = {
|
"clock" = {
|
||||||
"format" = "{:%A %d %b %T}";
|
"format" = "{:%A %d %b %T}";
|
||||||
# "tooltip" = true;
|
# "tooltip" = true;
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
|
|
|
@ -2,17 +2,25 @@
|
||||||
# your system. Help is available in the configuration.nix(5) man page, on
|
# 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`).
|
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ # Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./disk-config.nix
|
./disk-config.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enable flakes
|
# Enable flakes
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = [
|
||||||
|
"nix-command"
|
||||||
|
"flakes"
|
||||||
|
];
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
|
@ -89,4 +97,3 @@
|
||||||
system.stateVersion = "24.05"; # Did you read the comment?
|
system.stateVersion = "24.05"; # Did you read the comment?
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,26 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
(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.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
|
@ -2,12 +2,17 @@
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
|
|
||||||
{ config, lib, pkgs, inputs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
imports =
|
imports = [
|
||||||
[
|
|
||||||
./hardware-configuration.nix
|
./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
|
# 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;
|
# boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen;
|
||||||
|
@ -119,7 +127,6 @@
|
||||||
|
|
||||||
musnix.enable = true;
|
musnix.enable = true;
|
||||||
|
|
||||||
|
|
||||||
# pam.services = [
|
# pam.services = [
|
||||||
# { name = "gnome_keyring"
|
# { name = "gnome_keyring"
|
||||||
# text = ''
|
# text = ''
|
||||||
|
@ -133,13 +140,21 @@
|
||||||
|
|
||||||
services.gnome.gnome-keyring.enable = true;
|
services.gnome.gnome-keyring.enable = true;
|
||||||
|
|
||||||
nix.settings.trusted-users = [ "root" "blue" ];
|
nix.settings.trusted-users = [
|
||||||
|
"root"
|
||||||
|
"blue"
|
||||||
|
];
|
||||||
|
|
||||||
programs.zsh.enable = true;
|
programs.zsh.enable = true;
|
||||||
users.users.blue = {
|
users.users.blue = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Gabriella Bere";
|
description = "Gabriella Bere";
|
||||||
extraGroups = [ "networkmanager" "wheel" "dialout" "audio" ];
|
extraGroups = [
|
||||||
|
"networkmanager"
|
||||||
|
"wheel"
|
||||||
|
"dialout"
|
||||||
|
"audio"
|
||||||
|
];
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,31 +1,47 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
(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.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-uuid/c5c7a251-2bd1-4c10-99fa-17069bc66161";
|
device = "/dev/disk/by-uuid/c5c7a251-2bd1-4c10-99fa-17069bc66161";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/3650-CF80";
|
device = "/dev/disk/by-uuid/3650-CF80";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
options = [
|
||||||
|
"fmask=0077"
|
||||||
|
"dmask=0077"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/home" =
|
fileSystems."/home" = {
|
||||||
{ device = "/dev/disk/by-uuid/7b70ea86-8c19-4089-ac1c-0fdcf24bfa8e";
|
device = "/dev/disk/by-uuid/7b70ea86-8c19-4089-ac1c-0fdcf24bfa8e";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
{config, ... }: {
|
{ config, ... }:
|
||||||
|
{
|
||||||
programs.honkers-railway-launcher.enable = true;
|
programs.honkers-railway-launcher.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,11 @@
|
||||||
{ config, lib, pkgs, stablepkgs, ... }: {
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
stablepkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
# All packaged needed from nixos-unstable
|
# All packaged needed from nixos-unstable
|
||||||
environment.systemPackages =
|
environment.systemPackages =
|
||||||
(with pkgs; [
|
(with pkgs; [
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{ config, pkgs, ... }: {
|
{ config, pkgs, ... }:
|
||||||
|
{
|
||||||
|
|
||||||
services.satisfactory = {
|
services.satisfactory = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{ config, ... }: {
|
{ config, ... }:
|
||||||
|
{
|
||||||
stylix = {
|
stylix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# base16Scheme = "${pkgs.base16-schemes}/share/themes/icy.yaml";
|
# base16Scheme = "${pkgs.base16-schemes}/share/themes/icy.yaml";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue