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

funni inputs'

Browse source
This commit is contained in:
Gerg-L 2023-11-01 21:04:20 -04:00
parent f872b7f9d2
commit 42b80afd9c
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
11 changed files with 57 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/gerg-desktop/main.nix
View file

@ -74,7 +74,7 @@
element-desktop
webcord
;
inherit (nvim-flake.packages.${pkgs.system}) neovim;
inherit (nvim-flake.packages) neovim;
inherit fmt;
lint = pkgs.writeShellApplication {
name = "lint";

4
hosts/gerg-desktop/services/minecraft.nix
View file

@ -1,5 +1,5 @@
{ self, ... }:
{ pkgs, lib, ... }:
{ lib, ... }:
{
# I manually switch this sometimes
config = lib.mkIf false {
@ -35,7 +35,7 @@
"network.target"
"minecraft-server.socket"
];
path = [ self.packages.${pkgs.system}.papermc ];
path = [ self.packages.papermc ];
script = ''
minecraft-server \
-Xms8G \

3
hosts/gerg-desktop/spicetify.nix
View file

@ -1,7 +1,6 @@
{ spicetify-nix, ... }:
{ pkgs, ... }:
let
spicePkgs = spicetify-nix.legacyPackages.${pkgs.system};
spicePkgs = spicetify-nix.legacyPackages;
in
{
imports = [ spicetify-nix.nixosModules.default ];

2
hosts/iso/main.nix
View file

@ -26,7 +26,7 @@
noXlibs = lib.mkOverride 500 false;
systemPackages = [
pkgs.neovim
disko.packages.${pkgs.system}.default
disko.packages.default
];
};
documentation = {

57
lib/default.nix
View file

@ -10,6 +10,31 @@ in
# Only good use case for rec
rec {
constructInputs' =
system: inputs:
lib.pipe inputs [
(lib.filterAttrs (_: lib.isType "flake"))
(lib.mapAttrs (
_:
lib.mapAttrs (
name: value:
if
builtins.elem name [
"defaultPackage"
"devShell"
"devShells"
"formatter"
"legacyPackages"
"packages"
]
then
value.${system}
else
value
)
))
];
listNixFilesRecursive =
path:
builtins.filter (lib.hasSuffix "nix") (lib.filesystem.listFilesRecursive path);
@ -27,7 +52,7 @@ rec {
(lib.removeSuffix ".nix")
(lib.removePrefix "${toString path}/")
];
value = import name inputs;
value = name;
})
(listNixFilesRecursive path)
);
@ -59,19 +84,23 @@ rec {
lib.evalModules {
specialArgs.modulesPath = "${unstable}/nixos/modules";
modules = builtins.concatLists [
(builtins.attrValues self.nixosModules)
(importAll "${self}/hosts/${name}")
(import "${unstable}/nixos/modules/module-list.nix")
(lib.singleton {
networking.hostName = name;
nixpkgs.hostPlatform = system;
})
(lib.optionals (self.diskoConfigurations ? "disko-${name}") [
self.diskoConfigurations."disko-${name}"
disko.nixosModules.default
])
];
modules =
let
inputs' = constructInputs' system inputs;
in
builtins.concatLists [
(map (x: import x inputs') (builtins.attrValues self.nixosModules))
(map (x: import x inputs') (listNixFilesRecursive "${self}/hosts/${name}"))
(import "${unstable}/nixos/modules/module-list.nix")
(lib.singleton {
networking.hostName = name;
nixpkgs.hostPlatform = system;
})
(lib.optionals (self.diskoConfigurations ? "disko-${name}") [
self.diskoConfigurations."disko-${name}"
disko.nixosModules.default
])
];
}
);
mkDisko =

6
modules/DE/dwm.nix
View file

@ -14,9 +14,7 @@
enable = true;
displayManager = {
sessionCommands = ''
${lib.getExe pkgs.feh} --bg-center "${
self.packages.${pkgs.system}.images
}/recursion.png"
${lib.getExe pkgs.feh} --bg-center "${self.packages.images}/recursion.png"
${lib.getExe pkgs.numlockx}
${lib.getExe pkgs.picom} &
'';
@ -46,7 +44,7 @@
];
};
environment.systemPackages = builtins.attrValues {
inherit (suckless.packages.${pkgs.system}) dmenu dwm st;
inherit (suckless.packages) dmenu dwm st;
};
};
_file = ./dwm.nix;

9
modules/DM/lightDM.nix
View file

@ -1,10 +1,5 @@
{ self, ... }:
{
config,
lib,
pkgs,
...
}:
{ config, lib, ... }:
{
options.local.DM.lightdm.enable = lib.mkEnableOption "";
@ -13,7 +8,7 @@
displayManager = {
lightdm = {
enable = true;
background = "${self.packages.${pkgs.system}.images}/recursion.png";
background = "${self.packages.images}/recursion.png";
extraConfig = "minimum-vt=1";
greeters.mini = {
enable = true;

2
modules/boot.nix
View file

@ -51,7 +51,7 @@
plymouth = {
enable = lib.mkDefault true;
theme = "breeze";
logo = "${self.packages.${pkgs.system}.images}/logo.png";
logo = "${self.packages.images}/logo.png";
};
loader = {
grub = {

2
modules/misc.nix
View file

@ -13,8 +13,6 @@ _:
config = {
nixpkgs = {
#TODO better way of doing this
overlays = [ (self: _: { inherit (self.stdenv.hostPlatform) system; }) ];
config = {
allowAliases = false;
allowUnfreePredicate =

9
modules/nix.nix
View file

@ -1,10 +1,5 @@
inputs:
{
pkgs,
lib,
config,
...
}:
{ lib, config, ... }:
{
#
# Flake registry and $NIX_PATH pinning
@ -30,7 +25,7 @@ inputs:
#
# Use nix directly from master
#
nix.package = inputs.nix.packages.${pkgs.system}.default;
nix.package = inputs.nix.packages.default;
#
# Other nix settings
#

4
modules/shell.nix
View file

@ -10,7 +10,7 @@
environment = {
systemPackages = builtins.attrValues {
inherit (pkgs) page eza fzf;
inherit (fetch-rs.packages.${pkgs.system}) fetch-rs;
inherit (fetch-rs.packages) fetch-rs;
};
binsh = lib.getExe pkgs.dash; # use dash for speed
variables = {
@ -69,7 +69,7 @@
histFile = "$HOME/.cache/zsh_history";
interactiveShellInit = ''
### fzf-tab ###
source ${self.packages.${pkgs.system}.fzf-tab}/fzf-tab.plugin.zsh
source ${self.packages.fzf-tab}/fzf-tab.plugin.zsh
### pager ###
man () {
PROGRAM="''${@[-1]}"