RGBCube/ncc
1
Fork 0
mirror of https://github.com/RGBCube/ncc synced 2025-07-30 19:47:47 +00:00
Code Issues Activity

Use my FlakeTools and rearrange specialArgs

Browse source
This commit is contained in:
RGBCube 2023-11-23 22:55:58 +03:00
parent 9ca297f2ec
commit 7b10e526a7
No known key found for this signature in database
8 changed files with 38 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

36
flake.lock generated
View file

@ -125,8 +125,7 @@
"fenix": "fenix",
"homeManager": "homeManager",
"hyprland": "hyprland",
"nixpkgs": "nixpkgs_2",
"utils": "utils"
"nixpkgs": "nixpkgs_2"
}
},
"rust-analyzer-src": {
@ -161,39 +160,6 @@
"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"
}
},
"utils": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"wlroots": {
"flake": false,
"locked": {

29
flake.nix
View file

@ -23,8 +23,9 @@
inputs.nixpkgs.follows = "nixpkgs";
};
utils = {
url = "github:numtide/flake-utils";
tools = {
url = "github:RGBCube/FlakeTools";
inputs.nixpkgs.follows = "nixpkgs";
};
fenix = {
@ -37,12 +38,22 @@
};
};
outputs = { nixpkgs, homeManager, utils, fenix, ... } @ inputs: utils.lib.eachDefaultSystem (system: let
outputs = { nixpkgs, homeManager, tools, fenix, ... } @ inputs: tools.eachDefaultArch (system: let
upkgs = {
theme = import ./themes/gruvbox.nix;
hyprland = inputs.hyprland.packages.${system}.default;
};
lib = nixpkgs.lib;
ulib = rec {
recursiveUpdate3 = x: y: z: lib.recursiveUpdate x (lib.recursiveUpdate y z);
ulib = {
inherit (tools) recursiveUpdateMap;
recursiveUpdate3 = x: y: z: lib.recursiveUpdate x (lib.recursiveUpdate y z);
};
abstractions = rec {
importAll = paths: {
imports = paths;
};
@ -76,10 +87,6 @@
};
};
theme = import ./themes/gruvbox.nix;
hyprland = inputs.hyprland.packages.${system}.default;
defaultConfiguration = host: ulib.systemConfiguration {
nix.gc = {
automatic = true;
@ -110,8 +117,8 @@
home-manager.useUserPackages = true;
};
specialArgs = ulib // {
inherit theme hyprland;
specialArgs = abstractions // {
inherit upkgs ulib;
};
importConfiguration = host: lib.nixosSystem {

2
machines/enka/default.nix
View file

@ -1,4 +1,4 @@
{ recursiveUpdate3, systemConfiguration, homeConfiguration, importAll, ... }: recursiveUpdate3
{ ulib, systemConfiguration, homeConfiguration, importAll, ... }: ulib.recursiveUpdate3
(systemConfiguration {
boot.loader = {

6
machines/enka/dunst/default.nix
View file

@ -1,7 +1,9 @@
{ pkgs, theme, homeConfiguration, enabled, ... }:
{ pkgs, upkgs, homeConfiguration, enabled, ... }:
homeConfiguration "nixos" {
services.dunst = enabled {
services.dunst = let
inherit (upkgs) theme;
in enabled {
iconTheme = {
name = "Gruvbox-Dark";
package = pkgs.gruvbox-dark-icons-gtk;

6
machines/enka/fuzzel/default.nix
View file

@ -1,4 +1,4 @@
{ theme, homeConfiguration, enabled, ... }:
{ upkgs, homeConfiguration, enabled, ... }:
homeConfiguration "nixos" {
programs.fuzzel = enabled {
@ -16,7 +16,9 @@ homeConfiguration "nixos" {
inner-pad = 10;
};
settings.colors = {
settings.colors = let
inherit (upkgs) theme;
in {
background = theme.background + theme.transparency;
text = theme.foreground + theme.transparency;
match = theme.activeHighlight + theme.transparency;

8
machines/enka/hyprland/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, recursiveUpdate3, hyprland, theme, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: recursiveUpdate3
{ pkgs, upkgs, ulib, theme, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: ulib.recursiveUpdate3
(systemConfiguration {
hardware.opengl = enabled {};
@ -12,9 +12,11 @@
(homeConfiguration "nixos" {
wayland.windowManager.hyprland = enabled {
package = hyprland;
package = upkgs.hyprland;
extraConfig =
extraConfig = let
inherit (upkgs) theme;
in
''
monitor = , preferred, auto, 1
''

6
machines/enka/kitty/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, theme, homeConfiguration, enabled, ... }:
{ pkgs, upkgs, homeConfiguration, enabled, ... }:
homeConfiguration "nixos" {
programs.kitty = enabled {
@ -12,7 +12,9 @@ homeConfiguration "nixos" {
theme = "Gruvbox Dark";
settings = {
settings = let
inherit (upkgs) theme;
in {
allow_remote_control = true;
confirm_os_window_close = 0;
focus_follows_mouse = true;

2
machines/enka/nushell/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, recursiveUpdate3, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: recursiveUpdate3
{ pkgs, ulib, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: ulib.recursiveUpdate3
(systemConfiguration {
users.defaultUserShell = pkgs.nushell;