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

switch to using specialArgs for inputs

Browse source 
made dummy option for deadnix to shutup about disko

update flake.lock

stopped using neovim overlay
This commit is contained in:
Gerg-L 2023-05-17 22:03:25 -04:00
parent a3e18f9a36
commit 0d2e560191
36 changed files with 162 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/DE/dwm.nix
View file

@ -1,13 +1,13 @@
{suckless, ...}: {
{
inputs,
pkgs,
config,
options,
lib,
self,
...
}: let
cfg = config.localModules.DE.dwm;
sp = suckless.packages.${pkgs.system};
sp = inputs.suckless.packages.${pkgs.system};
in {
options.localModules.DE.dwm = {
enable = lib.mkEnableOption "";

3
modules/DE/gnome.nix
View file

@ -1,7 +1,6 @@
_: {
{
config,
lib,
options,
pkgs,
...
}: let

3
modules/DE/xfce.nix
View file

@ -1,7 +1,6 @@
_: {
{
config,
lib,
options,
...
}: let
cfg = config.localModules.DE.xfce;

3
modules/DM/autoLogin.nix
View file

@ -1,7 +1,6 @@
_: {
{
config,
lib,
options,
...
}: let
cfg = config.localModules.DM.autoLogin;

3
modules/DM/lightDM.nix
View file

@ -1,7 +1,6 @@
_: {
{
config,
lib,
options,
self,
...
}: let

6
modules/DM/misc.nix
View file

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

3
modules/X11.nix
View file

@ -1,7 +1,6 @@
_: {
{
config,
pkgs,
options,
lib,
...
}: let

2
modules/boot/misc.nix
View file

@ -1,4 +1,4 @@
_: {
{
self,
lib,
...

2
modules/boot/silent.nix
View file

@ -1,4 +1,4 @@
_: {
{
environment.etc = {
"issue" = {
text = "[?12l[?25h";

5
modules/boot/stage2patch.nix
View file

@ -1,4 +1,5 @@
{unstable, ...}: {
{
inputs,
lib,
config,
pkgs,
@ -8,7 +9,7 @@
bootStage2 = pkgs.substituteAll {
src = pkgs.runCommand "stage-2-init.sh" {} ''
sed '2i exec 1<>/dev/null' ${unstable}/nixos/modules/system/boot/stage-2-init.sh > $out
sed '2i exec 1<>/dev/null' ${inputs.unstable}/nixos/modules/system/boot/stage-2-init.sh > $out
'';
shellDebug = "${pkgs.bashInteractive}/bin/bash";
shell = "${pkgs.bash}/bin/bash";

3
modules/builders.nix
View file

@ -1,7 +1,6 @@
_: {
{
config,
lib,
options,
...
}: {
options.localModules.remoteBuild = {

3
modules/git.nix
View file

@ -1,6 +1,5 @@
_: {
{
pkgs,
options,
config,
lib,
...

3
modules/hardware.nix
View file

@ -1,6 +1,5 @@
_: {
{
config,
options,
lib,
...
}: let

34
modules/misc.nix
View file

@ -1,16 +1,24 @@
_: {lib, ...}: {
#enable ssh
programs.mtr.enable = true; #ping and traceroute
services.openssh = {
enable = true;
hostKeys = lib.mkForce [];
settings = {
PermitRootLogin = "yes";
PasswordAuthentication = false;
KbdInteractiveAuthentication = false;
{lib, ...}: {
options = {
dummyvalue = lib.mkOption {
default = {};
type = lib.configType;
};
};
i18n.defaultLocale = "en_US.UTF-8";
#time settings
time.timeZone = "America/New_York";
config = {
#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";
};
}

6
modules/nix.nix
View file

@ -1,6 +1,6 @@
inputs: {
{
inputs,
lib,
pkgs,
self,
...
}: let
@ -9,7 +9,7 @@ inputs: {
#filter non-flakes from inputs
lib.filterAttrs (
_: value: (
!(lib.hasAttrByPath ["flake"] value) || value.flake == false
!(lib.hasAttrByPath ["flake"] value) || !value.flake
)
)
inputs

2
modules/packages.nix
View file

@ -1,4 +1,4 @@
_: {pkgs, ...}: {
{pkgs, ...}: {
environment = {
defaultPackages = []; #don't install anything by default
systemPackages = [

6
modules/shell.nix
View file

@ -1,4 +1,5 @@
{fetch-rs, ...}: {
{
inputs,
pkgs,
config,
...
@ -13,8 +14,7 @@
pkgs.exa
pkgs.direnv
pkgs.nix-direnv
pkgs.neovim
fetch-rs.packages.${pkgs.system}.default
inputs.fetch-rs.packages.${pkgs.system}.default
];
binsh = "${pkgs.dash}/bin/dash"; #use dash for speed
variables = {

5
modules/sops.nix
View file

@ -1,11 +1,12 @@
{sops-nix, ...}: {
{
inputs,
pkgs,
self,
config,
...
}: {
imports = [
sops-nix.nixosModules.sops
inputs.sops-nix.nixosModules.sops
];
environment.systemPackages = [
pkgs.sops

24
modules/theming.nix
View file

@ -1,6 +1,5 @@
{stable, ...}: {
{
pkgs,
options,
config,
lib,
...
@ -25,7 +24,7 @@ in {
[Settings]
gtk-cursor-theme-name=Quintom_Ink
gtk-cursor-theme-size=16
gtk-font-name = "Overpass Nerd Font 10"
gtk-font-name = "Overpass 10"
gtk-icon-theme-name=Flat-Remix-Blue-Dark
gtk-theme-name=Flat-Remix-GTK-Blue-Darkest
'';
@ -33,14 +32,14 @@ in {
[Settings]
gtk-cursor-theme-name=Quintom_Ink
gtk-cursor-theme-size=16
gtk-font-name = "Overpass Nerd Font 10"
gtk-font-name = "Overpass 10"
gtk-icon-theme-name=Flat-Remix-Blue-Dark
gtk-theme-name=Flat-Remix-GTK-Blue-Darkest
'';
"xdg/gtk-2.0/gtkrc".text = ''
gtk-cursor-theme-name = "Quintom_Ink"
gtk-cursor-theme-size = 16
gtk-font-name = "Overpass Nerd Font 10"
gtk-font-name = "Overpass 10"
gtk-icon-theme-name = "Flat-Remix-Blue-Dark"
gtk-theme-name = "Flat-Remix-GTK-Blue-Darkest"
'';
@ -59,20 +58,15 @@ in {
xrdb -load /etc/xdg/Xresources
'';
fonts = {
fonts = [
(stable.legacyPackages.${pkgs.system}.nerdfonts.override
{
fonts = ["Overpass"];
})
];
fonts = [pkgs.overpass];
enableDefaultFonts = false;
fontDir.enable = true;
fontconfig = {
enable = true;
defaultFonts = {
serif = ["Overpass Nerd Font"];
sansSerif = ["Overpass Nerd Font"];
monospace = ["OverpassMono Nerd Font"];
serif = ["Overpass"];
sansSerif = ["Overpass"];
monospace = ["Overpass Mono"];
};
hinting.enable = true;
antialias = true;
@ -89,7 +83,7 @@ in {
'';
fonts = [
{
name = "OverpassMono Nerd Font";
name = "OverpassMono";
package =
pkgs.nerdfonts.override
{

2
modules/unfree.nix
View file

@ -1,4 +1,4 @@
_: {
{
config,
lib,
...