diff --git a/Catppuccin.png b/Catppuccin.png new file mode 100644 index 0000000..2e2b54b Binary files /dev/null and b/Catppuccin.png differ diff --git a/README.md b/README.md index b8599f3..5edc07d 100644 --- a/README.md +++ b/README.md @@ -4,17 +4,25 @@ My NixOS configurations with dotfiles for my desktop ![Screenshot of desktop](./assets/desktop.png) -## Includes +## Uses | | | -|--------|------------| +| ------ | ---------- | | WM | Hyprland | | Shell | Fish | | Prompt | Starship | | Theme | Catppuccin | +| GPU | NVidia | +| Panel | Hyprpanel | +| Runner | Rofi | +| Fetch | Fastfetch | + +Requires Nix-channel with [NixOS 24.11](https://nixos.org/) ## Commands +Scripts will not run unless the necessary packages have been added to the path, either in a shell or by running nixos-rebuild + Format all .nix files ```Shell @@ -36,3 +44,11 @@ Rebuild and switch Nix configuration ```Shell ./rebuild ``` + +Update and switch + +- Will update the flakes and nix-channel, then switch if there are no errors + +```Shell + ./update +``` diff --git a/home-manager/default.nix b/home-manager/default.nix index ee2fbc1..1bfa53e 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -17,6 +17,7 @@ in ./cursors.nix ./default-applications.nix ./development + ./fastfetch.nix ./fish.nix ./freetube.nix ./gtk.nix diff --git a/home-manager/fastfetch.nix b/home-manager/fastfetch.nix new file mode 100644 index 0000000..ac86767 --- /dev/null +++ b/home-manager/fastfetch.nix @@ -0,0 +1,57 @@ +{ + programs.fastfetch = { + enable = true; + settings = { + logo = { + source = "${../Catppuccin.png}"; + type = "kitty"; + height = 18; + padding.top = 2; + }; + display.separator = " "; + modules = + let + keyColor = "34"; + module = type: key: { + inherit type key keyColor; + }; + formatModule = type: key: format: { + inherit + type + key + format + keyColor + ; + }; + in + [ + "break" + "break" + { + type = "title"; + keyWidth = 10; + } + "break" + (module "os" " ") + (module "kernel" " ") + (formatModule "packages" " " "{} (nixpkgs)") + (module "shell" " ") + (module "terminal" " ") + (module "wm" " ") + (module "theme" " ") + (module "cursor" " ") + (module "terminalfont" " ") + (module "uptime" " ") + (formatModule "datetime" " " "{1}-{3}-{11}") + (module "cpu" " ") + (module "gpu" "󰤽 ") + (module "sound" " ") + (module "lm" " ") + "break" + "colors" + "break" + "break" + ]; + }; + }; +} diff --git a/modules/terminal/shell.nix b/modules/terminal/shell.nix index 0ea5375..c84a020 100644 --- a/modules/terminal/shell.nix +++ b/modules/terminal/shell.nix @@ -24,7 +24,8 @@ shellAliases = { # Transfer shell config to target device ssh = "kitty +kitten ssh"; - nix-shell = "nix-shell --run fish"; # Start nix-shells using fish + nix-shell = "nix-shell --run fish"; # Start nix-shells using fishcd + fetch = "fastfetch"; }; }; };