From cc7aa6df6a855495696ab5da87ed5a9fe616c909 Mon Sep 17 00:00:00 2001 From: lsoriano-mcm Date: Mon, 23 Jun 2025 16:46:05 -0500 Subject: [PATCH] upd --- flake.nix | 6 +- {dotfiles => home}/desktop.nix | 0 {dotfiles => home}/gaming.nix | 0 {dotfiles => home}/headless.nix | 0 {dotfiles => home}/macos.nix | 4 +- hosts/macos/darwin.nix | 5 +- hosts/server/configuration.nix | 0 modules/console.nix | 6 ++ modules/dev.nix | 6 ++ packages/fastfetch/default.nix | 131 ++++++++++++++++++++++++++++++++ packages/git/default.nix | 10 +++ packages/starship/default.nix | 62 +++++++++++++++ system/dev/dev.nix | 15 ++++ system/dev/python.nix | 9 +++ system/dev/tools.nix | 9 +++ 15 files changed, 256 insertions(+), 7 deletions(-) rename {dotfiles => home}/desktop.nix (100%) rename {dotfiles => home}/gaming.nix (100%) rename {dotfiles => home}/headless.nix (100%) rename {dotfiles => home}/macos.nix (60%) create mode 100644 hosts/server/configuration.nix create mode 100644 modules/dev.nix create mode 100644 packages/fastfetch/default.nix create mode 100644 packages/git/default.nix create mode 100644 packages/starship/default.nix create mode 100644 system/dev/dev.nix create mode 100644 system/dev/python.nix create mode 100644 system/dev/tools.nix diff --git a/flake.nix b/flake.nix index c1cf404..df92873 100644 --- a/flake.nix +++ b/flake.nix @@ -85,7 +85,7 @@ ]; }; extraSpecialArgs = args; - modules = [./dotfiles/desktop.nix]; + modules = [./home/desktop.nix]; }; gaming = home-manager.lib.homeManagerConfiguration { @@ -94,7 +94,7 @@ overlays = []; }; extraSpecialArgs = args; - modules = [./dotfiles/gaming.nix]; + modules = [./home/gaming.nix]; }; headless = home-manager.lib.homeManagerConfiguration { pkgs = import nixpkgs { @@ -102,7 +102,7 @@ overlays = []; }; extraSpecialArgs = args; - modules = [./dotfiles/headless.nix]; + modules = [./home/headless.nix]; }; }; # darwinConfiguration for macOS M series diff --git a/dotfiles/desktop.nix b/home/desktop.nix similarity index 100% rename from dotfiles/desktop.nix rename to home/desktop.nix diff --git a/dotfiles/gaming.nix b/home/gaming.nix similarity index 100% rename from dotfiles/gaming.nix rename to home/gaming.nix diff --git a/dotfiles/headless.nix b/home/headless.nix similarity index 100% rename from dotfiles/headless.nix rename to home/headless.nix diff --git a/dotfiles/macos.nix b/home/macos.nix similarity index 60% rename from dotfiles/macos.nix rename to home/macos.nix index 8add7f3..500e01e 100644 --- a/dotfiles/macos.nix +++ b/home/macos.nix @@ -5,9 +5,7 @@ ... }: { imports = [ - ../packages/fish/default.nix - ../packages/kitty/default.nix - ../packages/neovim/default.nix + ../modules/console.nix ]; programs.home-manager.enable = true; diff --git a/hosts/macos/darwin.nix b/hosts/macos/darwin.nix index 387626d..9bee1b3 100644 --- a/hosts/macos/darwin.nix +++ b/hosts/macos/darwin.nix @@ -4,6 +4,9 @@ general, ... }: { + imports = [ + ../../modules/dev.nix + ]; # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget environment.systemPackages = with pkgs; [ @@ -35,5 +38,5 @@ shell = pkgs.${general.terminal.Shell}; }; - home-manager.users.${general.Username} = import ../../dotfiles/macos.nix; + home-manager.users.${general.Username} = import ../../home/macos.nix; } diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix new file mode 100644 index 0000000..e69de29 diff --git a/modules/console.nix b/modules/console.nix index 65740a9..a204a35 100644 --- a/modules/console.nix +++ b/modules/console.nix @@ -1,4 +1,10 @@ {...}: { imports = [ + ../packages/git/default.nix + ../packages/fish/default.nix + ../packages/kitty/default.nix + ../packages/neovim/default.nix + ../packages/starship/default.nix + ../packages/fastfetch/default.nix ]; } diff --git a/modules/dev.nix b/modules/dev.nix new file mode 100644 index 0000000..21b5a94 --- /dev/null +++ b/modules/dev.nix @@ -0,0 +1,6 @@ +{...}: { + imports = [ + ../system/dev/tools.nix + ../system/dev/python.nix + ]; +} diff --git a/packages/fastfetch/default.nix b/packages/fastfetch/default.nix new file mode 100644 index 0000000..0e09cb7 --- /dev/null +++ b/packages/fastfetch/default.nix @@ -0,0 +1,131 @@ +{ + programs.fastfetch = { + enable = true; + + settings = { + logo = { + padding = { + top = 2; + left = 1; + right = 2; + }; + }; + + display = { + separator = " "; + }; + + modules = [ + # Title + { + type = "title"; + format = "{#1}╭───────────── {#}{user-name-colored}"; + } + + # System Information Header + { + type = "custom"; + format = "{#1}│ {#}System Information"; + } + { + type = "os"; + key = "│ {#keys}󰍹 OS"; + } + { + type = "kernel"; + key = "│ {#keys}󰒋 Kernel"; + } + { + type = "uptime"; + key = "│ {#keys}󰅐 Uptime"; + } + { + type = "packages"; + key = "│ {#keys}󰏖 Packages"; + format = "{all}"; + } + + { + type = "custom"; + format = "{#1}│"; + } + + # Desktop Environment + { + type = "custom"; + format = "{#1}│ {#}Desktop Environment"; + } + { + type = "de"; + key = "│ {#keys}󰧨 DE"; + } + { + type = "wm"; + key = "│ {#keys}󱂬 WM"; + } + { + type = "wmtheme"; + key = "│ {#keys}󰉼 Theme"; + } + { + type = "display"; + key = "│ {#keys}󰹑 Resolution"; + } + { + type = "shell"; + key = "│ {#keys}󰞷 Shell"; + } + { + type = "terminalfont"; + key = "│ {#keys}󰛖 Font"; + } + + { + type = "custom"; + format = "{#1}│"; + } + + # Hardware Information + { + type = "custom"; + format = "{#1}│ {#}Hardware Information"; + } + { + type = "cpu"; + key = "│ {#keys}󰻠 CPU"; + } + { + type = "gpu"; + key = "│ {#keys}󰢮 GPU"; + } + { + type = "memory"; + key = "│ {#keys}󰍛 Memory"; + } + { + type = "disk"; + key = "│ {#keys}󰋊 Disk (/)"; + folders = "/"; + } + + { + type = "custom"; + format = "{#1}│"; + } + + # Colors + { + type = "colors"; + key = "│"; + symbol = "circle"; + } + + # Footer + { + type = "custom"; + format = "{#1}╰───────────────────────────────╯"; + } + ]; + }; + }; +} diff --git a/packages/git/default.nix b/packages/git/default.nix new file mode 100644 index 0000000..e046917 --- /dev/null +++ b/packages/git/default.nix @@ -0,0 +1,10 @@ +{general, ...}: { + programs.git = { + enable = true; + extraConfig = { + user.name = "${general.gitProfile.user}"; + user.email = "${general.gitProfile.email}"; + init.defaultBranch = "${general.gitProfile.defaultBranch}"; + }; + }; +} diff --git a/packages/starship/default.nix b/packages/starship/default.nix new file mode 100644 index 0000000..1a73a8a --- /dev/null +++ b/packages/starship/default.nix @@ -0,0 +1,62 @@ +{lib, ...}: { + programs.starship = { + enable = true; + settings = { + format = lib.concatStrings [ + "$username" + "$hostname" + "$directory" + "$git_branch" + "$git_state" + "$git_status" + "$cmd_duration" + "$line_break" + "$python" + "$character" + ]; + + directory = { + style = "blue"; + }; + + character = { + success_symbol = "[→](purple)"; + error_symbol = "[→](red)"; + vimcmd_symbol = "[←](green)"; + }; + + git_branch = { + format = "[$branch]($style)"; + style = "bright-black"; + }; + git_status = { + format = "[(*$conflicted$untracked$modified$staged$renamed$deleted) $ahead_behind$stashed]($style)"; + style = "cyan"; + conflicted = "​"; + untracked = "​"; + modified = "​"; + staged = "​"; + renamed = "​"; + deleted = "​"; + stashed = "≡"; + }; + git_state = { + format = "([$state( $progress_current/$progress_total)]($style)) "; + style = "bright-black"; + }; + + cmd_duration = { + format = "[$duration]($style) "; + style = "yellow"; + }; + + python = { + format = "[$virtualenv]($style) "; + style = "bright-black"; + }; + }; + }; + # home.file.".config/starship.toml" = { + # source = builtins.toPath ./pure.toml; + # }; +} diff --git a/system/dev/dev.nix b/system/dev/dev.nix new file mode 100644 index 0000000..abc1620 --- /dev/null +++ b/system/dev/dev.nix @@ -0,0 +1,15 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + python3 + python3Packages.pip + python3Packages.pygobject3 + python3Packages.setuptools + python3Packages.wheel + + git + p7zip + busybox + tldr + jq + ]; +} diff --git a/system/dev/python.nix b/system/dev/python.nix new file mode 100644 index 0000000..0b197a0 --- /dev/null +++ b/system/dev/python.nix @@ -0,0 +1,9 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + python3 + python3Packages.pip + python3Packages.pygobject3 + python3Packages.setuptools + python3Packages.wheel + ]; +} diff --git a/system/dev/tools.nix b/system/dev/tools.nix new file mode 100644 index 0000000..152623d --- /dev/null +++ b/system/dev/tools.nix @@ -0,0 +1,9 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + git + p7zip + busybox + tldr + jq + ]; +}