From 8aacb14fcab1ef1efd0458fb4a97e81ec852f472 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Tue, 3 Oct 2023 03:29:21 -0600 Subject: i've gone mad with power / attempted config from misterio77 to fix inputs errors // this created the default.nix files and commented out block in flake.nix // didn't work, misterio is insane / but misterio's nix-colors github tells you to pass it as a special arg into home-manager // was confused for a bit but got it as an extraSpecialArg cause of module bullshit /// good thing i had that old note or i'd have been stuck / now the inputs pass into home-manager // hoping to find a more elegant passthrough format / oh also moved home-manager's modules to modules folder because misterio does // probably because they're crazy but also because they've gone so deep it's somehow necessary for anything to work /// idk how or why, should have something to do with replacing/following default nix format? //// thus the default.nix files to add/override defaults? this is my longest commit message ever --- home-manager/btop.nix | 12 ------------ home-manager/helix.nix | 25 ------------------------- home-manager/home.nix | 8 ++++---- home-manager/shell.nix | 12 ------------ home-manager/starship.nix | 11 ----------- 5 files changed, 4 insertions(+), 64 deletions(-) delete mode 100644 home-manager/btop.nix delete mode 100644 home-manager/helix.nix delete mode 100644 home-manager/shell.nix delete mode 100644 home-manager/starship.nix (limited to 'home-manager') diff --git a/home-manager/btop.nix b/home-manager/btop.nix deleted file mode 100644 index 2c4e6cc..0000000 --- a/home-manager/btop.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ catppuccin-btop, ... }: { - home.file.".config/btop/themes".source = "${catppuccin-btop}/themes"; - - #replace htop/nmon - programs.btop = { - enable = true; - settings = { - color_theme = "catppuccin_mocha"; - theme_background = false; # make btop transparent - }; - }; -} diff --git a/home-manager/helix.nix b/home-manager/helix.nix deleted file mode 100644 index a8891a5..0000000 --- a/home-manager/helix.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, catppuccin-helix, ... }: { - # https://github.com/catppuccin/helix - xdg.configFile."helix/themes".source = "${catppuccin-helix}/themes/default"; - - programs.helix = { - enable = true; - package = pkgs.helix; - # defaultEditor = true; - settings = { - theme = "catppuccin_mocha"; - editor = { - line-number = "relative"; - cursorline = true; - color-modes = true; - lsp.display-messages = true; - cursor.shape = { - insert = "bar"; - normal = "block"; - select = "underline"; - }; - indent-guides.render = true; - }; - }; - }; -} diff --git a/home-manager/home.nix b/home-manager/home.nix index 898a7e5..fcc29fd 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -5,10 +5,10 @@ # in { imports = [ - ./starship.nix - ./btop.nix - ./helix.nix - ./shell.nix + ../modules/home-manager/starship.nix + ../modules/home-manager/btop.nix + ../modules/home-manager/helix.nix + ../modules/home-manager/shell.nix ]; nixpkgs = { diff --git a/home-manager/shell.nix b/home-manager/shell.nix deleted file mode 100644 index c86190e..0000000 --- a/home-manager/shell.nix +++ /dev/null @@ -1,12 +0,0 @@ -{nushell-scripts, ... }: { - programs.nushell = { - extraConfig = '' - use ${nushell-scripts}/custom-completions/pass/pass-completions.nu * - use ${nushell-scripts}/custom-completions/nix/nix-completions.nu * - use ${nushell-scripts}/custom-completions/man/man-completions.nu * - use ${nushell-scripts}/custom-completions/cargo/cargo-completions.nu * - use ${nushell-scripts}/custom-completions/make/make-completions.nu * - use ${nushell-scripts}/custom-completions/git/git-completions.nu * - ''; - }; -} diff --git a/home-manager/starship.nix b/home-manager/starship.nix deleted file mode 100644 index 3a1f085..0000000 --- a/home-manager/starship.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ catppuccin-starship, ... }: { - programs.starship = { - enable = true; - - settings = { - command_timeout = 1000; - - palette = "catppuccin_mocha"; - } ;#// builtins.fromTOML (builtins.readFile "${catppuccin-starship}/palettes/mocha.toml"); - }; -} \ No newline at end of file -- cgit v1.2.3