noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2024-11-22 19:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

setup more default.nix

Browse Source
This commit is contained in:
Noah Masur 2022-04-30 12:32:00 -04:00
parent 9d7307d16d
commit 0685a90aa3
10 changed files with 127 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
flake.nix
View File

@ -41,18 +41,10 @@
./nixos/hardware-configuration.nix
./nixos/configuration.nix
./nixos/home.nix
./modules/desktop/xorg.nix
./modules/desktop/i3.nix
./modules/desktop/fonts.nix
./modules/hardware/boot.nix
./modules/hardware/mouse.nix
./modules/hardware/keyboard.nix
./modules/hardware/monitors.nix
./modules/hardware/audio.nix
./modules/hardware/networking.nix
./modules/system/timezone.nix
./modules/system/doas.nix
./modules/system/user.nix
./modules/desktop
./modules/hardware
./modules/system
./modules/shell
./modules/gaming
./modules/services/keybase.nix
./modules/applications/firefox.nix
@ -60,10 +52,6 @@
./modules/applications/media.nix
./modules/applications/1password.nix
./modules/applications/discord.nix
./modules/shell/fish.nix
./modules/shell/utilities.nix
./modules/shell/git.nix
./modules/shell/github.nix
./modules/editor/neovim.nix
];
};

5
modules/desktop/default.nix Normal file
View File

@ -0,0 +1,5 @@
{ ... }: {
imports = [ ./xorg.nix ./fonts.nix ./i3.nix ];
}

6
modules/desktop/fonts.nix
View File

@ -1,4 +1,6 @@
{ pkgs, gui, ... }: {
{ pkgs, lib, gui, ... }: {
config = lib.mkIf gui.enable {
fonts.fonts = with pkgs;
[
@ -7,4 +9,6 @@
];
fonts.fontconfig.defaultFonts.monospace = [ gui.font.name ];
};
}

7
modules/desktop/xorg.nix
View File

@ -1,4 +1,6 @@
{ config, pkgs, identity, gui, ... }: {
{ config, pkgs, lib, identity, gui, ... }: {
config = lib.mkIf gui.enable {
# Enable the X11 windowing system.
services.xserver = {
@ -30,5 +32,6 @@
pbpaste = "xclip -selection clipboard -out";
};
}
};
}

4
modules/hardware/audio.nix
View File

@ -1,5 +1,6 @@
{ pkgs, ... }: {
{ pkgs, lib, gui, ... }: {
config = lib.mkIf gui.enable {
sound.enable = true;
hardware.pulseaudio.enable = true;
@ -7,5 +8,6 @@
[
pamixer # Audio control
];
};
}

12
modules/hardware/default.nix Normal file
View File

@ -0,0 +1,12 @@
{ lib, gui, ... }: {
imports = [
./audio.nix
./boot.nix
./keyboard.nix
./monitors.nix
./mouse.nix
./networking.nix
];
}

6
modules/hardware/monitors.nix
View File

@ -1,8 +1,10 @@
{ pkgs, identity, ... }: {
{ pkgs, lib, gui, identity, ... }: {
# Timezone required for Redshift schedule
imports = [ ../system/timezone.nix ];
config = lib.mkIf gui.enable {
environment.systemPackages = with pkgs;
[
ddcutil # Monitor brightness control
@ -46,4 +48,6 @@
'';
};
};
}

6
modules/hardware/mouse.nix
View File

@ -1,4 +1,6 @@
{ pkgs, ... }: {
{ pkgs, lib, gui, ... }: {
config = lib.mkIf gui.enable {
# Mouse config
services.ratbagd.enable = true;
@ -14,4 +16,6 @@
accelSpeed = "1.15";
};
};
}

2
modules/shell/default.nix
View File

@ -1 +1 @@
{ ... }: { imports = [ ./fish.nix ]; }
{ ... }: { imports = [ ./fish.nix ./git.nix ./github.nix ./utilities.nix ]; }

5
modules/system/default.nix Normal file
View File

@ -0,0 +1,5 @@
{ ... }: {
imports = [ ./user.nix ./timezone.nix ./doas.nix ];
}