Compare commits

..
5 Commits
6 changed files with 30 additions and 7 deletions
+3
View File
@@ -34,6 +34,9 @@ in
resumeDevice = btrfs; resumeDevice = btrfs;
kernelParams = [ kernelParams = [
"resume_offset=6444127" "resume_offset=6444127"
# Fix connector hotplug at ly display manager
"amdgpu.runpm=0"
]; ];
zswap.enable = true; zswap.enable = true;
+1 -2
View File
@@ -17,8 +17,7 @@ in
enable = true; enable = true;
settings = lib.recursiveUpdate (with builtins; fromTOML (readFile ./starship-preset.toml)) { settings = lib.recursiveUpdate (with builtins; fromTOML (readFile ./starship-preset.toml)) {
add_newline = false; add_newline = false;
command_timeout = 2000; scan_timeout = 1500;
nix_shell.disabled = true;
format = format =
let let
dedupDollar = dedupDollar =
+16
View File
@@ -19,6 +19,22 @@ in
gnumake gnumake
github-cli # gh 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 = { programs.direnv = {
enable = true; enable = true;
nix-direnv.enable = true; nix-direnv.enable = true;
@@ -0,0 +1,2 @@
[audio]
enable_sounds = true
@@ -1,2 +1,2 @@
[notification] [notification]
layer = "overlay" layer = "top"
+7 -4
View File
@@ -406,7 +406,7 @@ def main():
else: else:
sets_by_file.setdefault(f, []).append((path, old, val)) 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.") print("No changes to fold. Repo config already matches the export.")
return return
@@ -434,8 +434,10 @@ def main():
) )
if not args.apply: if not args.apply:
total = len(changes) + len(new_files)
file_count = len(touched) + len(new_files)
print( 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.") print("Run with --apply to fold into the repo.")
return return
@@ -478,10 +480,11 @@ def main():
print(f" backed up {state_dir}/settings.toml -> {bak}") print(f" backed up {state_dir}/settings.toml -> {bak}")
reload_instance() reload_instance()
else: 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("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__": if __name__ == "__main__":