dev-shell.nix

@@ -12,9 +12,6 @@
   buildInputs = [
     # shell scripts
     (lib.shellAsDrv {script = ''echo "hello world"''; pname = "hello";})
-    # TODO: decompose hm-switch.sh with a base version (where HOME_MANAGER_BIN is injected)
-    # (lib.shellAsDrv {script = builtins.readFile ./scripts/hm-switch.sh; pname = "hm-switch";})
-    pkgs.rust4cargo
   ];
 
   # env vars

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1673301561,
+        "lastModified": 1665870395,
-        "narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=",
+        "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68",
+        "rev": "a630400067c6d03c9b3e0455347dc8559db14288",
         "type": "github"
       },
       "original": {
@@ -36,22 +36,6 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1668681692,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "locked": {
         "lastModified": 1667395993,
@@ -69,11 +53,11 @@
     },
     "flake-utils_2": {
       "locked": {
-        "lastModified": 1667395993,
+        "lastModified": 1659877975,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -97,21 +81,6 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -120,11 +89,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1673343300,
+        "lastModified": 1672770368,
-        "narHash": "sha256-5Xdj6kpXYMie0MlnGwqK5FaMdsedxvyuakWtyKB3zaQ=",
+        "narHash": "sha256-iO6Z9blIe8dcPh3VT2nkej9EimORCoskGQR6xNjICWI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "176e455371a8371586e8a3ff0d56ee9f3ca2324e",
+        "rev": "d01e7280ad7d13a5a0fae57355bd0dbfe5b81969",
         "type": "github"
       },
       "original": {
@@ -149,54 +118,10 @@
         "type": "github"
       }
     },
-    "neovim-flake": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "neovim-nightly-overlay",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "dir": "contrib",
-        "lastModified": 1673321445,
-        "narHash": "sha256-5jdmIgcN2PNWHozyj8WRoSVJBiQi61SqWGfTJXUBDOI=",
-        "owner": "neovim",
-        "repo": "neovim",
-        "rev": "1df2db0bc4dfa2e4f632f9b3dbae00b8b29f2d9f",
-        "type": "github"
-      },
-      "original": {
-        "dir": "contrib",
-        "owner": "neovim",
-        "repo": "neovim",
-        "type": "github"
-      }
-    },
-    "neovim-nightly-overlay": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "neovim-flake": "neovim-flake",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1673338492,
-        "narHash": "sha256-UbqugOENjdtTWCvJQQ0ym80zTB28esvJQPO3j3+Zmjw=",
-        "owner": "nix-community",
-        "repo": "neovim-nightly-overlay",
-        "rev": "de5bef64b8158b85b47256d5a366973534130621",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "neovim-nightly-overlay",
-        "type": "github"
-      }
-    },
     "nixgl": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "lastModified": 1,
@@ -210,22 +135,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1673301451,
-        "narHash": "sha256-0IvOqAXZ+dHjOV7dQl4iEcCUmzqg8VvGg+UZ68ONDIg=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "35f1f865c03671a4f75a6996000f03ac3dc3e472",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1660551188,
         "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=",
@@ -240,13 +149,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1673226411,
+        "lastModified": 1672617983,
-        "narHash": "sha256-b6cGb5Ln7Zy80YO66+cbTyGdjZKtkoqB/iIIhDX9gRA=",
+        "narHash": "sha256-68WDiCBs631mbDDk4UAKdGURKcsfW6hjb7wgudTAe5o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "aa1d74709f5dac623adb4d48fdfb27cc2c92a4d4",
+        "rev": "0fc9fca9c8d43edd79d33fea0dd8409d7c4580f4",
         "type": "github"
       },
       "original": {
@@ -255,7 +164,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1665296151,
         "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=",
@@ -278,23 +187,22 @@
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "kpcli-py": "kpcli-py",
-        "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nixgl": "nixgl",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "rust-overlay": "rust-overlay"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1673317790,
+        "lastModified": 1672712534,
-        "narHash": "sha256-GWjj/bqTXPsKgwWGFZUyHRShxFvufShYnuyyeP99wmk=",
+        "narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "9724998ea2caf23214674bf0c2cdf6ec0b1719af",
+        "rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -22,12 +22,10 @@
       url = "github:rebkwok/kpcli";
       flake = false;
     };
-    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
   };
 
   outputs = {
-    nixpkgs, agenix, home-manager, flake-utils, nixgl, rust-overlay, flake-compat,
+    nixpkgs, agenix, home-manager, flake-utils, nixgl, rust-overlay, flake-compat
-    neovim-nightly-overlay
     ,...
   }@_inputs: let 
     # Context/global stuffs to be passed down

modules/opengl.sys.nix

@@ -1,18 +0,0 @@
-{config, pkgs, lib}:
-          let
-            gpu_pkgs = [ pkgs.clinfo pkgs.lshw pkgs.glxinfo pkgs.pciutils pkgs.vulkan-tools ];
-            gpu_conf = {
-              # openCL
-              hardware.opengl = {
-                enable = true;
-                extraPackages = let 
-                  inherit (pkgs) rocm-opencl-icd rocm-opencl-runtime;
-                  in [rocm-opencl-icd rocm-opencl-runtime];
-                # Vulkan
-                driSupport = true;
-                driSupport32Bit = true;
-                package = pkgs.mesa.drivers;
-                package32 = pkgs.pkgsi686Linux.mesa.drivers;
-              };
-            };
-            in;

native_configs/neovim/init.lua

@@ -20,37 +20,19 @@ if empty(glob(plug_path))
 endif
 ]])
 
-local function truthy(v) return v ~= nil end
-
-local function cfg(cfg_var, do_fn) if truthy(cfg_var) then do_fn() end end
-
-local function cfg_render(do_fn)
-    local should_render = not truthy(os.getenv("NVIM_HEADLESS"))
-    cfg(should_render, do_fn)
-end
-
 -- vim-plug
 local Plug = vim.fn['plug#']
 
 vim.call('plug#begin')
 
 -- libs and dependencies
-Plug('nvim-lua/plenary.nvim') -- The base of all plugins
+Plug('nvim-lua/plenary.nvim')
 
 -- plugins
 Plug('tjdevries/nlua.nvim') -- adds symbols of vim stuffs in init.lua
 Plug('nvim-treesitter/nvim-treesitter') -- language parser engine for highlighting
 Plug('nvim-treesitter/nvim-treesitter-textobjects') -- more text objects
 Plug('nvim-telescope/telescope.nvim', { branch = '0.1.x' }) -- file browser
--- TODO: this might need to be taken extra care in our Nix config
--- What this Plug declaration means is this repo needs to be built on our running environment
--- -----
--- What to do:
--- - Run `make` at anytime before Nix is done on this repository
---   - Might mean that we fetch this repository, run make, and copy to destination folder
--- - Make sure that if we run `make` at first Plug run, that `make` is idempotent
--- OR
---   Make sure that Plug does not run `make` and use the output it needs
 Plug('nvim-telescope/telescope-fzf-native.nvim',
     { ['do'] = 'make >> /tmp/log 2>&1' })
 Plug('nvim-telescope/telescope-file-browser.nvim')
@@ -85,17 +67,15 @@ Plug('Olical/conjure') -- REPL on the source for Clojure (and other LISPs)
 Plug('gennaro-tedesco/nvim-jqx') -- JSON formatter (use :Jqx*)
 Plug('kylechui/nvim-surround') -- surrounds with tags/parenthesis
 Plug('simrat39/rust-tools.nvim') -- config rust-analyzer and nvim integration
+Plug('simrat39/inlay-hints.nvim') -- type-hints with pseudo-virtual texts
 
 -- UI & colorscheme
-cfg_render(function()
+Plug('gruvbox-community/gruvbox') -- theme provider
-    Plug('simrat39/inlay-hints.nvim') -- type-hints with pseudo-virtual texts
+Plug('nvim-lualine/lualine.nvim') -- fancy status line
-    Plug('gruvbox-community/gruvbox') -- theme provider
+Plug('lukas-reineke/indent-blankline.nvim') -- identation lines on blank lines
-    Plug('nvim-lualine/lualine.nvim') -- fancy status line
+Plug('kyazdani42/nvim-web-devicons') -- icons for folder and filetypes
-    Plug('lukas-reineke/indent-blankline.nvim') -- identation lines on blank lines
+Plug('m-demare/hlargs.nvim') -- highlights arguments; great for func prog
-    Plug('kyazdani42/nvim-web-devicons') -- icons for folder and filetypes
+Plug('folke/todo-comments.nvim') -- Highlights TODO
-    Plug('m-demare/hlargs.nvim') -- highlights arguments; great for func prog
-    Plug('folke/todo-comments.nvim') -- Highlights TODO
-end)
 
 -- other utilities
 Plug('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
@@ -104,11 +84,6 @@ Plug('nvim-treesitter/playground') -- Sees Treesitter AST - less hair pulling, m
 Plug('saadparwaiz1/cmp_luasnip') -- snippet engine
 Plug('L3MON4D3/LuaSnip') -- snippet engine
 Plug('mickael-menu/zk-nvim') -- Zettelkasten
--- Switch cases:
--- `gsp` -> PascalCase (classes), `gsc` -> camelCase (Java), `gs_` -> snake_case (C/C++/Rust)
--- `gsu` -> UPPER_CASE (CONSTs), `gsk` -> kebab-case (Clojure), `gsK` -> Title-Kebab-Case
--- `gs.` -> dot.case (R)
-Plug('arthurxavierx/vim-caser') -- switch cases
 
 ---------
 vim.call('plug#end')
@@ -120,13 +95,12 @@ endif
 ]])
 
 -- special terminals, place them at 4..=7 for ergonomics
-vim.api.nvim_create_autocmd({ "VimEnter" }, {
+vim.api.nvim_create_autocmd({"VimEnter"}, {
     callback = function()
         local function named_term(term_idx, term_name)
             require('harpoon.term').gotoTerminal(term_idx)
-            vim.cmd([[:exe ":file ]] .. term_name .. [[" | :bfirst]])
+            vim.cmd([[:exe ":file ]]..term_name..[[" | :bfirst]])
         end
-
         -- term:ctl at 4
         named_term(4, "term:ctl")
         -- term:dev at 5
@@ -180,7 +154,7 @@ vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
 -- that does not collide with vi-motion keybind. This is because
 -- <Alt-x> -> ^[x; while <Esc> on the terminal is ^[
 vim.keymap.set('t', '<Esc>', '<C-\\><C-n>)')
-vim.keymap.set({ 'n', 'i', 'v' }, '<c-l>', '<Cmd>mode<Cr>', { desc = "" }) -- redraw on every mode
+vim.keymap.set({ 'n', 'i', 'v' }, '<c-l>', '<Cmd>mode<Cr>', {desc = ""}) -- redraw on every mode
 
 -- diagnostics (errors/warnings to be shown)
 vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)

nix-conf/home-manager/flake.lock

@@ -16,22 +16,6 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1668681692,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "locked": {
         "lastModified": 1667395993,
@@ -49,11 +33,11 @@
     },
     "flake-utils_2": {
       "locked": {
-        "lastModified": 1667395993,
+        "lastModified": 1659877975,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -77,21 +61,6 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -100,11 +69,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1673343300,
+        "lastModified": 1672770368,
-        "narHash": "sha256-5Xdj6kpXYMie0MlnGwqK5FaMdsedxvyuakWtyKB3zaQ=",
+        "narHash": "sha256-iO6Z9blIe8dcPh3VT2nkej9EimORCoskGQR6xNjICWI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "176e455371a8371586e8a3ff0d56ee9f3ca2324e",
+        "rev": "d01e7280ad7d13a5a0fae57355bd0dbfe5b81969",
         "type": "github"
       },
       "original": {
@@ -129,54 +98,10 @@
         "type": "github"
       }
     },
-    "neovim-flake": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "neovim-nightly-overlay",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "dir": "contrib",
-        "lastModified": 1673401931,
-        "narHash": "sha256-wt0AcvtyWSyk6HxANH3iO0ztzzAO0jxHkF6tk2nY1jg=",
-        "owner": "neovim",
-        "repo": "neovim",
-        "rev": "93d99aefd314bc4abfc54c0c29a4de84b6fcc823",
-        "type": "github"
-      },
-      "original": {
-        "dir": "contrib",
-        "owner": "neovim",
-        "repo": "neovim",
-        "type": "github"
-      }
-    },
-    "neovim-nightly-overlay": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "neovim-flake": "neovim-flake",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1673424920,
-        "narHash": "sha256-obfKkavXH9CWLTJaJ8bPJ6AZdbE24+cIeBbQjzuSHv0=",
-        "owner": "nix-community",
-        "repo": "neovim-nightly-overlay",
-        "rev": "15813daffca93531243cf00ba57963e8d3df4129",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "neovim-nightly-overlay",
-        "type": "github"
-      }
-    },
     "nixgl": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "lastModified": 1,
@@ -190,22 +115,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1671983799,
-        "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1660551188,
         "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=",
@@ -220,13 +129,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1673315479,
+        "lastModified": 1672617983,
-        "narHash": "sha256-GNCFRtDHjTygXGJp/H+f2XQPMGxpYSmNiibIqYzihtM=",
+        "narHash": "sha256-68WDiCBs631mbDDk4UAKdGURKcsfW6hjb7wgudTAe5o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c07552f6f7d4eead7806645ec03f7f1eb71ba6bd",
+        "rev": "0fc9fca9c8d43edd79d33fea0dd8409d7c4580f4",
         "type": "github"
       },
       "original": {
@@ -236,7 +145,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1665296151,
         "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=",
@@ -258,23 +167,22 @@
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "kpcli-py": "kpcli-py",
-        "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nixgl": "nixgl",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "rust-overlay": "rust-overlay"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1673404037,
+        "lastModified": 1672712534,
-        "narHash": "sha256-9yhRzFiqzVQaJN5jsAIwApDolkORRQ3EJi7D4yu58ig=",
+        "narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "a979c85ed4691bf996af88504522b32e9611ccfe",
+        "rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f",
         "type": "github"
       },
       "original": {

nix-conf/home-manager/flake.nix

@@ -18,11 +18,6 @@
       url = "github:rebkwok/kpcli";
       flake = false;
     };
-    neovim-nightly-overlay = {
-      url = "github:nix-community/neovim-nightly-overlay";
-      # Pin to a nixpkgs revision that doesn't have NixOS/nixpkgs#208103 yet
-      inputs.nixpkgs.url = "github:nixos/nixpkgs?rev=fad51abd42ca17a60fc1d4cb9382e2d79ae31836";
-    };
   };
 
   outputs =
@@ -32,7 +27,6 @@
     , rust-overlay
     , flake-utils
     , kpcli-py
-    , neovim-nightly-overlay
     , ...
     }:
     let

overlays.nix

@@ -1,21 +1,7 @@
-flake_input@{ kpcli-py, nixgl, rust-overlay, neovim-nightly-overlay, ... }: [
+flake_input@{ kpcli-py, nixgl, rust-overlay, ... }: [
-
   nixgl.overlays.default
-
   rust-overlay.overlays.default
-
+  (final: prev: {
-  neovim-nightly-overlay.overlay
-
-  (final: prev: 
-  let 
-    nightlyRustWithExts = exts: final.rust-bin.selectLatestNightlyWith (
-      toolchain: toolchain.minimal.override.extensions = exts;
-    );
-    # https://rust-lang.github.io/rustup/concepts/profiles.html
-    rust-default-components = ["rust-docs" "rustfmt" "clippy"];
-    rust-dev-components = rust-default-components ++ ["rust-src" "rust-analyzer" "miri"];
-  in
-  {
     # use python3.9, which works because of cython somehow?
     kpcli-py = final.poetry2nix.mkPoetryApplication {
       projectDir = kpcli-py;
@@ -29,11 +15,6 @@ flake_input@{ kpcli-py, nixgl, rust-overlay, neovim-nightly-overlay, ... }: [
         );
       });
     };
-    
-    rust4devs = nightlyRustWithExts rust-dev-components;
-    rust4cargo = nightlyRustWithExts [];
-    rust4normi = nightlyRustWIthExts rust-default-components;
   })
-
 ]
 

templates/rust-monorepo/.gitignore

@@ -3,6 +3,10 @@
 debug/
 target/
 
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
+Cargo.lock
+
 # These are backup files generated by rustfmt
 **/*.rs.bk
 

templates/rust-monorepo/README.md

@@ -1,41 +0,0 @@
-# Rust-monorepo. TODO: Change this to your monorepo name
-
-## About this template 
-
-[![built with nix](https://builtwithnix.org/badge.svg)](https://builtwithnix.org)
-
-- Bootstrapped with [pegasust/dotfiles](https://git.pegasust.com/pegasust/dotfiles)
-
-- Uses [naersk](https://github.com/nix-community/naersk.git) to build package(s)
-
-- Provides [devShell (`nix develop`)](https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-develop.html),
-[shell.nix (`nix-shell -p ./`)](https://nixos.org/manual/nix/stable/command-ref/nix-shell.html)
-for development environment. It contains:
-  - The default `devShell` provides Nightly rustc via 
-[`gh:oxalica/rust-overlay`](https://github.com/oxalica/rust-overlay.git)
-  - [rustc components](https://rust-lang.github.io/rustup/concepts/components.html) includes
-  `rust-src`, [`rust-analyzer`](https://github.com/rust-lang/rust-analyzer.git),
-  `clippy`, `miri`
-  - [`evcxr`: Rust REPL]() and [`bacon`: Rust nodemon]()
-
-## Check out these [killer libraries](https://jondot.medium.com/12-killer-rust-libraries-you-should-know-c60bab07624f)
-### Application development
-
-- [Serde](https://github.com/serde-rs/serde) for (de)serialization needs
-  - Data-driven programming in Rust starts with Serde
-  - Service system programming starts with defining your message protocols & data formats
-
-- [Clap](https://docs.rs/clap/latest/clap/) declarative CLI arguments
-  - Data-driven CLI development in Rust starts with Clap
-
-- [itertools](https://lib.rs/crates/itertools) for extra juice to iterators
-
-- [log](https://lib.rs/crates/log) or [env-logger](https://docs.rs/env_logger/latest/env_logger)
-for logging needs
-
-### Library development
-
-- [proptest](https://lib.rs/crates/proptest) for hyppothesis testing
-  - Data-driven testing starts with proptest
-
-

templates/rust-monorepo/flake.nix

@@ -25,13 +25,6 @@
         devShell = with pkgs; mkShell {
           buildInputs = [
             rust_pkgs
-            # rust's compiler is quite powerful enough to the point where
-            # a REPL is not really necessary.
-            # Rely on the compiler and bacon 99% of the time
-            # only use REPL if you need to explore/prototype
-            # In that case, might as well put the code into sandbox
-            pkgs.evcxr
-            pkgs.bacon
           ];
           shellHook = ''
             # nix flake update # is this even needed?

templates/rust/flake.nix

@@ -11,28 +11,22 @@
       let
         overlays = [ rust-overlay.overlays.default ];
         pkgs = import nixpkgs { inherit system overlays; };
-        rust_pkgs = (pkgs.rust-bin.selectLatestNightlyWith
-          (
-            toolchain:
-            toolchain.default.override {
-              extensions = [ "rust-src" "rust-analyzer" "rust-docs" "clippy" "miri" ];
-            }
-          ));
         naersk-lib = pkgs.callPackage naersk { };
       in
       {
         defaultPackage = naersk-lib.buildPackage ./.;
         devShell = with pkgs; mkShell {
           buildInputs = [
-            rust_pkgs
+            (pkgs.rust-bin.selectLatestNightlyWith
-            # rust's compiler is quite powerful enough to the point where
+              (
-            # a REPL is not really necessary.
+                toolchain:
-            # Rely on the compiler and bacon 99% of the time
+                toolchain.default.override {
-            # only use REPL if you need to explore/prototype
+                  extensions = [ "rust-src" ];
-            # In that case, might as well put the code into sandbox
+                }
-            pkgs.evcxr
+              ))
-            pkgs.bacon
+            pkgs.rust-analyzer
           ];
+          RUST_SRC_PATH = rustPlatform.rustLibSrc;
           shellHook = ''
             # nix flake update # is this even needed?
           '';