repo: fix formatting

This commit is contained in:
Anthony Rodriguez 2024-09-24 15:09:36 +02:00
parent 5ca57843d6
commit 80452cb292
Signed by: nezia
GPG key ID: EE3BE97C040A86CE
32 changed files with 345 additions and 220 deletions

View file

@ -1,5 +1,4 @@
_: _: {
{
imports = [ imports = [
./core.nix ./core.nix
./automount.nix ./automount.nix

View file

@ -14,4 +14,3 @@
}; };
}; };
} }

View file

@ -1,5 +1,4 @@
_: _: {
{
programs.chromium.enable = true; programs.chromium.enable = true;
programs.firefox.enable = true; programs.firefox.enable = true;
} }

View file

@ -3,5 +3,13 @@
{ {
programs.fzf.enable = true; programs.fzf.enable = true;
programs.fastfetch.enable = true; programs.fastfetch.enable = true;
home.packages = with pkgs; [ imhex obsidian proton-pass spotify vesktop wl-clipboard stremio ]; home.packages = with pkgs; [
imhex
obsidian
proton-pass
spotify
vesktop
wl-clipboard
stremio
];
} }

View file

@ -1,5 +1,4 @@
_: _: {
{
imports = [ imports = [
./fish.nix ./fish.nix
./starship.nix ./starship.nix

View file

@ -8,7 +8,7 @@ let
hash = "sha256-shQxlyoauXJACoZWtRUbRMxmm10R8vOigXwjxBhG8ng="; hash = "sha256-shQxlyoauXJACoZWtRUbRMxmm10R8vOigXwjxBhG8ng=";
}; };
in in
{ {
programs.fish = { programs.fish = {
enable = true; enable = true;
interactiveShellInit = '' interactiveShellInit = ''
@ -16,9 +16,15 @@ in
fish_vi_key_bindings # Enable Vi mode fish_vi_key_bindings # Enable Vi mode
fish_config theme choose "Catppuccin Frappe" fish_config theme choose "Catppuccin Frappe"
''; '';
shellAbbrs = { cd = "z"; ngc = "sudo nix-collect-garbage -d"; }; shellAbbrs = {
cd = "z";
ngc = "sudo nix-collect-garbage -d";
};
plugins = [ plugins = [
{ name = "fzf"; src = pkgs.fishPlugins.fzf.src; } {
name = "fzf";
src = pkgs.fishPlugins.fzf.src;
}
]; ];
}; };
@ -35,4 +41,3 @@ in
xdg.configFile."fish/themes/Catppuccin Frappe.theme".source = "${catppuccin-fish}/themes/Catppuccin Frappe.theme"; xdg.configFile."fish/themes/Catppuccin Frappe.theme".source = "${catppuccin-fish}/themes/Catppuccin Frappe.theme";
} }

View file

@ -1,4 +1,5 @@
{ ... }: { { ... }:
{
programs.zoxide = { programs.zoxide = {
enable = true; enable = true;
enableBashIntegration = false; enableBashIntegration = false;

View file

@ -1,5 +1,4 @@
_: _: {
{
imports = [ imports = [
../common ../common
./gaming ./gaming

View file

@ -1,5 +1,4 @@
_: _: {
{
imports = [ imports = [
../common ../common
]; ];

View file

@ -1,5 +1,4 @@
_: _: {
{
imports = [ imports = [
./system ./system
./syncthing ./syncthing

View file

@ -1,10 +1,16 @@
{ config, username, hostname, ... }: {
config,
username,
hostname,
...
}:
let let
homeDir = "/home/${username}"; homeDir = "/home/${username}";
devices = import ./devices.nix; devices = import ./devices.nix;
otherDevices = builtins.removeAttrs devices [hostname]; otherDevices = builtins.removeAttrs devices [ hostname ];
in { in
{
services = { services = {
syncthing = { syncthing = {
enable = true; enable = true;

View file

@ -1,5 +1,9 @@
# TODO: add to sops directly instead of relying on another nix file # TODO: add to sops directly instead of relying on another nix file
{ {
"vamos" = { id = "UO6JWVU-MTLZGVQ-Z3QAFYH-6PW2QR6-SBOVM6P-S6JXR2S-A7VYAU2-RLRXEQY"; }; "vamos" = {
"solaire" = { id = "R5RK7CH-DRFXW4E-ARTPMHN-UMWYQ4O-QK7F3TA-EHVLDK4-DQ6CBT4-XRRWQQM"; }; id = "UO6JWVU-MTLZGVQ-Z3QAFYH-6PW2QR6-SBOVM6P-S6JXR2S-A7VYAU2-RLRXEQY";
};
"solaire" = {
id = "R5RK7CH-DRFXW4E-ARTPMHN-UMWYQ4O-QK7F3TA-EHVLDK4-DQ6CBT4-XRRWQQM";
};
} }

View file

@ -12,7 +12,10 @@
users.users.nezia = { users.users.nezia = {
isNormalUser = true; isNormalUser = true;
description = "Anthony Rodriguez"; description = "Anthony Rodriguez";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = [
"networkmanager"
"wheel"
];
}; };
# automount # automount
@ -25,5 +28,8 @@
system.stateVersion = "24.05"; system.stateVersion = "24.05";
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [
"nix-command"
"flakes"
];
} }

View file

@ -1,5 +1,4 @@
_: _: {
{
imports = [ imports = [
./core.nix ./core.nix

View file

@ -10,7 +10,10 @@
openFirewall = true; openFirewall = true;
}; };
services.printing.drivers = [ pkgs.gutenprint pkgs.hplip ]; services.printing.drivers = [
pkgs.gutenprint
pkgs.hplip
];
hardware.sane.enable = true; # enables support for SANE scanners hardware.sane.enable = true; # enables support for SANE scanners
hardware.sane.extraBackends = [ hardware.sane.extraBackends = [
@ -19,5 +22,8 @@
pkgs.epkowa # Epson pkgs.epkowa # Epson
pkgs.utsushi # other printers pkgs.utsushi # other printers
]; ];
services.udev.packages = [ pkgs.sane-airscan pkgs.utsushi ]; services.udev.packages = [
pkgs.sane-airscan
pkgs.utsushi
];
} }

View file

@ -38,7 +38,7 @@
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.uni-sync}/bin/uni-sync"; ExecStart = "${pkgs.uni-sync}/bin/uni-sync";
}; };
wantedBy = ["multi-user.target"]; wantedBy = [ "multi-user.target" ];
}; };
modules.nvidia.enable = true; modules.nvidia.enable = true;
modules.gaming.enable = true; modules.gaming.enable = true;
@ -46,4 +46,3 @@
stylix.image = ../../wallpapers/lucy-edgerunners-wallpaper.jpg; stylix.image = ../../wallpapers/lucy-edgerunners-wallpaper.jpg;
} }

View file

@ -1,27 +1,43 @@
# 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" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"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-label/NIXROOT"; device = "/dev/disk/by-label/NIXROOT";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-label/NIXBOOT"; device = "/dev/disk/by-label/NIXBOOT";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [
"fmask=0077"
"dmask=0077"
];
}; };
swapDevices = [ ]; swapDevices = [ ];

View file

@ -8,7 +8,6 @@
services.fprintd.enable = true; services.fprintd.enable = true;
services.power-profiles-daemon.enable = true; services.power-profiles-daemon.enable = true;
services.keyd = { services.keyd = {
enable = true; enable = true;
keyboards = { keyboards = {
@ -22,6 +21,5 @@
}; };
}; };
}; };
config.modules.neovim.enable = true; modules.neovim.enable = true;
} }

View file

@ -1,28 +1,49 @@
# 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" "sd_mod" ]; boot.initrd.availableKernelModules = [
boot.initrd.kernelModules = [ "amdgpu" "dm-snapshot" ]; "nvme"
boot.kernelModules = [ "kvm-amd" "cryptd" ]; "xhci_pci"
"thunderbolt"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [
"amdgpu"
"dm-snapshot"
];
boot.kernelModules = [
"kvm-amd"
"cryptd"
];
boot.initrd.luks.devices."crypt".device = "/dev/disk/by-uuid/39d0e0c6-ea32-4ee4-ac76-b28fbff687f8"; boot.initrd.luks.devices."crypt".device = "/dev/disk/by-uuid/39d0e0c6-ea32-4ee4-ac76-b28fbff687f8";
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/4ef04567-9633-45b9-addc-55c3020f45b7"; device = "/dev/disk/by-uuid/4ef04567-9633-45b9-addc-55c3020f45b7";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/C519-2E55"; device = "/dev/disk/by-uuid/C519-2E55";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [
"fmask=0077"
"dmask=0077"
];
}; };
swapDevices = [ ]; swapDevices = [ ];

View file

@ -1,5 +1,4 @@
_: _: {
{
imports = [ imports = [
./docker.nix ./docker.nix
./pipewire.nix ./pipewire.nix

View file

@ -1,8 +1,13 @@
{ config, lib, username, ... }: {
config,
lib,
username,
...
}:
let let
cfg = config.modules.docker; cfg = config.modules.docker;
in in
{ {
options.modules.docker.enable = lib.mkEnableOption "docker module"; options.modules.docker.enable = lib.mkEnableOption "docker module";
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
virtualisation.docker = { virtualisation.docker = {

View file

@ -1,8 +1,13 @@
{ lib, config, pkgs, ... }: {
lib,
config,
pkgs,
...
}:
let let
cfg = config.modules.gaming; cfg = config.modules.gaming;
in in
{ {
options = { options = {
modules.gaming = { modules.gaming = {
enable = lib.mkEnableOption "Enable the gaming module"; enable = lib.mkEnableOption "Enable the gaming module";
@ -30,4 +35,3 @@ in
services.udev.packages = [ pkgs.via ]; services.udev.packages = [ pkgs.via ];
}; };
} }

View file

@ -1,9 +1,15 @@
{ config, lib, pkgs, username, ... }: {
config,
lib,
pkgs,
username,
...
}:
let let
cfg = config.modules.gnome; cfg = config.modules.gnome;
stylixEnabled = config.modules.stylix.enable or false; stylixEnabled = config.modules.stylix.enable or false;
in in
{ {
options = { options = {
modules.gnome = { modules.gnome = {
enable = lib.mkEnableOption "Enable Gnome"; enable = lib.mkEnableOption "Enable Gnome";
@ -23,8 +29,27 @@ in
}; };
}; };
environment.gnome.excludePackages = environment.gnome.excludePackages = (
(with pkgs; [ gnome-console gnome-photos gnome-tour gnome-software iagno hitori atomix gnome-contacts gnome-initial-setup gnome-music gedit cheese tali epiphany geary yelp ]); with pkgs;
[
gnome-console
gnome-photos
gnome-tour
gnome-software
iagno
hitori
atomix
gnome-contacts
gnome-initial-setup
gnome-music
gedit
cheese
tali
epiphany
geary
yelp
]
);
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gnome-tweaks gnome-tweaks
@ -67,12 +92,31 @@ in
enable-hot-corners = false; enable-hot-corners = false;
}; };
"org/gnome/desktop/search-providers" = { "org/gnome/desktop/search-providers" = {
disabled=["org.gnome.Terminal.desktop" "org.gnome.Software.desktop" "org.gnome.seahorse.Application.desktop" "org.gnome.clocks.desktop" "org.gnome.Characters.desktop" "org.gnome.Calendar.desktop" "org.gnome.Calculator.desktop"]; disabled = [
"org.gnome.Terminal.desktop"
"org.gnome.Software.desktop"
"org.gnome.seahorse.Application.desktop"
"org.gnome.clocks.desktop"
"org.gnome.Characters.desktop"
"org.gnome.Calendar.desktop"
"org.gnome.Calculator.desktop"
];
enabled = ["org.gnome.Nautilus.desktop" "org.gnome.Settings.desktop"]; enabled = [
"org.gnome.Nautilus.desktop"
"org.gnome.Settings.desktop"
];
}; };
"org/freedesktop/tracker/mine/files" = { "org/freedesktop/tracker/mine/files" = {
index-recursive-directories=["&DESKTOP" "&DOCUMENTS" "&MUSIC" "&PICTURES" "&VIDEOS" "/home/${username}/Notes" "/home/${username}/Projects"]; index-recursive-directories = [
"&DESKTOP"
"&DOCUMENTS"
"&MUSIC"
"&PICTURES"
"&VIDEOS"
"/home/${username}/Notes"
"/home/${username}/Projects"
];
}; };
}; };

View file

@ -2,14 +2,14 @@
let let
cfg = config.modules.nvidia; cfg = config.modules.nvidia;
in in
{ {
options = { options = {
modules.nvidia = { modules.nvidia = {
enable = lib.mkEnableOption "Enable the Nvidia module"; enable = lib.mkEnableOption "Enable the Nvidia module";
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia = { hardware.nvidia = {
# Modesetting is required. # Modesetting is required.

View file

@ -3,7 +3,7 @@
let let
cfg = config.modules.pipewire; cfg = config.modules.pipewire;
in in
{ {
options.modules.pipewire.enable = lib.mkEnableOption "pipewire module"; options.modules.pipewire.enable = lib.mkEnableOption "pipewire module";
options.modules.pipewire.latencyFix.enable = lib.mkEnableOption "enable latency fixes"; options.modules.pipewire.latencyFix.enable = lib.mkEnableOption "enable latency fixes";
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {

View file

@ -1,8 +1,13 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.modules.stylix; cfg = config.modules.stylix;
in in
{ {
options = { options = {
modules.stylix = { modules.stylix = {
enable = lib.mkEnableOption "Enable the stylix module"; enable = lib.mkEnableOption "Enable the stylix module";

View file

@ -1,6 +1,12 @@
{ config, lib, inputs, username, ... }: {
config,
lib,
inputs,
username,
...
}:
let let
cfg = config.modules.wezterm; cfg = config.modules.wezterm;
in in
{ {
options = { options = {