From 2e1c466410d32ce7bb6e531c226865b5d3a7280b Mon Sep 17 00:00:00 2001 From: joy Date: Sun, 17 Nov 2024 17:51:11 +0100 Subject: [PATCH] update and fastfetch config --- flake.lock | 80 +++++++------------------ modules/programs/default.nix | 2 +- modules/programs/fastfetch/default.nix | 28 ++++++++- modules/programs/misc/default.nix | 2 +- modules/programs/root.nix | 1 + modules/programs/{home.nix => user.nix} | 2 +- 6 files changed, 54 insertions(+), 61 deletions(-) rename modules/programs/{home.nix => user.nix} (80%) diff --git a/flake.lock b/flake.lock index e297d8c..f7bd5fb 100644 --- a/flake.lock +++ b/flake.lock @@ -97,11 +97,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1731729795, - "narHash": "sha256-trv2jL/Xo/vddO0C6FvBdxMKEq+jn0Vw/0kIhPe9FHc=", + "lastModified": 1731816193, + "narHash": "sha256-Y/u1O6GpvOYRbGOnwGo0Gofg5jjfaHNGP9G7yGFFfzg=", "owner": "rycee", "repo": "nur-expressions", - "rev": "c1ca3a49435407dddef89c07961c5ce40f66ff99", + "rev": "02c98c9ba4491db49ab759161fcc0ba9830d7aa0", "type": "gitlab" }, "original": { @@ -203,11 +203,11 @@ ] }, "locked": { - "lastModified": 1731604581, - "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", + "lastModified": 1731832479, + "narHash": "sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR+hT0=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", + "rev": "5056a1cf0ce7c2a08ab50713b6c4af77975f6111", "type": "github" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -312,11 +312,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -358,38 +358,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1730602179, - "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730602179, - "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nmd": { "inputs": { "nixpkgs": [ @@ -460,15 +428,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1731748189, - "narHash": "sha256-Zd/Uukvpcu26M6YGhpbsgqm6LUSLz+Q8mDZ5LOEGdiE=", + "lastModified": 1731854022, + "narHash": "sha256-lgOoC3t5Wp3LWgzIwhK0d6xfPgF6TaAzFzu9O4xVxpo=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d2bd7f433b28db6bc7ae03d5eca43564da0af054", + "rev": "0ec0d5d3c58ccafc622cb273e5458471931c65b6", "type": "github" }, "original": { @@ -481,15 +448,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1731748189, - "narHash": "sha256-Zd/Uukvpcu26M6YGhpbsgqm6LUSLz+Q8mDZ5LOEGdiE=", + "lastModified": 1731854022, + "narHash": "sha256-lgOoC3t5Wp3LWgzIwhK0d6xfPgF6TaAzFzu9O4xVxpo=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d2bd7f433b28db6bc7ae03d5eca43564da0af054", + "rev": "0ec0d5d3c58ccafc622cb273e5458471931c65b6", "type": "github" }, "original": { @@ -517,11 +483,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1731657386, - "narHash": "sha256-Mm/JL8tFUS1SOmmZDPcswExUxzw0VpHcEyZI1h58CGA=", + "lastModified": 1731849042, + "narHash": "sha256-AfK26eccWP7IUDAlCF/UzkwI8Ggg949CuTxGLEyiNNA=", "owner": "danth", "repo": "stylix", - "rev": "5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f", + "rev": "cf5be812bdc889f10ada644e4736138c5757e1e9", "type": "github" }, "original": { diff --git a/modules/programs/default.nix b/modules/programs/default.nix index 9072524..f6d3e21 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -20,7 +20,7 @@ in { inherit nixpath; }; users = { - "${username}" = import ./home.nix; + "${username}" = import ./user.nix; "root" = import ./root.nix; }; }; diff --git a/modules/programs/fastfetch/default.nix b/modules/programs/fastfetch/default.nix index ce688d3..97960bf 100644 --- a/modules/programs/fastfetch/default.nix +++ b/modules/programs/fastfetch/default.nix @@ -1,3 +1,29 @@ { - programs.fastfetch.enable = true; + programs.fastfetch = { + enable = true; + settings = { + logo = { + source = "nixos_small"; + padding = { + right = 3; + }; + }; + display = { + color = "blue"; + }; + modules = [ + "title" + "os" + "kernel" + "uptime" + "packages" + "shell" + "cpu" + "memory" + "disk" + "break" + "colors" + ]; + }; + }; } diff --git a/modules/programs/misc/default.nix b/modules/programs/misc/default.nix index f313187..9c8543c 100644 --- a/modules/programs/misc/default.nix +++ b/modules/programs/misc/default.nix @@ -14,7 +14,7 @@ yt-dlp wget cmatrix - cava + # cava nitch gotop sl diff --git a/modules/programs/root.nix b/modules/programs/root.nix index 2770346..2f7a063 100644 --- a/modules/programs/root.nix +++ b/modules/programs/root.nix @@ -1,4 +1,5 @@ { + home.enableNixpkgsReleaseCheck = false; imports = [ ./zsh ./helix diff --git a/modules/programs/home.nix b/modules/programs/user.nix similarity index 80% rename from modules/programs/home.nix rename to modules/programs/user.nix index 47de2b5..3aa7232 100644 --- a/modules/programs/home.nix +++ b/modules/programs/user.nix @@ -1,4 +1,5 @@ { + home.enableNixpkgsReleaseCheck = false; imports = [ ./bat ./cmus @@ -6,7 +7,6 @@ ./mail ./yazi ./zsh - # ./git ./helix ./newsboat ./zoxide