12-2023

doom/config.el

@@ -23,6 +23,8 @@
 ;;
 ;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light)
 ;;      doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13))
+(setq doom-font (font-spec :family "JetBrainsMono Nerd Font" :size 13 :weight 'regular)
+      doom-variable-pitch-font (font-spec :family "JetBrainsMono Nerd Font" :size 13))
 ;;
 ;; If you or Emacs can't find your font, use 'M-x describe-font' to look them
 ;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to

doom/init.el

@@ -44,7 +44,7 @@
        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
+       (treemacs +lsp)          ; a project drawer, like neotree but cooler
        ;;unicode           ; extended unicode support for various languages
        (vc-gutter +pretty) ; vcs diff in the fringe
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB
@@ -61,7 +61,7 @@
        ;;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
+       parinfer          ; turn lisp into python, sort of
        ;;rotate-text       ; cycle region at point between text candidates
        snippets          ; my elves. They type so I don't have to
        ;;word-wrap         ; soft wrapping with language-aware indent
@@ -74,7 +74,7 @@
        vc                ; version-control and Emacs, sitting in a tree
 
        :term
-       ;;eshell            ; the elisp shell that works everywhere
+       eshell            ; the elisp shell that works everywhere
        ;;shell             ; simple shell REPL for Emacs
        ;;term              ; basic terminal emulator for Emacs
        ;;vterm             ; the best terminal emulation in Emacs
@@ -88,7 +88,7 @@
        ;;ansible
        ;;biblio            ; Writes a PhD for you (citation needed)
        ;;collab            ; buffers with friends
-       ;;debugger          ; FIXME stepping through code, to help you add bugs
+       debugger          ; FIXME stepping through code, to help you add bugs
        ;;direnv
        ;;docker
        ;;editorconfig      ; let someone else argue about tabs vs spaces
@@ -96,17 +96,17 @@
        (eval +overlay)     ; run code, run (also, repls)
        ;;gist              ; interacting with github gists
        lookup              ; navigate your code and its documentation
-       ;;lsp               ; M-x vscode
+       (lsp +eglot)               ; M-x vscode
        magit             ; a git porcelain for Emacs
        ;;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
+       taskrunner        ; taskrunner for all your projects
        ;;terraform         ; infrastructure as code
        ;;tmux              ; an API for interacting with tmux
-       ;;tree-sitter       ; syntax and parsing, sitting in a tree...
+       tree-sitter       ; syntax and parsing, sitting in a tree...
        ;;upload            ; map local to remote projects via ssh/ftp
 
        :os
@@ -138,12 +138,12 @@
        ;;gdscript          ; the language you waited for
        ;;(go +lsp)         ; the hipster dialect
        ;;(graphql +lsp)    ; Give queries a REST
-       ;;(haskell +lsp)    ; a language that's lazier than I am
+       (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
-       ;;json              ; At least it ain't XML
+       json              ; At least it ain't XML
-       ;;(java +lsp)       ; the poster child for carpal tunnel syndrome
+       (java +lsp +tree-sitter)       ; the poster child for carpal tunnel syndrome
-       ;;javascript        ; all(hope(abandon(ye(who(enter(here))))))
+       (javascript +lsp)        ; all(hope(abandon(ye(who(enter(here))))))
        ;;julia             ; a better, faster MATLAB
        ;;kotlin            ; a better, slicker Java(Script)
        ;;latex             ; writing papers in Emacs has never been so fun
@@ -152,20 +152,20 @@
        ;;lua               ; one-based indices? one-based indices
        markdown          ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
-       ;;nix               ; I hereby declare "nix geht mehr!"
+       nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
        org               ; organize your plain life in plain text
        ;;php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
-       ;;python            ; beautiful is better than ugly
+       (python +lsp +pyright +pyenv)            ; beautiful is better than ugly
        ;;qt                ; the 'cutest' gui framework ever
        ;;racket            ; a DSL for DSLs
        ;;raku              ; the artist formerly known as perl6
-       ;;rest              ; Emacs as a REST client
+       rest              ; Emacs as a REST client
        ;;rst               ; ReST in peace
        ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       ;;(rust +lsp)       ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       (rust +lsp)       ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
        ;;(scheme +guile)   ; a fully conniving family of lisps
        sh                ; she sells {ba,z,fi}sh shells on the C xor

home-manager/home-tmux.nix

@@ -10,7 +10,9 @@ pkgs: {
     plugins = [
         {
             plugin = pkgs.tmuxPlugins.catppuccin;
-            extraConfig = "set -g @catppuccin_window_tabs_enabled on";
+            extraConfig = ''set -g @catppuccin_window_tabs_enabled on
+set -g @catppuccin_window_default_text "#W"
+set -g @catppuccin_window_current_text "#W"'';
         }
         {
             plugin = pkgs.tmuxPlugins.tmux-thumbs;

home-manager/home.nix

@@ -49,13 +49,15 @@
         pkgs.awscli
         pkgs.bashInteractive
         pkgs.du-dust
-        pkgs.emacs
+        pkgs.emacs29
         pkgs.fd
         pkgs.fend
-        # pkgs.ghc
+        pkgs.gh
+        pkgs.ghc
         # pkgs.go
         # pkgs.haskellPackages.cabal-install
-        # pkgs.haskellPackages.haskell-language-server
+        pkgs.haskellPackages.haskell-language-server
+        pkgs.helix
         # pkgs.httpie
         # pkgs.inconsolata-nerdfont
         pkgs.jdt-language-server
@@ -69,7 +71,7 @@
         pkgs.nodejs-16_x
         pkgs.nodePackages.typescript-language-server
         # pkgs.postgresql
-        (pkgs.python3.withPackages (p: [p.ipython]))
+        (pkgs.python3.withPackages (p: [p.ipython p.pyyaml p.boto3]))
         pkgs.ripgrep
         pkgs.rlwrap
         # pkgs.rust-analyzer
@@ -79,6 +81,7 @@
         # pkgs.rustup
         pkgs.sbcl
         # pkgs.source-code-pro
+        pkgs.stack
         pkgs.tokei
         pkgs.xh
         # pkgs.xonsh
@@ -103,7 +106,7 @@
     programs.bash.enable = true;
     programs.bat = import ./home-bat.nix pkgs;
     programs.btop.enable = true;
-    programs.exa = import ./home-exa.nix;
+    programs.eza = import ./home-exa.nix;
     programs.fish = import ./home-fish.nix pkgs;
     programs.fzf = import ./home-fzf.nix;
     # programs.gh.enable = true;

nixpkgs/config.nix

@@ -1,5 +1,5 @@
 {
     permittedInsecurePackages = [
-        "nodejs-16.20.0"
+        "nodejs-16.20.2"
     ];
 }

nvim/lua/config/lazy.lua

@@ -14,6 +14,7 @@ require("lazy").setup({
     { import = "lazyvim.plugins.extras.lang.typescript" },
     { import = "lazyvim.plugins.extras.lang.java" },
     { import = "lazyvim.plugins.extras.lang.json" },
+    { import = "lazyvim.plugins.extras.lang.python" },
     -- { import = "lazyvim.plugins.extras.ui.mini-animate" },
     { import = "lazyvim.plugins.extras.dap.core" },
     -- { import = "lazyvim.plugins.extras.editor.flash" },

nvim/lua/plugins/plugins.lua

@@ -1,11 +1,12 @@
 return {
   {
-    "goolord/alpha-nvim",
+    "nvimdev/dashboard-nvim",
+    enabled = false,
+  },
+  {
+    "stevearc/dressing.nvim",
     enabled = false,
   },
-  -- {
-  --   "stevearc/dressing.nvim",
-  -- },
   {
     "akinsho/bufferline.nvim",
     enabled = false,
@@ -23,7 +24,11 @@ return {
   --   enabled = false,
   -- },
   {
-    "windwp/nvim-spectre",
+    "nvim-pack/nvim-spectre",
+    enabled = false,
+  },
+  {
+    "persistence.nvim",
     enabled = false,
   },
   -- {
@@ -123,4 +128,42 @@ return {
       return opts
     end,
   },
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function(_, opts)
+        opts.ensure_installed = opts.ensure_installed or {}
+        vim.list_extend(opts.ensure_installed, { "sql" })
+    end,
+  },
+  {
+    "catppuccin/nvim",
+    name = "catppuccin",
+    opts = {
+        integrations = {
+            alpha = false,
+            navic = false,
+            lsp_trouble = false,
+            trouble = false,
+        }
+    }
+  },
+    {
+    "jackMort/ChatGPT.nvim",
+        event = "VeryLazy",
+        config = function()
+            require("chatgpt").setup({
+            show_quickfixes_cmd = "cope",
+            edit_with_instructions = {
+                keymaps = {
+                    use_output_as_input = "<C-r>",
+                },
+            },
+        })
+        end,
+        dependencies = {
+            "MunifTanjim/nui.nvim",
+            "nvim-lua/plenary.nvim",
+            "nvim-telescope/telescope.nvim"
+        },
+    },
 }