Update to 21.11

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1637793790,
+        "lastModified": 1638319138,
-        "narHash": "sha256-oPXavjxETEWGXq8g7kQHyRLKUmLX2yPtGn+t3V0mrTY=",
+        "narHash": "sha256-ve33f4nTKQluyvm5URQwL019x0Fnrg8urqzvymNeD+s=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "f85eea0e29fa9a8924571d0e398215e175f80d55",
+        "rev": "52ea2f8c3231cc2b5302fa28c63588aacb77ea29",
         "type": "github"
       },
       "original": {
@@ -23,10 +23,7 @@
     "beautysh": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs",
-          "bud",
-          "nixpkgs"
-        ],
         "poetry2nix": "poetry2nix"
       },
       "locked": {
@@ -106,14 +103,8 @@
     "deploy": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_3",
-          "digga",
+        "utils": "utils"
-          "latest"
-        ],
-        "utils": [
-          "digga",
-          "flake-utils"
-        ]
       },
       "locked": {
         "lastModified": 1632822684,
@@ -149,7 +140,7 @@
         "blank": "blank",
         "deploy": "deploy",
         "devshell": "devshell",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "flake-utils-plus": "flake-utils-plus",
         "home-manager": [
           "home"
@@ -179,15 +170,15 @@
     },
     "fenix": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_5",
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1638253217,
+        "lastModified": 1638685445,
-        "narHash": "sha256-JURXPdXhClQNaZUBiZh+fFlqU7j1aoVaVeBah0sOdnk=",
+        "narHash": "sha256-PKivgYoHmm0XfdmXVbNSICIKTE4HjJE2aIIhnvDf670=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "27d0917f0aee1b9e4fb743afe5aa832bc6f69ef7",
+        "rev": "064c4e0940d11152a7247ebb0ccac98b243efa45",
         "type": "github"
       },
       "original": {
@@ -229,10 +220,7 @@
     },
     "flake-utils-plus": {
       "inputs": {
-        "flake-utils": [
+        "flake-utils": "flake-utils_4"
-          "digga",
-          "flake-utils"
-        ]
       },
       "locked": {
         "lastModified": 1630859749,
@@ -263,6 +251,36 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "locked": {
+        "lastModified": 1638122382,
+        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "locked": {
+        "lastModified": 1638122382,
+        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home": {
       "inputs": {
         "nixpkgs": [
@@ -270,16 +288,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1638281721,
+        "lastModified": 1638553958,
-        "narHash": "sha256-d3vAVFG6zov9NwjSuYntBiD+I5KjJLwX09c7uAzbONI=",
+        "narHash": "sha256-leETjYMtD9y37CvfRSQhIGibcIl4dNVlFkY/8QgqmAM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7329ffc6e911106494183557fc249180d5422929",
+        "rev": "6ce1d64073f48b9bc9425218803b1b607454c1e7",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-21.05",
+        "ref": "release-21.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -302,11 +320,11 @@
     },
     "latest_2": {
       "locked": {
-        "lastModified": 1638198142,
+        "lastModified": 1638376152,
-        "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
+        "narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8a308775674e178495767df90c419425474582a1",
+        "rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f",
         "type": "github"
       },
       "original": {
@@ -336,32 +354,41 @@
         "type": "github"
       }
     },
+    "nixlib": {
+      "locked": {
+        "lastModified": 1638664434,
+        "narHash": "sha256-qU/7kV5DqyloWDsoBcMbAhxUwZBdsG8APl1Ut7xDjKM=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "4a0ff4394e28a5fd06f0801b3cbc0db6946ed3a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixos": {
       "locked": {
-        "lastModified": 1638268913,
+        "lastModified": 1638712752,
-        "narHash": "sha256-AVatTvYxylGXdEgmF45vEO1onbKrlU6EqaOEaNF1TEY=",
+        "narHash": "sha256-kOEoE7sMenbdZobxrw5bsQsUC+fiZHwetyANy6c/ORs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "69caefdbc691850f37148ca0dd16dfd649d66fd9",
+        "rev": "9c7491d3cfa6454aeaeb7600e22d22df2f01c7cc",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "release-21.05",
+        "ref": "release-21.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixos-generators": {
       "inputs": {
-        "nixlib": [
+        "nixlib": "nixlib",
-          "digga",
+        "nixpkgs": "nixpkgs_4"
-          "nixlib"
-        ],
-        "nixpkgs": [
-          "digga",
-          "blank"
-        ]
       },
       "locked": {
         "lastModified": 1637655461,
@@ -379,11 +406,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1638182287,
+        "lastModified": 1638440530,
-        "narHash": "sha256-vBzf+hbTJz2ZdXV/DWirl6wOO7tjdqzTIU+0FANt65U=",
+        "narHash": "sha256-kmoNW+RmSka988iWvSrkiAxO8g6D76O0gW2cIIhL6U8=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "6b3f79de09c3de7c91ab51e55e87879f61b6faec",
+        "rev": "4c9f07277bd4bc29a051ff2a0ca58c6403e3881a",
         "type": "github"
       },
       "original": {
@@ -394,11 +421,74 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1638198142,
+        "lastModified": 1638653945,
-        "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
+        "narHash": "sha256-kPi8BK3UmIskP1Z2sG6KI0QEXBd/SHu72dpSDOL0ZEw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "11e5bcc974c36310ee5c38e1cd7eff4cfed04778",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1638735405,
+        "narHash": "sha256-yyxzgNwKHFKME4Zv2I095tgUfs6By+Kcf6G68+NgE4U=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e98afa97d3554e00661e436ba5ab5938d40bc761",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1638553308,
+        "narHash": "sha256-qlHRqp+7gJj+LUNfEl01M9xHQoX2Bx4e1ha/nssXSo8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2df15ba83d0510a56f2583fd3481723835acb5a1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1638553308,
+        "narHash": "sha256-qlHRqp+7gJj+LUNfEl01M9xHQoX2Bx4e1ha/nssXSo8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2df15ba83d0510a56f2583fd3481723835acb5a1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1638376152,
+        "narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8a308775674e178495767df90c419425474582a1",
+        "rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f",
         "type": "github"
       },
       "original": {
@@ -440,16 +530,8 @@
     },
     "poetry2nix": {
       "inputs": {
-        "flake-utils": [
+        "flake-utils": "flake-utils_2",
-          "bud",
+        "nixpkgs": "nixpkgs_2"
-          "beautysh",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "bud",
-          "beautysh",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1625240517,
@@ -506,11 +588,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1638223384,
+        "lastModified": 1638641291,
-        "narHash": "sha256-fa1JCHbx7Oge0eAPOVoHJkUSzueXNh21AdUZbvh6RAI=",
+        "narHash": "sha256-XfJAIqUVjDgLa7u/W8i0JI3SavDlvTcUKPfr0kq2MHw=",
         "owner": "rust-analyzer",
         "repo": "rust-analyzer",
-        "rev": "e217632b9819876cd59f4f6f963d04b0637bd8d2",
+        "rev": "6434ada19e7cf2e96015fb2668d64a0fdfc08b23",
         "type": "github"
       },
       "original": {
@@ -519,6 +601,21 @@
         "repo": "rust-analyzer",
         "type": "github"
       }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1638122382,
+        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -4,7 +4,7 @@
   nixConfig.extra-experimental-features = "nix-command flakes ca-references";
   inputs =
     {
-      nixos.url = "github:nixos/nixpkgs/release-21.05";
+      nixos.url = "github:nixos/nixpkgs/release-21.11";
       latest.url = "github:nixos/nixpkgs/nixos-unstable";
 
       digga.url = "github:divnix/digga";
@@ -16,7 +16,7 @@
       bud.inputs.nixpkgs.follows = "nixos";
       bud.inputs.devshell.follows = "digga/devshell";
 
-      home.url = "github:nix-community/home-manager/release-21.05";
+      home.url = "github:nix-community/home-manager/release-21.11";
       home.inputs.nixpkgs.follows = "nixos";
 
       darwin.url = "github:LnL7/nix-darwin";

profiles/androidev/default.nix

@@ -5,6 +5,4 @@
   ];
 
   programs.adb.enable = true;
-  virtualisation.virtualbox.host.enable = true;
-  #  virtualisation.anbox.enable = true;
 }

users/profiles/neovim/coc/default.nix

@@ -1,38 +0,0 @@
-{ pkgs, config, ... }:
-{
-  target = "${config.xdg.configHome}/nvim/coc-settings.json";
-  text = ''
-    {
-    "coc.preferences.formatOnSaveFiletypes": [
-      "css",
-      "markdown",
-      "javascript",
-      "typescript"
-    ],
-    "prettier.useTabs": true,
-    "rust-analyzer.server.path": "rust-analyzer",
-    "rust-analyzer.cargo.loadOutDirsFromCheck": true,
-    "rust-analyzer.procMacro.enable": true,
-    "clangd.checkUpdates": false,
-    "clangd.path": "clangd",
-    "svelte.plugin.svelte.format.enable": false,
-    "languageserver": {
-         "zls" : {
-             "command": "zls",
-             "filetypes": ["zig"]
-         },
-         "dlang" : {
-             "command": "serve-d",
-             "rootPatterns": ["dub.json", "dub.sdl"],
-             "filetypes": ["d"]
-         },
-         "nix": {
-          "command": "${pkgs.rnix-lsp}/bin/rnix-lsp",
-          "filetypes": [
-            "nix"
-          ]
-      }
-    }
-    }
-  '';
-}

users/profiles/neovim/default.nix

@@ -34,81 +34,81 @@
       {
         plugin = nvim-dap;
         config = ''
-                lua <<EOF
+          lua <<EOF
-                local dap = require'dap'
+          local dap = require'dap'
-                  dap.adapters.go = function(callback, config)
+            dap.adapters.go = function(callback, config)
-                    local stdout = vim.loop.new_pipe(false)
+              local stdout = vim.loop.new_pipe(false)
-                    local handle
+              local handle
-                    local pid_or_err
+              local pid_or_err
-                    local port = 38697
+              local port = 38697
-                    local opts = {
+              local opts = {
-                      stdio = {nil, stdout},
+                stdio = {nil, stdout},
-                      args = {"dap", "-l", "127.0.0.1:" .. port},
+                args = {"dap", "-l", "127.0.0.1:" .. port},
-                      detached = true
+                detached = true
-                    }
+              }
-                    handle, pid_or_err = vim.loop.spawn("dlv", opts, function(code)
+              handle, pid_or_err = vim.loop.spawn("dlv", opts, function(code)
-                      stdout:close()
+                stdout:close()
-                      handle:close()
+                handle:close()
-                      if code ~= 0 then
+                if code ~= 0 then
-                        print('dlv exited with code', code)
+                  print('dlv exited with code', code)
-                      end
+                end
-                    end)
+              end)
-                    assert(handle, 'Error running dlv: ' .. tostring(pid_or_err))
+              assert(handle, 'Error running dlv: ' .. tostring(pid_or_err))
-                    stdout:read_start(function(err, chunk)
+              stdout:read_start(function(err, chunk)
-                      assert(not err, err)
+                assert(not err, err)
-                      if chunk then
+                if chunk then
-                        vim.schedule(function()
+                  vim.schedule(function()
-                          require('dap.repl').append(chunk)
+                    require('dap.repl').append(chunk)
-                        end)
+                  end)
-                      end
+                end
-                    end)
+              end)
-                    -- Wait for delve to start
+              -- Wait for delve to start
-                    vim.defer_fn(
+              vim.defer_fn(
-                      function()
+                function()
-                        callback({type = "server", host = "127.0.0.1", port = port})
+                  callback({type = "server", host = "127.0.0.1", port = port})
-                      end,
+                end,
-                      100)
+                100)
-                  end
+            end
-                  -- https://github.com/go-delve/delve/blob/master/Documentation/usage/dlv_dap.md
+            -- https://github.com/go-delve/delve/blob/master/Documentation/usage/dlv_dap.md
-                  dap.configurations.go = {
+            dap.configurations.go = {
-                    -- works with go.mod packages and sub packages 
+              -- works with go.mod packages and sub packages 
-                    {
+              {
-                      type = "go",
+                type = "go",
-                      name = "Debug (go.mod)",
+                name = "Debug (go.mod)",
-                      request = "launch",
+                request = "launch",
-                      program = "''${workspaceFolder}"
+                program = "''${workspaceFolder}"
-                    }, 
+              }, 
-                    {
+              {
-                      type = "go",
+                type = "go",
-                      name = "Debug test (go.mod)",
+                name = "Debug test (go.mod)",
-                      request = "launch",
+                request = "launch",
-                      mode = "test",
+                mode = "test",
-                      program = "''${workspaceFolder}"
+                program = "''${workspaceFolder}"
-                    },
+              },
-                    {
+              {
-                      type = "go",
+                type = "go",
-                      name = "Debug",
+                name = "Debug",
-                      request = "launch",
+                request = "launch",
-                      program = "''${file}"
+                program = "''${file}"
-                    },
+              },
-                    {
+              {
-                      type = "go",
+                type = "go",
-                      name = "Debug test", -- configuration for debugging test files
+                name = "Debug test", -- configuration for debugging test files
-                      request = "launch",
+                request = "launch",
-                      mode = "test",
+                mode = "test",
-                      program = "''${file}"
+                program = "''${file}"
-                    },
+              },
-                }
+          }
-                EOF
+          EOF
-                nnoremap <silent> <F5> :lua require'dap'.continue()<CR>
+          nnoremap <silent> <F5> :lua require'dap'.continue()<CR>
-                nnoremap <silent> <F10> :lua require'dap'.step_over()<CR>
+          nnoremap <silent> <F10> :lua require'dap'.step_over()<CR>
-                nnoremap <silent> <F11> :lua require'dap'.step_into()<CR>
+          nnoremap <silent> <F11> :lua require'dap'.step_into()<CR>
-                nnoremap <silent> <F12> :lua require'dap'.step_out()<CR>
+          nnoremap <silent> <F12> :lua require'dap'.step_out()<CR>
-                nnoremap <silent> <leader>b :lua require'dap'.toggle_breakpoint()<CR>
+          nnoremap <silent> <leader>b :lua require'dap'.toggle_breakpoint()<CR>
-                nnoremap <silent> <leader>B :lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: '))<CR>
+          nnoremap <silent> <leader>B :lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: '))<CR>
-                nnoremap <silent> <leader>lp :lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: '))<CR>
+          nnoremap <silent> <leader>lp :lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: '))<CR>
-                nnoremap <silent> <leader>dr :lua require'dap'.repl.open()<CR>
+          nnoremap <silent> <leader>dr :lua require'dap'.repl.open()<CR>
-                nnoremap <silent> <leader>dl :lua require'dap'.run_last()<CR>
+          nnoremap <silent> <leader>dl :lua require'dap'.run_last()<CR>
         '';
       }
       {
@@ -146,6 +146,31 @@
       set completeopt=menuone,noinsert,noselect
       set shortmess+=c
     '';
+    coc.enable = true;
+    coc.settings = {
+      text = {
+        "coc.preferences.formatOnSaveFiletypes" = [
+          "css"
+          "markdown"
+          "javascript"
+          "typescript"
+        ];
+        "prettier.useTabs" = true;
+        "rust-analyzer.server.path" = "${pkgs.rust-analyzer}";
+        "rust-analyzer.cargo.loadOutDirsFromCheck" = true;
+        "rust-analyzer.procMacro.enable" = true;
+        "clangd.checkUpdates" = false;
+        "clangd.path" = "clangd";
+        "svelte.plugin.svelte.format.enable" = false;
+        "languageserver" = {
+          "nix" = {
+            "command" = "${pkgs.rnix-lsp}/bin/rnix-lsp";
+            "filetypes" = [
+              "nix"
+            ];
+          };
+        };
+      };
+    };
   };
-  home.file."coc-settings" = (import ./coc { inherit pkgs config; });
 }