gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaned up a whole bunch

Browse source
This commit is contained in:
Gerg-L 2023-05-25 22:58:18 -04:00
parent 2f04dc0e23
commit a959cf3e97
17 changed files with 199 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

30
modules/DE/dwm.nix
View file

@ -5,23 +5,18 @@
lib,
self,
...
}: let
cfg = config.localModules.DE.dwm;
sp = inputs.suckless.packages.${pkgs.system};
in {
options.localModules.DE.dwm = {
enable = lib.mkEnableOption "";
};
}: {
options.localModules.DE.dwm.enable = lib.mkEnableOption "";
config = lib.mkIf cfg.enable {
config = lib.mkIf config.localModules.DE.dwm.enable {
services.gvfs.enable = true;
services.xserver = {
enable = true;
displayManager = {
sessionCommands = ''
${pkgs.feh}/bin/feh --bg-center ${self.packages.${pkgs.system}.images + /recursion.png}
${pkgs.numlockx}/bin/numlockx
${pkgs.picom}/bin/picom &
${lib.getExe pkgs.feh} --bg-center ${self.packages.${pkgs.system}.images + /recursion.png}
${lib.getExe pkgs.numlockx}
${lib.getExe pkgs.picom} &
'';
defaultSession = "none+dwm";
};
@ -48,10 +43,13 @@ in {
'';
};
};
environment.systemPackages = [
sp.dmenu
sp.dwm
sp.st
];
environment.systemPackages = builtins.attrValues {
inherit
(inputs.suckless.packages.${pkgs.system})
dmenu
dwm
st
;
};
};
}

72
modules/DE/gnome.nix
View file

@ -3,40 +3,46 @@
lib,
pkgs,
...
}: let
cfg = config.localModules.DE.gnome;
in {
options.localModules.DE.gnome = {
enable = lib.mkEnableOption "";
};
config = lib.mkIf cfg.enable {
environment.gnome.excludePackages = [
pkgs.gnome-photos
pkgs.gnome-tour
pkgs.gnome-text-editor
pkgs.gnome-online-accounts
}: {
options.localModules.DE.gnome.enable = lib.mkEnableOption "";
config = lib.mkIf config.localModules.DE.gnome.enable {
environment = {
systemPackages = [pkgs.gnome.gnome-calculator];
gnome.excludePackages = builtins.attrValues {
inherit
(pkgs)
gnome-photos
gnome-tour
gnome-text-editor
gnome-online-accounts
;
inherit
(pkgs.gnome)
gnome-weather
gnome-shell
gnome-disk-utility
gnome-maps
gnome-clocks
gnome-remote-desktop
gnome-calendar
gnome-music
simple-scan
cheese # webcam tool
gedit # text editor
epiphany # web browser
geary # email reader
evince # document viewer
gnome-characters
totem # video player
tali # poker game
iagno # go game
hitori # sudoku game
atomix # puzzle game
;
};
};
pkgs.gnome.gnome-weather
pkgs.gnome.gnome-shell
pkgs.gnome.gnome-disk-utility
pkgs.gnome.gnome-maps
pkgs.gnome.gnome-clocks
pkgs.gnome.gnome-remote-desktop
pkgs.gnome.gnome-calendar
pkgs.gnome.gnome-music
pkgs.gnome.simple-scan
pkgs.gnome.cheese # webcam tool
pkgs.gnome.gedit # text editor
pkgs.gnome.epiphany # web browser
pkgs.gnome.geary # email reader
pkgs.gnome.evince # document viewer
pkgs.gnome.gnome-characters
pkgs.gnome.totem # video player
pkgs.gnome.tali # poker game
pkgs.gnome.iagno # go game
pkgs.gnome.hitori # sudoku game
pkgs.gnome.atomix # puzzle game
];
services.xserver = {
enable = true;
desktopManager.gnome.enable = true;

13
modules/DE/xfce.nix
View file

@ -1,14 +1,13 @@
{
config,
lib,
pkgs,
...
}: let
cfg = config.localModules.DE.xfce;
in {
options.localModules.DE.xfce = {
enable = lib.mkEnableOption "";
};
config = lib.mkIf cfg.enable {
}: {
options.localModules.DE.xfce.enable = lib.mkEnableOption "";
config = lib.mkIf config.localModules.DE.xfce.enable {
environment.systemPackages = [pkgs.xfce.xfce4-whiskermenu-plugin];
services.xserver = {
enable = true;
desktopManager.xfce = {

15
modules/DM/autoLogin.nix
View file

@ -2,11 +2,16 @@
config,
lib,
...
}: let
cfg = config.localModules.DM.autoLogin;
in {
options.localModules.DM.autoLogin = lib.mkEnableOption "";
config = lib.mkIf cfg {
}: {
options.localModules.DM = {
autoLogin = lib.mkEnableOption "";
loginUser = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
};
};
config = lib.mkIf config.localModules.DM.autoLogin {
services.xserver.displayManager = {
autoLogin = {
enable = true;

11
modules/DM/lightDM.nix
View file

@ -4,13 +4,10 @@
self,
pkgs,
...
}: let
cfg = config.localModules.DM.lightdm;
in {
options.localModules.DM.lightdm = {
enable = lib.mkEnableOption "";
};
config = lib.mkIf cfg.enable {
}: {
options.localModules.DM.lightdm.enable = lib.mkEnableOption "";
config = lib.mkIf config.localModules.DM.lightdm.enable {
services.xserver = {
displayManager = {
lightdm = {

6
modules/DM/misc.nix
View file

@ -1,6 +0,0 @@
{lib, ...}: {
options.localModules.DM.loginUser = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
};
}

13
modules/boot/misc.nix
View file

@ -1,13 +1,24 @@
{
self,
lib,
pkgs,
...
}: {
environment.etc = {
"issue" = {
text = "[?12l[?25h";
mode = "0444";
};
};
boot = {
blacklistedKernelModules = ["pcspkr"];
kernelParams = ["fbcon=nodefer" "bgrt_disable" "quiet" "systemd.show_status=false" "rd.udev.log_level=3" "vt.global_cursor_default=0"];
consoleLogLevel = 3;
initrd.verbose = false;
plymouth = {
enable = lib.mkDefault true;
theme = "breeze";
logo = self + /misc/nixos.png;
logo = self.packages.${pkgs.system}.images + /logo.png;
};
loader = {
grub.configurationLimit = 10;

14
modules/boot/silent.nix
View file

@ -1,14 +0,0 @@
{
environment.etc = {
"issue" = {
text = "[?12l[?25h";
mode = "0444";
};
};
boot = {
blacklistedKernelModules = ["pcspkr"];
kernelParams = ["fbcon=nodefer" "bgrt_disable" "quiet" "systemd.show_status=false" "rd.udev.log_level=3" "vt.global_cursor_default=0"];
consoleLogLevel = 3;
initrd.verbose = false;
};
}

15
modules/git.nix
View file

@ -3,16 +3,13 @@
config,
lib,
...
}: let
cfg = config.localModules.git;
in {
options.localModules.git = {
disable = lib.mkOption {
type = lib.types.bool;
default = false;
};
}: {
options.localModules.git.disable = lib.mkOption {
type = lib.types.bool;
default = false;
};
config = lib.mkIf (! cfg.disable) {
config = lib.mkIf (! config.localModules.git.disable) {
programs.git = {
enable = true;
package = pkgs.gitMinimal;

57
modules/misc.nix
View file

@ -1,24 +1,49 @@
{lib, ...}: {
{
lib,
config,
pkgs,
...
}: {
options = {
dummyvalue = lib.mkOption {
default = {};
type = lib.configType;
};
};
config = {
#enable ssh
programs.mtr.enable = true; #ping and traceroute
services.openssh = {
enable = true;
hostKeys = lib.mkForce [];
settings = {
PermitRootLogin = "yes";
PasswordAuthentication = false;
KbdInteractiveAuthentication = false;
};
nixpkgs.allowedUnfree = lib.mkOption {
type = lib.types.listOf lib.types.string;
default = [];
};
i18n.defaultLocale = "en_US.UTF-8";
#time settings
time.timeZone = "America/New_York";
};
config = lib.mkMerge [
(lib.mkIf (config.nixpkgs.allowedUnfree != []) {
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.nixpkgs.allowedUnfree;
})
{
environment.defaultPackages = lib.mkForce [
pkgs.efibootmgr #efi editor
pkgs.pciutils #lspci
pkgs.alsa-utils #volume control
pkgs.xclip #commandline clipboard access
pkgs.bottom #view tasks
pkgs.nix-tree #view packages
pkgs.nix-output-monitor #nom nom nom nom];
];
#enable ssh
programs.mtr.enable = true; #ping and traceroute
services.openssh = {
enable = true;
hostKeys = lib.mkForce [];
settings = {
PermitRootLogin = "yes";
PasswordAuthentication = false;
KbdInteractiveAuthentication = false;
};
};
i18n.defaultLocale = "en_US.UTF-8";
#time settings
time.timeZone = "America/New_York";
}
];
}

15
modules/packages.nix
View file

@ -1,15 +0,0 @@
{
pkgs,
lib,
...
}: {
environment.defaultPackages = lib.mkForce [
pkgs.efibootmgr #efi editor
pkgs.pciutils #lspci
pkgs.alsa-utils #volume control
pkgs.xclip #commandline clipboard access
pkgs.bottom #view tasks
pkgs.nix-tree #view packages
pkgs.nix-output-monitor #nom nom nom nom];
];
}

27
modules/shell.nix
View file

@ -2,21 +2,24 @@
inputs,
pkgs,
config,
lib,
...
}: {
#put:
#source /run/current-system/sw/share/nix-direnv/direnvrc
#in ~/.direnvrc
#do i need to do this^?
environment = {
systemPackages = [
pkgs.page
pkgs.exa
pkgs.direnv
pkgs.nix-direnv
inputs.fetch-rs.packages.${pkgs.system}.default
];
binsh = "${pkgs.dash}/bin/dash"; #use dash for speed
systemPackages = builtins.attrValues {
inherit
(pkgs)
page
exa
direnv
nix-direnv
;
inherit
(inputs.fetch-rs.packages.${pkgs.system})
default
;
};
binsh = lib.getExe pkgs.dash; #use dash for speed
variables = {
EDITOR = "nvim";
VISUAL = "nvim";

21
modules/unfree.nix
View file

@ -1,21 +0,0 @@
{
config,
lib,
...
}: let
allowed = config.nixpkgs.allowedUnfree;
in {
options.nixpkgs = {
allowedUnfree = lib.mkOption {
type = lib.types.listOf lib.types.string;
default = [];
description = ''
Allows for unfree packages by their name.
'';
};
};
config = lib.mkMerge [
(lib.mkIf (allowed != []) {nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) allowed;})
];
}