mirror of
https://github.com/RGBCube/ncc
synced 2025-07-30 03:27:45 +00:00
treewide: update flake lock
This commit is contained in:
parent
eec914e613
commit
0eb7eb7475
5 changed files with 98 additions and 61 deletions
|
@ -1,5 +1,5 @@
|
|||
{ config, lib, pkgs, ... }: let
|
||||
inherit (lib) attrNames attrValues head mkAliasOptionModule mkIf;
|
||||
inherit (lib) attrNames attrValues filterAttrs hasPrefix head mkAliasOptionModule mkIf;
|
||||
in {
|
||||
imports = [(mkAliasOptionModule [ "secrets" ] [ "age" "secrets" ])];
|
||||
|
||||
|
@ -7,7 +7,7 @@ in {
|
|||
(if config.isLinux then
|
||||
"/root/.ssh/id"
|
||||
else
|
||||
"/Users/${head <| attrNames <| config.users.users}/.ssh/id")
|
||||
"/Users/${head <| attrNames <| filterAttrs (_: value: value.home != null && hasPrefix "/Users/" value.home) config.users.users}/.ssh/id")
|
||||
];
|
||||
|
||||
environment = mkIf config.isDesktop {
|
||||
|
|
|
@ -70,8 +70,8 @@ in {
|
|||
|
||||
ui.default-command = "ls";
|
||||
|
||||
ui.diff-editor = ":builtin";
|
||||
ui.diff.tool = [ "difft" "--color" "always" "$left" "$right" ];
|
||||
ui.diff-editor = ":builtin";
|
||||
ui.diff-formatter = [ "difft" "--color" "always" "$left" "$right" ];
|
||||
|
||||
ui.conflict-marker-style = "snapshot";
|
||||
ui.graph.style = if config.theme.cornerRadius > 0 then "curved" else "square";
|
||||
|
@ -90,7 +90,6 @@ in {
|
|||
|
||||
git.auto-local-bookmark = true;
|
||||
git.push-bookmark-prefix = "change-rgbcube-";
|
||||
git.subprocess = true;
|
||||
|
||||
git.fetch = [ "origin" "upstream" "rad" ];
|
||||
git.push = "origin";
|
||||
|
|
5
modules/darwin/system-config-primary-user.nix
Normal file
5
modules/darwin/system-config-primary-user.nix
Normal file
|
@ -0,0 +1,5 @@
|
|||
{ config, lib, ... }: let
|
||||
inherit (lib) attrNames filterAttrs hasPrefix head;
|
||||
in {
|
||||
system.primaryUser = head <| attrNames <| filterAttrs (_: value: value.home != null && hasPrefix "/Users/" value.home) config.users.users;
|
||||
}
|
|
@ -1,12 +1,5 @@
|
|||
{ config, pkgs, lib, ... }: let
|
||||
inherit (lib) attrValues merge mkIf;
|
||||
inherit (lib) enabled merge mkIf;
|
||||
in merge <| mkIf config.isDesktop {
|
||||
# Steam uses 32-bit drivers for some unholy fucking reason.
|
||||
hardware.graphics.enable32Bit = true;
|
||||
|
||||
environment.systemPackages = attrValues {
|
||||
inherit (pkgs)
|
||||
steam
|
||||
;
|
||||
};
|
||||
programs.steam = enabled;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue