still won't work

testing
use pkgs.stdenv.hostPlatform
2023-08-22 08:13:35 -04:00 · 2023-08-22 08:13:35 -04:00 · 2023-08-22 08:13:35 -04:00 · 2023-08-22 08:13:34 -04:00 · 2023-08-22 08:13:24 -04:00 · 2023-08-22 08:13:23 -04:00
9 changed files with 583 additions and 65 deletions
--- a/emacs/emacs.doom/init.el
+++ b/emacs/emacs.doom/init.el
@ -25,14 +25,14 @@
       ;;helm              ; the *other* search engine for love and life
       ;;ido               ; the other *other* search engine...
       ;; (ivy +childframe +fuzzy +icons +prescient)               ; a search engine for love and life
-       (vertico +icons)           ; the search engine of the future
+       (vertico)           ; the search engine of the future

       :ui
       ;;deft              ; notational velocity for Emacs
       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 +github)  ; 🙂
+       (emoji +github)  ; 🙂
       hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
       hydra
       indent-guides     ; highlighted indent columns
@ -67,7 +67,7 @@
       word-wrap         ; soft wrapping with language-aware indent

       :emacs
-       (dired +icons)             ; making dired pretty [functional]
+       (dired)             ; making dired pretty [functional]
       electric          ; smarter, keyword-based electric-indent
       ;;ibuffer         ; interactive buffer management
       (undo +tree)              ; persistent, smarter undo for your inevitable mistakes
--- a/flake.lock
+++ b/flake.lock
@ -8,11 +8,11 @@
        "pre-commit-hooks": "pre-commit-hooks"
      },
      "locked": {
-        "lastModified": 1690638457,
-        "narHash": "sha256-3EBd8PHd0lbSCMief9eQdzTOvEofnB3koR+Q4wvvDbA=",
+        "lastModified": 1692462990,
+        "narHash": "sha256-0hzA1DzbBfy6Yw4mb0FovRcP1+64AIRKGMSvaQiMctc=",
        "owner": "cachix",
        "repo": "devenv",
-        "rev": "da313abf0fb6d21210f6d555acabf40425e080f1",
+        "rev": "49ebb9b0a85949f364bacf0088c4142ed451f59e",
        "type": "github"
      },
      "original": {
--- a/nix/home-manager/flake.lock
+++ b/nix/home-manager/flake.lock
@ -22,6 +22,152 @@
        "type": "github"
      }
    },
+    "doom-emacs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1662497747,
+        "narHash": "sha256-4n7E1fqda7cn5/F2jTkOnKw1juG6XMS/FI9gqODL3aU=",
+        "owner": "doomemacs",
+        "repo": "doomemacs",
+        "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "doomemacs",
+        "repo": "doomemacs",
+        "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac",
+        "type": "github"
+      }
+    },
+    "doom-snippets": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1676839496,
+        "narHash": "sha256-1Ay9zi0u1lycmEeFqIxr0RWH+JvH9BnzgRzkPeWEAYY=",
+        "owner": "doomemacs",
+        "repo": "snippets",
+        "rev": "fe4003014ae00b866f117cb193f711fd9d72fd11",
+        "type": "github"
+      },
+      "original": {
+        "owner": "doomemacs",
+        "repo": "snippets",
+        "type": "github"
+      }
+    },
+    "emacs-overlay": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1676366521,
+        "narHash": "sha256-i4UAY8t9Au9SJtsgYppa3NHSVf1YkV6yqnNIQd+Km4g=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501",
+        "type": "github"
+      }
+    },
+    "emacs-so-long": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1575031854,
+        "narHash": "sha256-xIa5zO0ZaToDrec1OFjBK6l39AbA4l/CE4LInVu2hi0=",
+        "owner": "hlissner",
+        "repo": "emacs-so-long",
+        "rev": "ed666b0716f60e8988c455804de24b55919e71ca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hlissner",
+        "repo": "emacs-so-long",
+        "type": "github"
+      }
+    },
+    "evil-escape": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1588439096,
+        "narHash": "sha256-aB2Ge5o/93B18tPf4fN1c+O46CNh/nOqwLJbox4c8Gw=",
+        "owner": "hlissner",
+        "repo": "evil-escape",
+        "rev": "819f1ee1cf3f69a1ae920e6004f2c0baeebbe077",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hlissner",
+        "repo": "evil-escape",
+        "type": "github"
+      }
+    },
+    "evil-markdown": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1626852210,
+        "narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=",
+        "owner": "Somelauw",
+        "repo": "evil-markdown",
+        "rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Somelauw",
+        "repo": "evil-markdown",
+        "type": "github"
+      }
+    },
+    "evil-org-mode": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1607203864,
+        "narHash": "sha256-JxwqVYDN6OIJEH15MVI6XOZAPtUWUhJQWHyzcrUvrFg=",
+        "owner": "hlissner",
+        "repo": "evil-org-mode",
+        "rev": "a9706da260c45b98601bcd72b1d2c0a24a017700",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hlissner",
+        "repo": "evil-org-mode",
+        "type": "github"
+      }
+    },
+    "evil-quick-diff": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1575189609,
+        "narHash": "sha256-oGzl1ayW9rIuq0haoiFS7RZsS8NFMdEA7K1BSozgnJU=",
+        "owner": "rgrinberg",
+        "repo": "evil-quick-diff",
+        "rev": "69c883720b30a892c63bc89f49d4f0e8b8028908",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rgrinberg",
+        "repo": "evil-quick-diff",
+        "type": "github"
+      }
+    },
+    "explain-pause-mode": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1595842060,
+        "narHash": "sha256-++znrjiDSx+cy4okFBBXUBkRFdtnE2x+trkmqjB3Njs=",
+        "owner": "lastquestion",
+        "repo": "explain-pause-mode",
+        "rev": "2356c8c3639cbeeb9751744dbe737267849b4b51",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lastquestion",
+        "repo": "explain-pause-mode",
+        "type": "github"
+      }
+    },
    "flake-compat": {
      "flake": false,
      "locked": {
@ -38,6 +184,22 @@
        "type": "github"
      }
    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
    "flake-utils": {
      "locked": {
        "lastModified": 1667395993,
@ -58,11 +220,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
        "type": "github"
      },
      "original": {
@ -89,6 +251,41 @@
        "type": "github"
      }
    },
+    "flake-utils_4": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "format-all": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1581716637,
+        "narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=",
+        "owner": "lassik",
+        "repo": "emacs-format-all-the-code",
+        "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lassik",
+        "repo": "emacs-format-all-the-code",
+        "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
+        "type": "github"
+      }
+    },
    "gitignore": {
      "inputs": {
        "nixpkgs": [
@ -118,11 +315,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1691039228,
-        "narHash": "sha256-iPNZJ1LvfUf1Y456ewC0DXgf99TNssG8OLObOyqxO6M=",
+        "lastModified": 1692686040,
+        "narHash": "sha256-4GkXTC7sXpEL40QbJip49qsINAH+aKSciPT/1Pz6hfM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "86dd48d70a2e2c17e84e747ba4faa92453e68d4a",
+        "rev": "ea59b79f31beaf4a8cb0ea2fc4dfba5732e4212a",
        "type": "github"
      },
      "original": {
@ -171,6 +368,48 @@
        "type": "github"
      }
    },
+    "nix-doom-emacs": {
+      "inputs": {
+        "doom-emacs": "doom-emacs",
+        "doom-snippets": "doom-snippets",
+        "emacs-overlay": "emacs-overlay",
+        "emacs-so-long": "emacs-so-long",
+        "evil-escape": "evil-escape",
+        "evil-markdown": "evil-markdown",
+        "evil-org-mode": "evil-org-mode",
+        "evil-quick-diff": "evil-quick-diff",
+        "explain-pause-mode": "explain-pause-mode",
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_2",
+        "format-all": "format-all",
+        "nix-straight": "nix-straight",
+        "nixpkgs": "nixpkgs_2",
+        "nose": "nose",
+        "ob-racket": "ob-racket",
+        "org": "org",
+        "org-contrib": "org-contrib",
+        "org-yt": "org-yt",
+        "php-extras": "php-extras",
+        "revealjs": "revealjs",
+        "rotate-text": "rotate-text",
+        "sln-mode": "sln-mode",
+        "ts-fold": "ts-fold",
+        "ws-butler": "ws-butler"
+      },
+      "locked": {
+        "lastModified": 1689075996,
+        "narHash": "sha256-NwBzz2CHNtT0oDqAGewByQ5OFnAWf+ewHUrK0F44xZk=",
+        "owner": "nix-community",
+        "repo": "nix-doom-emacs",
+        "rev": "9a5b34d9ba30842eb8f0d7deb08bf03a75930471",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-doom-emacs",
+        "type": "github"
+      }
+    },
    "nix-flake-tests": {
      "locked": {
        "lastModified": 1677844186,
@ -216,11 +455,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1690687539,
-        "narHash": "sha256-Lnwz9XKtshm+5OeWqCbj/3tKuKK+DL5tUTdKSRrKBlY=",
+        "lastModified": 1692503351,
+        "narHash": "sha256-FdG0wnizM9mAUgi58KP1tXaX4ogVooPDS6VwsGEqZ9s=",
        "owner": "Mic92",
        "repo": "nix-index-database",
-        "rev": "d74b8171153ae35d7d323a9b1ad6c4cf7a995591",
+        "rev": "4becac130db930e9de8c3fe58bfa245c119b9eeb",
        "type": "github"
      },
      "original": {
@ -229,9 +468,25 @@
        "type": "github"
      }
    },
+    "nix-straight": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1666982610,
+        "narHash": "sha256-xjgIrmUsekVTE+MpZb5DMU8DQf9DJ/ZiR0o30L9/XCc=",
+        "owner": "nix-community",
+        "repo": "nix-straight.el",
+        "rev": "ad10364d64f472c904115fd38d194efe1c3f1226",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-straight.el",
+        "type": "github"
+      }
+    },
    "nixneovim": {
      "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
        "home-manager": [
          "home-manager"
        ],
@ -244,11 +499,11 @@
        "nmt": "nmt"
      },
      "locked": {
-        "lastModified": 1690726695,
-        "narHash": "sha256-h0azAgBLlS8i6RpEjWK7fwLVKhlmbs02OGojsH29Jqo=",
+        "lastModified": 1692658406,
+        "narHash": "sha256-GaeLpn+Z9Wu4mUamWJ3MnAluPA6OQKcf8EEb3ddtyd4=",
        "owner": "nixneovim",
        "repo": "nixneovim",
-        "rev": "69ade92b8d90658b45c7c915262725ec66a25d6b",
+        "rev": "cd6810328a335a5f465f9c491d2f7e81f35bba11",
        "type": "github"
      },
      "original": {
@ -270,11 +525,11 @@
        "poetry2nix": "poetry2nix"
      },
      "locked": {
-        "lastModified": 1690726628,
-        "narHash": "sha256-0G9oLqGzA5MRoYjBWTEH1hyKmHfzfwxmRfLAYbWl1jQ=",
+        "lastModified": 1692541027,
+        "narHash": "sha256-i0mOmB/BLGdTVDYz0Rf5X/ZzTm6hAKPHU45+AiymiBg=",
        "owner": "nixneovim",
        "repo": "nixneovimplugins",
-        "rev": "a4c09b64a0f7be0e8d26ecacc5cf1ba1f8a24d22",
+        "rev": "7579fd74721c328e9ab88c04523374730ceb4168",
        "type": "github"
      },
      "original": {
@ -333,11 +588,26 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1691006197,
-        "narHash": "sha256-DbtxVWPt+ZP5W0Usg7jAyTomIM//c3Jtfa59Ht7AV8s=",
+        "lastModified": 1682566018,
+        "narHash": "sha256-HPzPRFiy2o/7k7mtnwfM1E6NVZHiFbPdmYCMoIpkHO4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8e3b64db39f2aaa14b35ee5376bd6a2e707cadc2",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixpkgs-unstable",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1692447944,
+        "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "66aedfd010204949cb225cf749be08cb13ce1813",
+        "rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d",
        "type": "github"
      },
      "original": {
@ -379,9 +649,105 @@
        "type": "github"
      }
    },
+    "nose": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1400604510,
+        "narHash": "sha256-daEi8Kta1oGaDEmUUDDQMahTTPOpvNpDKk22rlr7cB0=",
+        "owner": "emacsattic",
+        "repo": "nose",
+        "rev": "f8528297519eba911696c4e68fa88892de9a7b72",
+        "type": "github"
+      },
+      "original": {
+        "owner": "emacsattic",
+        "repo": "nose",
+        "type": "github"
+      }
+    },
+    "ob-racket": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1584656173,
+        "narHash": "sha256-rBUYDDCXb+3D4xTPQo9UocbTPZ32kWV1Uya/1DmZknU=",
+        "owner": "xchrishawk",
+        "repo": "ob-racket",
+        "rev": "83457ec9e1e96a29fd2086ed19432b9d75787673",
+        "type": "github"
+      },
+      "original": {
+        "owner": "xchrishawk",
+        "repo": "ob-racket",
+        "type": "github"
+      }
+    },
+    "org": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1683136293,
+        "narHash": "sha256-PMHNr3Qo62uqO5IUDAfxUoqa4Zvb9y2J76pRYDB/6Y4=",
+        "owner": "emacs-straight",
+        "repo": "org-mode",
+        "rev": "080710797ad25e76c4556d2b03cc0aa5313cd187",
+        "type": "github"
+      },
+      "original": {
+        "owner": "emacs-straight",
+        "repo": "org-mode",
+        "type": "github"
+      }
+    },
+    "org-contrib": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1675694242,
+        "narHash": "sha256-4Fn33CTVTCqh5TyVAggSr8Fm8/hB8Xgl+hkxh3WCrI8=",
+        "owner": "emacsmirror",
+        "repo": "org-contrib",
+        "rev": "fff6c888065588527b1c1d7dd7e41c29ef767e17",
+        "type": "github"
+      },
+      "original": {
+        "owner": "emacsmirror",
+        "repo": "org-contrib",
+        "type": "github"
+      }
+    },
+    "org-yt": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1527381913,
+        "narHash": "sha256-dzQ6B7ryzatHCTLyEnRSbWO0VUiX/FHYnpHTs74aVUs=",
+        "owner": "TobiasZawada",
+        "repo": "org-yt",
+        "rev": "40cc1ac76d741055cbefa13860d9f070a7ade001",
+        "type": "github"
+      },
+      "original": {
+        "owner": "TobiasZawada",
+        "repo": "org-yt",
+        "type": "github"
+      }
+    },
+    "php-extras": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1573312690,
+        "narHash": "sha256-r4WyVbzvT0ra4Z6JywNBOw5RxOEYd6Qe2IpebHXkj1U=",
+        "owner": "arnested",
+        "repo": "php-extras",
+        "rev": "d410c5af663c30c01d461ac476d1cbfbacb49367",
+        "type": "github"
+      },
+      "original": {
+        "owner": "arnested",
+        "repo": "php-extras",
+        "type": "github"
+      }
+    },
    "poetry2nix": {
      "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
        "nix-github-actions": "nix-github-actions",
        "nixpkgs": [
          "nixneovim",
@ -431,13 +797,62 @@
        "type": "github"
      }
    },
+    "revealjs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1681386605,
+        "narHash": "sha256-9Q7aWgjAV37iJp6oYDz45e8J+RKwKY1Uvgg/BXwf5nQ=",
+        "owner": "hakimel",
+        "repo": "reveal.js",
+        "rev": "0301ce58ab185f7191696e16b1b6389f58df2892",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hakimel",
+        "repo": "reveal.js",
+        "type": "github"
+      }
+    },
    "root": {
      "inputs": {
        "devenv": "devenv",
        "home-manager": "home-manager",
+        "nix-doom-emacs": "nix-doom-emacs",
        "nix-index-database": "nix-index-database",
        "nixneovim": "nixneovim",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
+      }
+    },
+    "rotate-text": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1322962747,
+        "narHash": "sha256-SOeOgSlcEIsKhUiYDJv0p+mLUb420s9E2BmvZQvZ0wk=",
+        "owner": "debug-ito",
+        "repo": "rotate-text.el",
+        "rev": "48f193697db996855aee1ad2bc99b38c6646fe76",
+        "type": "github"
+      },
+      "original": {
+        "owner": "debug-ito",
+        "repo": "rotate-text.el",
+        "type": "github"
+      }
+    },
+    "sln-mode": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1423727528,
+        "narHash": "sha256-XqkqPyEJuTtFslOz1fpTf/Klbd/zA7IGpzpmum/MGao=",
+        "owner": "sensorflo",
+        "repo": "sln-mode",
+        "rev": "0f91d1b957c7d2a7bab9278ec57b54d57f1dbd9c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sensorflo",
+        "repo": "sln-mode",
+        "type": "github"
      }
    },
    "systems": {
@ -469,6 +884,53 @@
        "repo": "default",
        "type": "github"
      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "ts-fold": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1681029086,
+        "narHash": "sha256-z3eVkAPFI6JYZZ+2XM496zBxwnujTp4Y4KNNfqgUC/E=",
+        "owner": "jcs-elpa",
+        "repo": "ts-fold",
+        "rev": "5fd2a5afe2112ac23b58ee1b12730fcf16068df3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jcs-elpa",
+        "repo": "ts-fold",
+        "type": "github"
+      }
+    },
+    "ws-butler": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1634511126,
+        "narHash": "sha256-c0y0ZPtxxICPk+eaNbbQf6t+FRCliNY54CCz9QHQ8ZI=",
+        "owner": "hlissner",
+        "repo": "ws-butler",
+        "rev": "572a10c11b6cb88293de48acbb59a059d36f9ba5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hlissner",
+        "repo": "ws-butler",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/nix/home-manager/flake.nix
+++ b/nix/home-manager/flake.nix
@ -15,6 +15,9 @@
      url = "github:Mic92/nix-index-database";
      inputs.nixpkgs.follows = "nixpkgs";
    };
+    nix-doom-emacs = {
+      url = "github:nix-community/nix-doom-emacs";
+    };
    nixneovim = {
      url = "github:nixneovim/nixneovim";
      inputs = {
@ -29,6 +32,7 @@
    nixpkgs,
    home-manager,
    devenv,
+    nix-doom-emacs,
    nix-index-database,
    nixneovim,
    ...
@ -51,16 +55,12 @@
        pkgs = pkgs."${system}";
        modules = [
          {
-            imports = [nixneovim.nixosModules.default];
+            imports = [nixneovim.nixosModules.default nix-doom-emacs.hmModule];
            home.packages = [devenv.packages."${system}".devenv];
          }
          nix-index-database.hmModules.nix-index
          ./home.nix
        ];
-
-        extraSpecialArgs = {
-          system = system;
-        };
      }
    );
  in {
--- a/nix/home-manager/home.nix
+++ b/nix/home-manager/home.nix
@ -1,15 +1,16 @@
 {
  config,
  pkgs,
-  system,
  ...
-}: {
+}: let
+  inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux;
+in {
  # Home Manager needs a bit of information about you and the paths it should
  # manage.
  home.username = "acicchetti";

  home.homeDirectory =
-    if "${system}" == "aarch64-darwin"
+    if isDarwin
    then "/Users/acicchetti"
    else "/home/acicchetti";

@ -138,6 +139,15 @@
    enable = false;
  };

+  programs.doom-emacs = {
+    enable = true;
+    doomPrivateDir = ../../emacs/emacs.doom;
+    emacsPackage =
+      if isDarwin
+      then pkgs.emacs
+      else pkgs.emacs;
+  };
+
  imports = [
    ./modules/packages
    ./modules/files.nix
--- a/nix/home-manager/modules/packages/default.nix
+++ b/nix/home-manager/modules/packages/default.nix
@ -2,17 +2,17 @@
  pkgs,
  lib,
  config,
-  system,
  ...
 }: let
+  inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux;
  systemSpecificPackages =
-    if "${system}" != "aarch64-darwin"
+    if isLinux
    # include gping because of open bug
    then [pkgs.zsh pkgs.racket pkgs.gping pkgs.mold]
    else [];
 in {
  imports = [
-    ./emacs.nix
+    # ./emacs.nix
    ./git.nix
    ./neovim.nix
    ./starship.nix
@ -43,7 +43,7 @@ in {
      kondo
      litecli
      magic-wormhole-rs
-      ncdu
+      # ncdu
      ov
      pdm
      poetry
--- a/nix/home-manager/modules/packages/neovim.nix
+++ b/nix/home-manager/modules/packages/neovim.nix
@ -16,6 +16,9 @@
      onedark.enable = true;
    };
    plugins = {
+      fugitive = {
+        enable = true;
+      };
      lsp = {
        enable = true;
        servers = {
@ -23,7 +26,37 @@
          gopls.enable = true;
          jsonls.enable = true;
          pyright.enable = true;
+          rnix-lsp.enable = true;
          rust-analyzer.enable = true;
+          taplo.enable = true;
+          terraform-ls.enable = true;
+        };
+      };
+      mini = {
+        enable = true;
+        ai.enable = true;
+        align.enable = true;
+        animate.enable = true;
+        comment.enable = true;
+        completion.enable = true;
+        indentscope.enable = true;
+        jump.enable = true;
+        jump2d = {
+          enable = true;
+          extraConfig = {
+            mappings.start_jumping = "<leader>a";
+          };
+        };
+        splitjoin.enable = true;
+        surround.enable = true;
+      };
+      project-nvim = {
+        enable = true;
+      };
+      telescope = {
+        enable = true;
+        extraLua = {
+          post = builtins.readFile ./neovim/telescope.lua;
        };
      };
      treesitter = {
@ -34,61 +67,58 @@
          enable = true;
        };
      };
-      mini = {
-        enable = true;
-        ai.enable = true;
-        align.enable = true;
-        animate.enable = true;
-        comment.enable = true;
-        jump.enable = true;
-        surround.enable = true;
-      };
-      fugitive = {
-        enable = true;
-      };
      undotree = {
        enable = true;
      };
      which-key = {
        enable = true;
+        groups = {
+          normal = {
+            "<leader>f" = "Telescope - Find";
+            "<leader>r" = "View registers";
+            "<leader>p" = "Telescope - LSP";
+          };
        };
-      project-nvim = {
-        enable = true;
      };
    };
    extraPlugins =
      (
        with pkgs.vimPlugins; [
-          vim-ReplaceWithRegister
-          ctrlp-vim
-          vim-dispatch-neovim
-          vim-bbye
          editorconfig-nvim
+          leap-nvim
+          telescope-zf-native-nvim
+          vim-ReplaceWithRegister
+          vim-bbye
+          vim-dispatch-neovim
          vim-expand-region
          vim-signify
          vim-terraform
-          leap-nvim
        ]
      )
      ++ (with pkgs.vimExtraPlugins; [
-        nvim-ts-rainbow2
+        rainbow-delimiters-nvim
      ]);
    mappings = {
      normal = {
        "<leader>u" = {
          action = "vim.cmd.UndotreeToggle";
+          desc = "Toggle undotree";
        };
        "<leader>h" = {
          action = "function() vim.api.nvim_command('wincmd h') end";
+          desc = "Cursor - Window left";
        };
        "<leader>j" = {
          action = "function() vim.api.nvim_command('wincmd j') end";
+          desc = "Cursor - Window down";
        };
        "<leader>k" = {
          action = "function() vim.api.nvim_command('wincmd k') end";
+          desc = "Cursor - Window up";
        };
        "<leader>l" = {
          action = "function() vim.api.nvim_command('wincmd l') end";
+          desc = "Cursor - Window right";
        };
        "<c-k>" = {
          action = "'<c-u>'";
@ -98,6 +128,7 @@
        };
        "<leader>n" = {
          action = "function() vim.api.nvim_command('nohl') end";
+          desc = "nohl";
        };
      };
      visual = {
--- a/nix/home-manager/modules/packages/neovim/core.lua
+++ b/nix/home-manager/modules/packages/neovim/core.lua
@ -27,8 +27,3 @@ vim.o.wildmode = "list:longest,full"
 vim.api.nvim_create_autocmd('TextYankPost', {
  callback = function() vim.highlight.on_yank() end
 })
-
-- Ctrlp
-vim.g.ctrlp_map = "<leader>p"
-vim.g.ctrlp_cmd = "CtrlPMixed"
-vim.g.ctrlp_user_command = "rg --files %s"
--- a/nix/home-manager/modules/packages/neovim/telescope.lua
+++ b/nix/home-manager/modules/packages/neovim/telescope.lua
@ -0,0 +1,20 @@
+require("telescope").load_extension("zf-native")
+
+local builtin = require('telescope.builtin')
+
+-- greps 
+vim.keymap.set("n", '<leader>ff', builtin.find_files, {desc = 'Find Files'})
+vim.keymap.set("n", '<leader>fg', builtin.live_grep, {desc = 'Live Grep'})
+vim.keymap.set("n", '<leader>fb', builtin.buffers, {desc = 'Buffers'})
+
+-- register reading 
+vim.keymap.set("n", '<leader>r', builtin.registers, {desc = 'View registers'})
+
+-- lsp stuff
+vim.keymap.set('n', '<leader>pr', builtin.lsp_references, {desc = 'References'})
+vim.keymap.set('n', '<leader>pi', builtin.lsp_implementations, {desc = 'Implementations'})
+vim.keymap.set('n', '<leader>pd', builtin.lsp_definitions, {desc = 'Definitions'})
+vim.keymap.set('n', '<leader>ps', builtin.lsp_document_symbols, {desc = 'Document Symbols'})
+vim.keymap.set('n', '<leader>pws', builtin.lsp_workspace_symbols, {desc = 'Workspace Symbols'})
+vim.keymap.set('n', '<leader>pwd', builtin.lsp_dynamic_workspace_symbols, {desc = 'Dynamic Workspace Symbols'})
+
Author	SHA1	Message	Date
Anthony Cicchetti	5356a3fb5f	still won't work	2023-08-22 08:13:35 -04:00
Anthony Cicchetti	49f9e9ecc8	testing	2023-08-22 08:13:35 -04:00
Anthony Cicchetti	4d95632c7c	use pkgs.stdenv.hostPlatform	2023-08-22 08:13:35 -04:00
Anthony Cicchetti	6295696cb3	updates	2023-08-22 08:13:34 -04:00
Anthony Cicchetti	4e43d6c5ff	more lsp	2023-08-22 08:13:24 -04:00
Anthony Cicchetti	883a1e2399	telescope, no more ctrl-p	2023-08-22 08:13:23 -04:00
Anthony Cicchetti	23ca3f754b	updates, as well as leap-analogue	2023-08-22 08:13:14 -04:00
Anthony Cicchetti	c3f5bef4e0	updates	2023-08-22 08:12:55 -04:00
Anthony Cicchetti	323d67327f	updates	2023-08-22 08:12:38 -04:00
Anthony Cicchetti	84d0282634	updates	2023-08-22 08:12:03 -04:00
Anthony Cicchetti	b5e9efe840	wip	2023-08-09 09:43:17 -04:00
Anthony Cicchetti	cbfecd2d79	First pass?	2023-08-03 10:55:33 -04:00