From f4fd6e9086428efb9cea11ea1f9b6b0613c68205 Mon Sep 17 00:00:00 2001 From: iFargle Date: Thu, 15 Feb 2024 21:05:32 +0900 Subject: [PATCH] remove emacs, add starship --- home-manager/common/software/cli/bash.nix | 8 +- home-manager/common/software/cli/default.nix | 2 +- .../software/cli/doom-emacs.d/config.el | 22 -- .../common/software/cli/doom-emacs.d/init.el | 193 ------------------ .../software/cli/doom-emacs.d/packages.el | 1 - .../common/software/cli/doom-emacs.nix | 17 -- home-manager/common/software/cli/neofetch.nix | 1 - .../common/software/cli/nixvim-base.nix | 2 +- .../starship-theme.nix => starship.nix} | 0 home-manager/small.nix | 1 + 10 files changed, 4 insertions(+), 243 deletions(-) delete mode 100644 home-manager/common/software/cli/doom-emacs.d/config.el delete mode 100644 home-manager/common/software/cli/doom-emacs.d/init.el delete mode 100644 home-manager/common/software/cli/doom-emacs.d/packages.el delete mode 100644 home-manager/common/software/cli/doom-emacs.nix rename home-manager/common/software/cli/{bash.d/starship-theme.nix => starship.nix} (100%) diff --git a/home-manager/common/software/cli/bash.nix b/home-manager/common/software/cli/bash.nix index 174aa0df..0fbebc31 100644 --- a/home-manager/common/software/cli/bash.nix +++ b/home-manager/common/software/cli/bash.nix @@ -30,12 +30,6 @@ ]; }; - imports = [ ./bash.d/starship-theme.nix ]; - programs = { - starship = { - enable = true; - enableBashIntegration = true; - }; bash = { enable = true; enableCompletion = true; @@ -51,7 +45,7 @@ # SSH_ASKPASS = ""; }; bashrcExtra = '' - restart-docker() { + docker-restart() { pushd /Storage/Data/docker-compose/sysctl.io docker stop $1 docker rm $1 diff --git a/home-manager/common/software/cli/default.nix b/home-manager/common/software/cli/default.nix index be520134..a45d2809 100644 --- a/home-manager/common/software/cli/default.nix +++ b/home-manager/common/software/cli/default.nix @@ -2,7 +2,7 @@ imports = [ ./bash.nix ./btop.nix - # ./doom-emacs.nix + ./starship.nix ./git.nix ./neofetch.nix ./ranger.nix diff --git a/home-manager/common/software/cli/doom-emacs.d/config.el b/home-manager/common/software/cli/doom-emacs.d/config.el deleted file mode 100644 index 9e5272e0..00000000 --- a/home-manager/common/software/cli/doom-emacs.d/config.el +++ /dev/null @@ -1,22 +0,0 @@ -;; Themes -;; (setq doom-theme 'gruvbox-dark-hard) -;; (setq doom-themes-treemacs-theme "doom-colors") - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; LSP Modules - ;; Bash - (use-package lsp-mode - :commands lsp - :hook - (sh-mode . lsp)) - - ;; Python - (defun lspython () - "Updates the lsp-python-ms-executable variable and runs lsp." - (interactive) - (setq lsp-python-ms-executable (executable-find "python-lsp-server")) - (lsp-deferred)) - - ;; Rust - (after! rustic - (setq rustic-lsp-server 'rls)) diff --git a/home-manager/common/software/cli/doom-emacs.d/init.el b/home-manager/common/software/cli/doom-emacs.d/init.el deleted file mode 100644 index 3ba2dc03..00000000 --- a/home-manager/common/software/cli/doom-emacs.d/init.el +++ /dev/null @@ -1,193 +0,0 @@ -;;; init.el -*- lexical-binding: t; -*- - -;; This file controls what Doom modules are enabled and what order they load -;; in. Remember to run 'doom sync' after modifying it! - -;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's -;; documentation. There you'll find a "Module Index" link where you'll find -;; a comprehensive list of Doom's modules and what flags they support. - -;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or -;; 'C-c c k' for non-vim users) to view its documentation. This works on -;; flags as well (those symbols that start with a plus). -;; -;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its -;; directory (for easy access to its source code). - -(doom! :input - ;;chinese - ;;japanese - ;;layout ; auie,ctsrnm is the superior home row - - :completion - company ; the ultimate code completion backend - ivy ; a search engine for love and life - vertico ; the search engine of the future - ;;ido ; the other *other* search engine... - ;;helm ; the *other* search engine for love and life - - :ui - doom ; what makes DOOM look the way it does - doom-dashboard ; a nifty splash screen for Emacs - ;;doom-quit ; DOOM quit-message prompts when you quit Emacs - (emoji +unicode) ; 🙂 - hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW - indent-guides ; highlighted indent columns - ligatures ; ligatures and symbols to make your code pretty again - minimap ; show a map of the code on the side - modeline ; snazzy, Atom-inspired modeline, plus API - nav-flash ; blink cursor line after big motions - ophints ; highlight the region an operation acts on - (popup +defaults) ; tame sudden yet inevitable temporary windows - ;; tabs ; a tab bar for Emacs - treemacs ; a project drawer, like neotree but cooler - vc-gutter ; vcs diff in the fringe - vi-tilde-fringe ; fringe tildes to mark beyond EOB - window-select ; visually switch windows - workspaces ; tab emulation, persistence & separate workspaces - zen ; distraction-free coding or writing - ;;unicode ; extended unicode support for various languages - ;;hydra - ;;neotree ; a project drawer, like NERDTree for vim - ;;deft ; notational velocity for Emacs - - :editor - (evil +everywhere) ; come to the dark side, we have cookies - file-templates ; auto-snippets for empty files - fold ; (nigh) universal code folding - snippets ; my elves. They type so I don't have to - - ;;(format +onsave) ; automated prettiness - ;;god ; run Emacs commands without modifier keys - ;;lispy ; vim for lisp, for people who don't like vim - ;;multiple-cursors ; editing in many places at once - ;;objed ; text object editing for the innocent - ;;parinfer ; turn lisp into python, sort of - ;;rotate-text ; cycle region at point between text candidates - ;;word-wrap ; soft wrapping with language-aware indent - - :emacs - dired ; making dired pretty [functional] - electric ; smarter, keyword-based electric-indent - ibuffer ; interactive buffer management - undo ; persistent, smarter undo for your inevitable mistakes - vc ; version-control and Emacs, sitting in a tree - - :term - vterm ; the best terminal emulation in Emacs - ;;eshell ; the elisp shell that works everywhere - ;;shell ; simple shell REPL for Emacs - ;;term ; basic terminal emulator for Emacs - - :checkers - syntax ; tasing you for every semicolon you forget - ;;(spell +flyspell) ; tasing you for misspelling mispelling - ;;grammar ; tasing grammar mistake every you make - - :tools - (eval +overlay) ; run code, run (also, repls) - lookup ; navigate your code and its documentation - lsp ; M-x vscode - magit ; a git porcelain for Emacs - ;;ansible - ;;biblio ; Writes a PhD for you (citation needed) - ;;debugger ; FIXME stepping through code, to help you add bugs - ;;direnv - ;;docker - ;;editorconfig ; let someone else argue about tabs vs spaces - ;;ein ; tame Jupyter notebooks with emacs - ;;gist ; interacting with github gists - ;;make ; run make tasks from Emacs - ;;pass ; password manager for nerds - ;;pdf ; pdf enhancements - ;;prodigy ; FIXME managing external services & code builders - ;;rgb ; creating color strings - ;;taskrunner ; taskrunner for all your projects - ;;terraform ; infrastructure as code - ;;tmux ; an API for interacting with tmux - ;;upload ; map local to remote projects via ssh/ftp - - :os - tty ; improve the terminal Emacs experience - - :lang - emacs-lisp ; drown in parentheses - json ; At least it ain't XML - markdown ; writing docs for people to ignore - javascript ; all(hope(abandon(ye(who(enter(here)))))) - nix ; I hereby declare "nix geht mehr!" - org ; organize your plain life in plain text - web ; the tubes - yaml ; JSON, but readable - (rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() - (python +lsp) ; beautiful is better than ugly - (sh +lsp) ; she sells {ba,z,fi}sh shells on the C xor - (nix +lsp) ; Nix LSP - - ;;agda ; types of types of types of types... - ;;beancount ; mind the GAAP - ;;cc ; C > C++ == 1 - ;;clojure ; java with a lisp - ;;common-lisp ; if you've seen one lisp, you've seen them all - ;;coq ; proofs-as-programs - ;;crystal ; ruby at the speed of c - ;;csharp ; unity, .NET, and mono shenanigans - ;;data ; config/data formats - ;;(dart +flutter) ; paint ui and not much else - ;;dhall - ;;elixir ; erlang done right - ;;elm ; care for a cup of TEA? - ;;erlang ; an elegant language for a more civilized age - ;;ess ; emacs speaks statistics - ;;factor - ;;faust ; dsp, but you get to keep your soul - ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) - ;;fsharp ; ML stands for Microsoft's Language - ;;fstar ; (dependent) types and (monadic) effects and Z3 - ;;gdscript ; the language you waited for - ;;(go +lsp) ; the hipster dialect - ;;(haskell +lsp) ; a language that's lazier than I am - ;;hy ; readability of scheme w/ speed of python - ;;idris ; a language you can depend on - ;;(java +meghanada) ; the poster child for carpal tunnel syndrome - ;;julia ; a better, faster MATLAB - ;;kotlin ; a better, slicker Java(Script) - ;;latex ; writing papers in Emacs has never been so fun - ;;lean ; for folks with too much to prove - ;;ledger ; be audit you can be - ;;lua ; one-based indices? one-based indices - ;;nim ; python + lisp at the speed of c - ;;ocaml ; an objective camel - ;;php ; perl's insecure younger brother - ;;plantuml ; diagrams for confusing people more - ;;purescript ; javascript, but functional - ;;qt ; the 'cutest' gui framework ever - ;;racket ; a DSL for DSLs - ;;raku ; the artist formerly known as perl6 - ;;rest ; Emacs as a REST client - ;;rst ; ReST in peace - ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - ;;scala ; java, but good - ;;(scheme +guile) ; a fully conniving family of lisps - ;;sml - ;;solidity ; do you need a blockchain? No. - ;;swift ; who asked for emoji variables? - ;;terra ; Earth and Moon in alignment for performance. - ;;zig ; C, but simpler - - :email - ;;(mu4e +org +gmail) - ;;notmuch - ;;(wanderlust +gmail) - - :app - ;;calendar - ;;emms - ;;everywhere ; *leave* Emacs!? You must be joking - ;;irc ; how neckbeards socialize - ;;(rss +org) ; emacs as an RSS reader - ;;twitter ; twitter client https://twitter.com/vnought - - :config - ;;literate - (default +bindings +smartparens)) diff --git a/home-manager/common/software/cli/doom-emacs.d/packages.el b/home-manager/common/software/cli/doom-emacs.d/packages.el deleted file mode 100644 index 0333185e..00000000 --- a/home-manager/common/software/cli/doom-emacs.d/packages.el +++ /dev/null @@ -1 +0,0 @@ -;; Themes - Test \ No newline at end of file diff --git a/home-manager/common/software/cli/doom-emacs.nix b/home-manager/common/software/cli/doom-emacs.nix deleted file mode 100644 index 725d60db..00000000 --- a/home-manager/common/software/cli/doom-emacs.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, system, inputs, ... }: { - imports = [ inputs.doom-emacs.hmModule ]; - programs.doom-emacs = { - emacsPackage = pkgs.emacs; - enable = true; - doomPrivateDir = ./doom-emacs.d; - }; - programs.ripgrep.enable = true; - - # Used for the LSP Python module - # https://github.com/doomemacs/doomemacs/tree/develop/modules/tools/lsp - home.packages = [ - pkgs.python311Packages.python-lsp-server - pkgs.rust-analyzer - pkgs.rnix-lsp - ]; -} \ No newline at end of file diff --git a/home-manager/common/software/cli/neofetch.nix b/home-manager/common/software/cli/neofetch.nix index ddc4f723..8554f8d2 100644 --- a/home-manager/common/software/cli/neofetch.nix +++ b/home-manager/common/software/cli/neofetch.nix @@ -24,7 +24,6 @@ print_info() { prin info "$(color 15)DE" de - prin "$(color 15)└$(color 6) Bar" "Waybar" prin diff --git a/home-manager/common/software/cli/nixvim-base.nix b/home-manager/common/software/cli/nixvim-base.nix index 21738ad3..2dad67f2 100644 --- a/home-manager/common/software/cli/nixvim-base.nix +++ b/home-manager/common/software/cli/nixvim-base.nix @@ -6,7 +6,7 @@ # https://github.com/nix-community/nixvim # Docs: - # + # https://nix-community.github.io/nixvim/ programs.nixvim = { enable = true; viAlias = true; diff --git a/home-manager/common/software/cli/bash.d/starship-theme.nix b/home-manager/common/software/cli/starship.nix similarity index 100% rename from home-manager/common/software/cli/bash.d/starship-theme.nix rename to home-manager/common/software/cli/starship.nix diff --git a/home-manager/small.nix b/home-manager/small.nix index c919b1fa..d9a71ccf 100644 --- a/home-manager/small.nix +++ b/home-manager/small.nix @@ -6,6 +6,7 @@ ./common/software/cli/nixvim-base.nix ./common/software/cli/ssh.nix ./common/software/cli/btop.nix + ./common/software/cli/starship.nix # User configs ./users/${username}