Compare commits
5
Commits
818c9f6af8
...
786d8f9ee3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
786d8f9ee3
|
||
|
|
43f6edcf02
|
||
|
|
83cfd6969c
|
||
|
|
1beb5a3338
|
||
|
|
0d6deec01e
|
@@ -34,6 +34,9 @@ in
|
||||
resumeDevice = btrfs;
|
||||
kernelParams = [
|
||||
"resume_offset=6444127"
|
||||
|
||||
# Fix connector hotplug at ly display manager
|
||||
"amdgpu.runpm=0"
|
||||
];
|
||||
|
||||
zswap.enable = true;
|
||||
|
||||
@@ -17,8 +17,7 @@ in
|
||||
enable = true;
|
||||
settings = lib.recursiveUpdate (with builtins; fromTOML (readFile ./starship-preset.toml)) {
|
||||
add_newline = false;
|
||||
command_timeout = 2000;
|
||||
nix_shell.disabled = true;
|
||||
scan_timeout = 1500;
|
||||
format =
|
||||
let
|
||||
dedupDollar =
|
||||
|
||||
@@ -19,6 +19,22 @@ in
|
||||
gnumake
|
||||
github-cli # gh
|
||||
];
|
||||
programs.starship.settings = {
|
||||
nix_shell.disabled = true;
|
||||
# direnv =
|
||||
# let
|
||||
# esc = builtins.fromJSON ''"\u001b"'';
|
||||
# in
|
||||
# {
|
||||
# disabled = false;
|
||||
# format = "$loaded$allowed ";
|
||||
# loaded_msg = "${esc}[1;92m ${esc}[0m"; # green
|
||||
# unloaded_msg = "";
|
||||
# allowed_msg = "";
|
||||
# not_allowed_msg = "${esc}[1;93m ${esc}[0m"; # yellow
|
||||
# denied_msg = "${esc}[1;91m ${esc}[0m"; # red
|
||||
# };
|
||||
};
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
[audio]
|
||||
enable_sounds = true
|
||||
@@ -1,2 +1,2 @@
|
||||
[notification]
|
||||
layer = "overlay"
|
||||
layer = "top"
|
||||
|
||||
@@ -406,7 +406,7 @@ def main():
|
||||
else:
|
||||
sets_by_file.setdefault(f, []).append((path, old, val))
|
||||
|
||||
if not changes:
|
||||
if not changes and not new_files:
|
||||
print("No changes to fold. Repo config already matches the export.")
|
||||
return
|
||||
|
||||
@@ -434,8 +434,10 @@ def main():
|
||||
)
|
||||
|
||||
if not args.apply:
|
||||
total = len(changes) + len(new_files)
|
||||
file_count = len(touched) + len(new_files)
|
||||
print(
|
||||
f"\n{len(changes)} change{'s' if len(changes) > 1 else ''} in {len(touched)} file(s)."
|
||||
f"\n{total} change{'s' if total != 1 else ''} in {file_count} file(s)."
|
||||
)
|
||||
print("Run with --apply to fold into the repo.")
|
||||
return
|
||||
@@ -478,10 +480,11 @@ def main():
|
||||
print(f" backed up {state_dir}/settings.toml -> {bak}")
|
||||
reload_instance()
|
||||
else:
|
||||
# Should not reach this branch, since `len(changes) > 0`, GUI overrides must exist.
|
||||
# Should not reach this branch, since a fold implies GUI overrides exist.
|
||||
print("warning: settings.toml does not exist. Nothing backuped")
|
||||
|
||||
print(f"\nDone. {len(changes)} change{'s' if len(changes) > 1 else ''} folded.")
|
||||
total = len(changes) + len(new_files)
|
||||
print(f"\nDone. {total} change{'s' if total != 1 else ''} folded.")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in New Issue
Block a user