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

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

106
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683508929, "lastModified": 1684170997,
"narHash": "sha256-AqkIrwewCL8+zlkqhNxheF+kOfyakzZDk43SqRTIqRE=", "narHash": "sha256-WgwqHeYv2sDA0eWghnYCUNx7dm5S8lqDVZjp7ufzm30=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "2a59f5cf641607dbecb0cfec3ae32247e4aeb311", "rev": "10402e31443941b50bf62e67900743dcb26b3b27",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683514650, "lastModified": 1683595330,
"narHash": "sha256-iEqDoxDmUMINqUX0BZz5HNaKL4oxdG4j4ug+sXq/3Nk=", "narHash": "sha256-91mwX0IE4LMqoHrKu3NJtC8ZHVoqIKZR34e0rA5UN+U=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "fetch-rs", "repo": "fetch-rs",
"rev": "95c1568e6ba77afe624ca84ecae4a502d5ef06b5", "rev": "5f7532ef062176c0ec2ff9903c3928864d380d83",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -57,15 +57,12 @@
} }
}, },
"flake-utils": { "flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1667395993,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -76,7 +73,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1681202837,
@ -110,11 +107,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1683510273, "lastModified": 1684370513,
"narHash": "sha256-VSJ0hmIPgcD97XV+8UzVEPkKVR5n2sZd3Wm2HC0UI/U=", "narHash": "sha256-nngcKmKHFGmxxZXN8mMl+2gyhcEEXByC0FGdQG0vbAY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "055a2f470bced98bb34a5d94b775c410e1594cc2", "rev": "285aa1f48e62932fed2089ddb04768172ae4a625",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,11 +130,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1683417608, "lastModified": 1684067358,
"narHash": "sha256-qdWRY50WhpjHKLKe7ngYdEnA+gYjOnE3PScQws0YofY=", "narHash": "sha256-9CdP1arEvBbgYhK+qZMV2gUeaxmxFkyxLqUKTZR/icw=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "fa1baa9a47cdb3eed17d48b6011a164d4009d2ee", "rev": "ecd6d679a020ff97156de2fd3c443a77a671ac3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +189,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683189539, "lastModified": 1683530131,
"narHash": "sha256-dqeE6PM1SSNCB9BSBgh/9dJPLn3sf7P4uay8/CymMlQ=", "narHash": "sha256-R0RSqj6JdZfru2x/cM19KJMHsU52OjtyxI5cccd+uFc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "104ca15b0019bf461639050daeaa18e25642ccee", "rev": "10079333313ff62446e6f2b0e7c5231c7431d269",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -239,11 +236,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1683401577, "lastModified": 1684025543,
"narHash": "sha256-sOtJKZZ9HWqcGg2hRj6O4HX9pOFfTzgYgSi+MN1HEWo=", "narHash": "sha256-hGe7S+i5je+8E/b2mOXVI9nmr038Dw+bV8e1P8xHSe0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d724b57823f2ab2c879a840a426a607bbab2b730", "rev": "c6d2f3dc0d3efd4285eebe4f8a36a47ba438138e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -253,19 +250,33 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1683014792,
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nvim-flake": { "nvim-flake": {
"inputs": { "inputs": {
"neovim-src": "neovim-src", "neovim-src": "neovim-src",
"nixpkgs": [ "nixpkgs": "nixpkgs_2"
"unstable"
]
}, },
"locked": { "locked": {
"lastModified": 1683514625, "lastModified": 1684097344,
"narHash": "sha256-l+nJVswlUuDb0ZeHaqDMUf3tfcoND/ukgDkDQuLcpmw=", "narHash": "sha256-cVd8tk6qzL9n4hHG5VfFunksCbjuy2xtTSCSnaZg0v8=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "nvim-flake", "repo": "nvim-flake",
"rev": "63b85335e2a617a49489a1e3c28bd40014d305f4", "rev": "8bd7d66d21741d7d9c42a7229b7c125f422d6170",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -297,11 +308,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1683428115, "lastModified": 1684032930,
"narHash": "sha256-sxkM4upCCdsaWVpDWxYgQXooobex8QHbFkGj40Uf9uQ=", "narHash": "sha256-ueeSYDii2e5bkKrsSdP12JhkW9sqgYrUghLC8aDfYGQ=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "fd2d857ce2450a3ba5700d1e95eb110070e0dbc3", "rev": "a376127bb5277cd2c337a9458744f370aaf2e08d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -333,11 +344,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1683383741, "lastModified": 1684280442,
"narHash": "sha256-rAQSBnFGNKNomUUyVl+7v0tnp45677t4Ovlh9f57k6Q=", "narHash": "sha256-nC1/kfh6tpMQSLQalbNTNnireIlxvLLugrjZdasNh+I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "adc7c6f1bbaa73cda26be2323353b63a05b42f61", "rev": "6c591e7adc514090a77209f56c9d0c551ab8530d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -382,28 +393,13 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1683408522, "lastModified": 1684305980,
"narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", "narHash": "sha256-vd4SKXX1KZfSX6n3eoguJw/vQ+sBL8XGdgfxjEgLpKc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", "rev": "e6e389917a8c778be636e67a67ec958f511cc55d",
"type": "github" "type": "github"
}, },
"original": { "original": {

19
flake.nix
View file

@ -29,10 +29,7 @@
url = "github:Gerg-L/suckless"; url = "github:Gerg-L/suckless";
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
}; };
nvim-flake = { nvim-flake.url = "github:Gerg-L/nvim-flake";
url = "github:Gerg-L/nvim-flake";
inputs.nixpkgs.follows = "unstable";
};
fetch-rs = { fetch-rs = {
url = "github:Gerg-L/fetch-rs"; url = "github:Gerg-L/fetch-rs";
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
@ -44,22 +41,18 @@
nixos-generators, nixos-generators,
... ...
}: let }: let
lib = unstable.lib; inherit (unstable) lib;
importAll = path: importAll = path:
map builtins.filter (lib.hasSuffix ".nix")
(module: (import module inputs)) (lib.filesystem.listFilesRecursive path);
(
builtins.filter (file: lib.hasSuffix ".nix" file)
(lib.filesystem.listFilesRecursive path)
);
mkSystems = system: names: mkSystems = system: names:
lib.genAttrs names ( lib.genAttrs names (
name: name:
lib.nixosSystem { lib.nixosSystem {
inherit system; inherit system;
specialArgs = {inherit self;}; specialArgs = {inherit inputs self;};
modules = modules =
importAll ./modules importAll ./modules
++ importAll (self + "/systems/" + name); ++ importAll (self + "/systems/" + name);
@ -124,7 +117,7 @@
value = pkgs.callPackage module {}; value = pkgs.callPackage module {};
}) })
( (
builtins.filter (file: lib.hasSuffix ".nix" file) builtins.filter (lib.hasSuffix ".nix")
(lib.filesystem.listFilesRecursive ./pkgs) (lib.filesystem.listFilesRecursive ./pkgs)
) )
); );

6
modules/DE/dwm.nix
View file

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

3
modules/DE/gnome.nix
View file

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

3
modules/DE/xfce.nix
View file

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

3
modules/DM/autoLogin.nix
View file

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

3
modules/DM/lightDM.nix
View file

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

6
modules/DM/misc.nix
View file

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

3
modules/X11.nix
View file

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

2
modules/boot/misc.nix
View file

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

2
modules/boot/silent.nix
View file

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

5
modules/boot/stage2patch.nix
View file

@ -1,4 +1,5 @@
{unstable, ...}: { {
inputs,
lib, lib,
config, config,
pkgs, pkgs,
@ -8,7 +9,7 @@
bootStage2 = pkgs.substituteAll { bootStage2 = pkgs.substituteAll {
src = pkgs.runCommand "stage-2-init.sh" {} '' 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"; shellDebug = "${pkgs.bashInteractive}/bin/bash";
shell = "${pkgs.bash}/bin/bash"; shell = "${pkgs.bash}/bin/bash";

3
modules/builders.nix
View file

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

3
modules/git.nix
View file

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

3
modules/hardware.nix
View file

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

34
modules/misc.nix
View file

@ -1,16 +1,24 @@
_: {lib, ...}: { {lib, ...}: {
#enable ssh options = {
programs.mtr.enable = true; #ping and traceroute dummyvalue = lib.mkOption {
services.openssh = { default = {};
enable = true; type = lib.configType;
hostKeys = lib.mkForce [];
settings = {
PermitRootLogin = "yes";
PasswordAuthentication = false;
KbdInteractiveAuthentication = false;
}; };
}; };
i18n.defaultLocale = "en_US.UTF-8"; config = {
#time settings #enable ssh
time.timeZone = "America/New_York"; 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, lib,
pkgs,
self, self,
... ...
}: let }: let
@ -9,7 +9,7 @@ inputs: {
#filter non-flakes from inputs #filter non-flakes from inputs
lib.filterAttrs ( lib.filterAttrs (
_: value: ( _: value: (
!(lib.hasAttrByPath ["flake"] value) || value.flake == false !(lib.hasAttrByPath ["flake"] value) || !value.flake
) )
) )
inputs inputs

2
modules/packages.nix
View file

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

6
modules/shell.nix
View file

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

5
modules/sops.nix
View file

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

24
modules/theming.nix
View file

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

2
modules/unfree.nix
View file

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

3
systems/game-laptop/default.nix
View file

@ -1,4 +1,4 @@
inputs: { {
pkgs, pkgs,
config, config,
... ...
@ -24,6 +24,7 @@ inputs: {
]; ];
environment = { environment = {
systemPackages = [ systemPackages = [
pkgs.neovim
pkgs.heroic pkgs.heroic
pkgs.legendary-gl pkgs.legendary-gl
pkgs.prismlauncher pkgs.prismlauncher

9
systems/game-laptop/disko.nix
View file

@ -1,5 +1,10 @@
{disko, ...}: {disks ? [], ...}: { {
imports = [disko.nixosModules.disko]; inputs,
disks ? [],
...
}: {
dummyvalue = {inherit disks;};
imports = [inputs.disko.nixosModules.disko];
disko.devices = { disko.devices = {
disk.nvme0n1 = { disk.nvme0n1 = {
device = "/dev/disk/by-id/nvme-WDC_PC_SN530_SDBPNPZ-512G-1006_21311N802456"; device = "/dev/disk/by-id/nvme-WDC_PC_SN530_SDBPNPZ-512G-1006_21311N802456";

2
systems/game-laptop/prime.nix
View file

@ -1,4 +1,4 @@
_: {config, ...}: { {config, ...}: {
hardware.nvidia = { hardware.nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.latest; package = config.boot.kernelPackages.nvidiaPackages.latest;
prime = { prime = {

2
systems/gerg-desktop/containers/minecraft.nix
View file

@ -1,4 +1,4 @@
_: { {
containers."minecraft" = { containers."minecraft" = {
ephemeral = true; ephemeral = true;
autoStart = true; autoStart = true;

19
systems/gerg-desktop/default.nix
View file

@ -1,4 +1,5 @@
inputs: { {
inputs,
pkgs, pkgs,
config, config,
... ...
@ -30,21 +31,17 @@ inputs: {
videoDrivers = ["nvidia" "amdgpu"]; videoDrivers = ["nvidia" "amdgpu"];
}; };
nixpkgs = { nixpkgs.allowedUnfree = [
allowedUnfree = [ "nvidia-x11"
"nvidia-x11" "steam"
"steam" "steam-original"
"steam-original" ];
];
overlays = [
inputs.nvim-flake.overlay
];
};
nix.settings.system-features = ["kvm" "big-parallel" "nixos-test" "benchmark"]; nix.settings.system-features = ["kvm" "big-parallel" "nixos-test" "benchmark"];
environment = { environment = {
systemPackages = [ systemPackages = [
inputs.nvim-flake.packages.${pkgs.system}.default
pkgs.bitwarden #store stuff pkgs.bitwarden #store stuff
pkgs.qbittorrent #steal stuff pkgs.qbittorrent #steal stuff
pkgs.pavucontrol #gui volume control pkgs.pavucontrol #gui volume control

9
systems/gerg-desktop/disko.nix
View file

@ -1,5 +1,10 @@
{disko, ...}: {disks ? [], ...}: { {
imports = [disko.nixosModules.disko]; inputs,
disks ? [],
...
}: {
dummyvalue = {inherit disks;};
imports = [inputs.disko.nixosModules.disko];
disko.devices = { disko.devices = {
disk = { disk = {
nvme0 = { nvme0 = {

2
systems/gerg-desktop/erase-your-darlings.nix
View file

@ -1,4 +1,4 @@
_: {lib, ...}: { {lib, ...}: {
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d /mnt - - - - -" "d /mnt - - - - -"
"L+ /etc/ssh/ssh_host_ed25519_key - - - - /persist/ssh/ssh_host_ed25519_key" "L+ /etc/ssh/ssh_host_ed25519_key - - - - /persist/ssh/ssh_host_ed25519_key"

2
systems/gerg-desktop/parrot.nix
View file

@ -1,4 +1,4 @@
_: { {
pkgs, pkgs,
config, config,
self, self,

10
systems/gerg-desktop/spicetify.nix
View file

@ -1,9 +1,13 @@
{spicetify-nix, ...}: {pkgs, ...}: let {
spicePkgs = spicetify-nix.packages.${pkgs.system}.default; inputs,
pkgs,
...
}: let
spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
ex = spicePkgs.extensions; ex = spicePkgs.extensions;
in { in {
nixpkgs.allowedUnfree = ["spotify"]; nixpkgs.allowedUnfree = ["spotify"];
imports = [spicetify-nix.nixosModule]; imports = [inputs.spicetify-nix.nixosModule];
programs.spicetify = { programs.spicetify = {
spotifyPackage = pkgs.spotify-unwrapped; spotifyPackage = pkgs.spotify-unwrapped;
spicetifyPackage = pkgs.spicetify-cli; spicetifyPackage = pkgs.spicetify-cli;

2
systems/gerg-desktop/vfio.nix
View file

@ -1,4 +1,4 @@
_: { {
pkgs, pkgs,
self, self,
config, config,

3
systems/gerg-desktop/zfs.nix
View file

@ -1,4 +1,4 @@
_: {config, ...}: { {config, ...}: {
boot = { boot = {
zfs = { zfs = {
devNodes = "/dev/disk/by-id/"; devNodes = "/dev/disk/by-id/";
@ -22,7 +22,6 @@ _: {config, ...}: {
grub = { grub = {
enable = true; enable = true;
efiInstallAsRemovable = true; efiInstallAsRemovable = true;
version = 2;
copyKernels = true; copyKernels = true;
efiSupport = true; efiSupport = true;
zfsSupport = true; zfsSupport = true;

3
systems/moms-laptop/default.nix
View file

@ -1,4 +1,4 @@
_: { {
pkgs, pkgs,
config, config,
... ...
@ -18,6 +18,7 @@ _: {
}; };
environment.systemPackages = [ environment.systemPackages = [
pkgs.neovim
pkgs.vlc pkgs.vlc
pkgs.nomacs pkgs.nomacs
pkgs.gnome.gnome-calculator pkgs.gnome.gnome-calculator

9
systems/moms-laptop/disko.nix
View file

@ -1,5 +1,10 @@
{disko, ...}: {disks ? [], ...}: { {
imports = [disko.nixosModules.disko]; inputs,
disks ? [],
...
}: {
dummyvalue = {inherit disks;};
imports = [inputs.disko.nixosModules.disko];
disko.devices = { disko.devices = {
disk.sda = { disk.sda = {
device = "/dev/disk/by-id/ata-WDC_WDS240G2G0A-00JH30_180936803144"; device = "/dev/disk/by-id/ata-WDC_WDS240G2G0A-00JH30_180936803144";

2
systems/moms-laptop/printing.nix
View file

@ -1,4 +1,4 @@
_: {pkgs, ...}: { {pkgs, ...}: {
nixpkgs.allowedUnfree = ["hplip"]; nixpkgs.allowedUnfree = ["hplip"];
environment.systemPackages = [ environment.systemPackages = [
pkgs.gimp pkgs.gimp