diff --git a/hosts/mba/default.nix b/hosts/mba/default.nix index 053fd76..4537777 100644 --- a/hosts/mba/default.nix +++ b/hosts/mba/default.nix @@ -24,9 +24,9 @@ home-manager = { backupFileExtension = "hnm"; + extraSpecialArgs = {inherit username email outputs;}; useGlobalPkgs = true; useUserPackages = true; - extraSpecialArgs = {inherit username email outputs;}; users.${username} = import ./home.nix; }; } diff --git a/hosts/mba/home.nix b/hosts/mba/home.nix index 4bcaee9..13054f3 100644 --- a/hosts/mba/home.nix +++ b/hosts/mba/home.nix @@ -6,13 +6,14 @@ ... }: { imports = [ - # ../../home-modules/alacritty.nix - ../../home-modules/git.nix - ../../home-modules/kitty.nix - ../../home-modules/nvim.nix - ../../home-modules/shell.nix - ../../home-modules/starship.nix - ../../home-modules/tmux.nix + # ../../modules/alacritty.nix + ../../modules/git.nix + ../../modules/kitty.nix + ../../modules/nvim.nix + ../../modules/shell.nix + ../../modules/starship.nix + ../../modules/tmux.nix + ../../modules/zed.nix ]; home.packages = [ @@ -24,8 +25,9 @@ pkgs.python314 # coz awsebcli requires python in $PATH pkgs.pnpm - pkgs.discord # not working without overlays (darwin sucks) + pkgs.discord # nigga ain't working properly pkgs.redis + pkgs.zed-editor ]; nixpkgs = { diff --git a/hosts/mba/mac-apps.nix b/hosts/mba/mac-apps.nix index d49a4d2..daae4c4 100644 --- a/hosts/mba/mac-apps.nix +++ b/hosts/mba/mac-apps.nix @@ -3,9 +3,7 @@ config, ... }: { - environment.systemPackages = [ - pkgs.fastfetch - ]; + environment.systemPackages = []; environment.variables = { MANPAGER = "nvim +Man!"; @@ -32,12 +30,12 @@ caskArgs = { appdir = "/Applications"; - require_sha = true; - } + # require_sha = true; + }; # darwin support for packages sucks casks = [ - "firefox" + "firefox" # some dependancy issue "raycast" "obsidian" "spotify" @@ -57,6 +55,6 @@ cleanup = "zap"; }; - taps = [] + taps = []; }; } diff --git a/hosts/mba/nix.nix b/hosts/mba/nix.nix index 14bfdb4..2b8025f 100644 --- a/hosts/mba/nix.nix +++ b/hosts/mba/nix.nix @@ -8,8 +8,7 @@ nixpkgs.config.allowUnfree = true; # Cross-compile GNU/Linux binaries, or even full GNU/Linux system images - # from someone's config, could be useful but idk - # nix.linux-builder.enable = true; + nix.linux-builder.enable = true; nix.settings.experimental-features = "nix-command flakes"; @@ -20,7 +19,7 @@ nix.gc = { user = "root"; automatic = lib.mkDefault true; - options = lib.mkDefault "--delete-older-than 7d"; + options = lib.mkDefault "--delete-older-than 4d"; }; # Disable auto-optimise-store because of this issue: diff --git a/home-modules/alacritty.nix b/modules/alacritty.nix similarity index 97% rename from home-modules/alacritty.nix rename to modules/alacritty.nix index 7dddc8d..e15def5 100644 --- a/home-modules/alacritty.nix +++ b/modules/alacritty.nix @@ -1,4 +1,4 @@ -{config, ...}: { +{...}: { programs.alacritty = { enable = true; settings = { @@ -18,8 +18,6 @@ size = 16; }; - general.live_config_reload = true; - mouse.hide_when_typing = true; selection.save_to_clipboard = true; diff --git a/modules/fastfetch.nix b/modules/fastfetch.nix new file mode 100644 index 0000000..0da56bf --- /dev/null +++ b/modules/fastfetch.nix @@ -0,0 +1,115 @@ +{...}: { + programs.fastfetch = { + enable = true; + + settings = { + logo = { + padding = { + top = 2; + }; + }; + + display = { + separator = " ➜ "; + }; + + modules = [ + "break" + "break" + "break" + { + type = "os"; + key = "OS "; + keyColor = "red"; + } + { + type = "kernel"; + key = " ├  "; + keyColor = "red"; + } + { + type = "shell"; + key = " └  "; + keyColor = "red"; + } + "break" + { + type = "wm"; + key = "WM "; + keyColor = "green"; + } + { + type = "wmtheme"; + key = " ├ 󰉼 "; + keyColor = "green"; + } + { + type = "icons"; + key = " ├ 󰀻 "; + keyColor = "green"; + } + { + type = "cursor"; + key = " ├  "; + keyColor = "green"; + } + { + type = "terminal"; + key = " ├  "; + keyColor = "green"; + } + { + type = "terminalfont"; + key = " └  "; + keyColor = "green"; + } + "break" + { + type = "host"; + format = "{5} {1} Type {2}"; + key = "PC "; + keyColor = "yellow"; + } + { + type = "cpu"; + format = "{1} ({3}) @ {7} GHz"; + key = " ├  "; + keyColor = "yellow"; + } + { + type = "gpu"; + format = "{1} {2} @ {12} GHz"; + key = " ├ 󰢮 "; + keyColor = "yellow"; + } + { + type = "uptime"; + key = " └  "; + keyColor = "yellow"; + } + { + type = "memory"; + key = " ├  "; + keyColor = "yellow"; + } + { + type = "swap"; + key = " ├ 󰓡 "; + keyColor = "yellow"; + } + { + type = "disk"; + key = " ├ 󰋊 "; + keyColor = "yellow"; + } + { + type = "monitor"; + key = " └  "; + keyColor = "yellow"; + } + "break" + "break" + ]; + }; + }; +} diff --git a/home-modules/git.nix b/modules/git.nix similarity index 98% rename from home-modules/git.nix rename to modules/git.nix index 739137b..c9f06fe 100644 --- a/home-modules/git.nix +++ b/modules/git.nix @@ -1,5 +1,4 @@ { - lib, username, email, ... diff --git a/home-modules/kitty.nix b/modules/kitty.nix similarity index 100% rename from home-modules/kitty.nix rename to modules/kitty.nix diff --git a/home-modules/nvim.nix b/modules/nvim.nix similarity index 100% rename from home-modules/nvim.nix rename to modules/nvim.nix diff --git a/home-modules/shell.nix b/modules/shell.nix similarity index 100% rename from home-modules/shell.nix rename to modules/shell.nix diff --git a/home-modules/starship.nix b/modules/starship.nix similarity index 99% rename from home-modules/starship.nix rename to modules/starship.nix index 395c176..b581926 100644 --- a/home-modules/starship.nix +++ b/modules/starship.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{...}: { programs.starship = { enable = true; settings = { diff --git a/home-modules/tmux.nix b/modules/tmux.nix similarity index 100% rename from home-modules/tmux.nix rename to modules/tmux.nix diff --git a/modules/zed.nix b/modules/zed.nix new file mode 100644 index 0000000..cba9f8f --- /dev/null +++ b/modules/zed.nix @@ -0,0 +1,63 @@ +{...}: { + programs.zed-editor = { + enable = true; + + extensions = []; + + userSettings = { + auto_update = false; + + buffer_font_size = 14; + buffer_font_family = "JetBrainsMono Nerd Font"; + + languages = { + "TypeScript" = { + code_actions_on_format = { + source.fixAll.eslint = true; + source.organizeImports = true; + }; + formatter = "prettier"; + }; + }; + + tab_bar = { + show_nav_history_buttons = false; + }; + + tabs = { + file_icons = true; + git_status = true; + }; + + telemetery = { + diagnostics = false; + metrics = false; + }; + + terminal = { + font_size = 13; + line_height = "standard"; + toolbar = { + breadcrumbs = false; + }; + }; + + theme = { + mode = "dark"; + light = "Rosé Pine"; + dark = "Rosé Pine"; + }; + + toolbar = { + breadcrumbs = false; + quick_actions = false; + }; + + ui_font_size = 14; + + ui_font_family = "JetBrainsMono Nerd Font"; + + vim_mode = true; + }; + }; +}