~misterio/nix-config

a0763857805e3e5c73b2fa78a3ebb23ac590db67 — Gabriel Fontes 2 months ago cac62b3
bump flake, fix nvim breakage
3 files changed, 59 insertions(+), 48 deletions(-)

M flake.lock
M home/misterio/cli/nvim/default.nix
M pkgs/sqlcl/default.nix
M flake.lock => flake.lock +27 -27
@@ 119,11 119,11 @@
    },
    "hardware": {
      "locked": {
        "lastModified": 1662092548,
        "narHash": "sha256-nmAbyJ5+DBXcNJ2Rcy/Gx84maqtLdr6xEe82+AXCaY8=",
        "lastModified": 1663229557,
        "narHash": "sha256-1uU4nsDLXKG0AHc/VCsNBAEPkTA/07juYhcEWRb1O1E=",
        "owner": "nixos",
        "repo": "nixos-hardware",
        "rev": "786633331724f36967853b98d9100b5cfaa4d798",
        "rev": "a0df6cd6e199df4a78c833c273781ea92fa62cfb",
        "type": "github"
      },
      "original": {


@@ 140,11 140,11 @@
        "utils": "utils_2"
      },
      "locked": {
        "lastModified": 1661824092,
        "narHash": "sha256-nSWLWytlXbeLrx5A+r5Pso7CvVrX5EgmIIXW/EXvPHQ=",
        "lastModified": 1663932797,
        "narHash": "sha256-IH8ZBW99W2k7wKLS+Sat9HiKX1TPZjFTnsPizK5crok=",
        "owner": "nix-community",
        "repo": "home-manager",
        "rev": "5bd66dc6cd967033489c69d486402b75d338eeb6",
        "rev": "de3758e31a3a1bc79d569f5deb5dac39791bf9b6",
        "type": "github"
      },
      "original": {


@@ 182,11 182,11 @@
        ]
      },
      "locked": {
        "lastModified": 1662152524,
        "narHash": "sha256-C/uwnyqn/yd32Cmqhe/efS4dQt3q3jyt3ucoOm6wAwU=",
        "lastModified": 1663786567,
        "narHash": "sha256-xpKxtBAWZSo/0JHt4h/OQ7ZU65/0hzJEMMGlNtrquXQ=",
        "owner": "hyprwm",
        "repo": "contrib",
        "rev": "a1b59c724384b972f3fb7d9483492d723e2da075",
        "rev": "cda7dc96c79cd39642b7a33543ea41deb0b4f291",
        "type": "github"
      },
      "original": {


@@ 216,11 216,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
        "lastModified": 1661006226,
        "narHash": "sha256-OytVjY/W1ASw+N+xrCRaKhcs76ZIcrVRf9xXhOnWzno=",
        "lastModified": 1663788796,
        "narHash": "sha256-L5R8t88fI6XtHVW32vlXzAenr/FoucOLzbKHOQrLNhM=",
        "owner": "misterio77",
        "repo": "nix-colors",
        "rev": "861546e123ef13c480338edbad8c6f2e7baf0777",
        "rev": "787b9599227dbf09847e3b3d23187b88ba14e14a",
        "type": "github"
      },
      "original": {


@@ 273,11 273,11 @@
    },
    "nixpkgs": {
      "locked": {
        "lastModified": 1662019588,
        "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
        "lastModified": 1663850217,
        "narHash": "sha256-tp9nXo1/IdN/xN9m06ryy0QUAEfoN6K56ObM/1QTAjc=",
        "owner": "nixos",
        "repo": "nixpkgs",
        "rev": "2da64a81275b68fdad38af669afeda43d401e94b",
        "rev": "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90",
        "type": "github"
      },
      "original": {


@@ 304,11 304,11 @@
    },
    "nixpkgs-22_05_2": {
      "locked": {
        "lastModified": 1662221733,
        "narHash": "sha256-dw1xjYyQ0JidXIpzeQh/gQX+ih1sJO1zBHKs5QSYp8Q=",
        "lastModified": 1663433994,
        "narHash": "sha256-Bpthhv1PdZRrIFct8KbHACNvOu9bsYAMEaqoH83cvqM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "013e8d86d9a3f33074c903c8ffcab0d34087b1ed",
        "rev": "17989edb05615c4f61803b9c427d80b84c289c6b",
        "type": "github"
      },
      "original": {


@@ 350,11 350,11 @@
    },
    "nur": {
      "locked": {
        "lastModified": 1662331284,
        "narHash": "sha256-+XazJMtNdfovH3hc6Mq6fQzddgBvIrBXB7LtueU9PA0=",
        "lastModified": 1663993336,
        "narHash": "sha256-V6vmVmSMQAKXUqarg2c1fwAHYZ0bpfGXnehsFicbYuY=",
        "owner": "nix-community",
        "repo": "NUR",
        "rev": "b563d04c2a7eb4d72ede356bb1ce11254f5ceb74",
        "rev": "ed21a4824c3221a36cf6ede969513b93861b0943",
        "type": "github"
      },
      "original": {


@@ 433,11 433,11 @@
        "nixpkgs-22_05": "nixpkgs-22_05_2"
      },
      "locked": {
        "lastModified": 1662265707,
        "narHash": "sha256-nSCTmU6Ol02JMUzueAQGq1B/TC8JLrhrYivFzEmV0iQ=",
        "lastModified": 1663475375,
        "narHash": "sha256-uIhMyLFkU8Tp0uxLd7tKn++G/yHsB9r7YRvsBdoGvsk=",
        "owner": "mic92",
        "repo": "sops-nix",
        "rev": "00da5de7380e0fc01e009e7ea9eb3f391d4b6e02",
        "rev": "bae718a9d1e31ec478ddfcb75149f66e9625a825",
        "type": "github"
      },
      "original": {


@@ 463,11 463,11 @@
    },
    "utils_2": {
      "locked": {
        "lastModified": 1653893745,
        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
        "lastModified": 1659877975,
        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
        "owner": "numtide",
        "repo": "flake-utils",
        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
        "type": "github"
      },
      "original": {

M home/misterio/cli/nvim/default.nix => home/misterio/cli/nvim/default.nix +23 -16
@@ 67,6 67,7 @@
      vim-numbertoggle
      {
        plugin = undotree;
        type = "viml";
        config = /* vim */ ''
          let g:undotree_SetFocusWhenToggle = 1
          nmap <C-n> :UndotreeToggle<cr>


@@ 74,39 75,44 @@
      }
      {
        plugin = which-key-nvim;
        config = /* vim */ ''
          lua require('which-key').setup{}
        type = "lua";
        config = /* lua */ ''
          require('which-key').setup{}
        '';
      }
      {
        plugin = range-highlight-nvim;
        config = /* vim */ ''
          lua require('range-highlight').setup{}
        type = "lua";
        config = /* lua */ ''
          require('range-highlight').setup{}
        '';
      }
      {
        plugin = indent-blankline-nvim;
        config = /* vim */ ''
          lua require('indent_blankline').setup{char_highlight_list={'IndentBlankLine'}}
        type = "lua";
        config = /* lua */ ''
          require('indent_blankline').setup{char_highlight_list={'IndentBlankLine'}}
        '';
      }
      {
        plugin = nvim-web-devicons;
        config = /* vim */ ''
          lua require('nvim-web-devicons').setup{}
        type = "lua";
        config = /* lua */ ''
          require('nvim-web-devicons').setup{}
        '';
      }
      {
        plugin = gitsigns-nvim;
        config = /* vim */ ''
          lua require('gitsigns').setup()
        type = "lua";
        config = /* lua */ ''
          require('gitsigns').setup()
        '';
      }
      {
        plugin = nvim-colorizer-lua;
        config = /* vim */ ''
          set termguicolors
          lua require('colorizer').setup()
        type = "lua";
        config = /* lua */ ''
          require('colorizer').setup()
        '';
      }



@@ 116,8 122,9 @@
      vim-fugitive
      {
        plugin = nvim-autopairs;
        config = /* vim */ ''
          lua require('nvim-autopairs').setup{}
        type = "lua";
        config = /* lua */ ''
          require('nvim-autopairs').setup{}
        '';
      }
      {


@@ 130,7 137,7 @@
    ];
  };

  xdg.configFile."nvim/init.vim".onChange =
  xdg.configFile."nvim/init-home-manager.vim".onChange =
    let
      nvr = "${pkgs.neovim-remote}/bin/nvr";
    in

M pkgs/sqlcl/default.nix => pkgs/sqlcl/default.nix +9 -5
@@ 3,19 3,19 @@
let
  version = "22.2.1.201.1451";
  fileVersion = "1022102-01";
  url = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/download/";
  name = "V${fileVersion}.zip";
in
  stdenv.mkDerivation {

  inherit version;
  pname = "sqlcl";

  src = requireFile {
    inherit url name;
  src = requireFile rec {
    url = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/download/";
    name = "V${fileVersion}.zip";
    message = ''
      This Nix expression requires that ${name} already be part of the store. To
      obtain it you need to

      - navigate to ${url}
      - make sure that it says "Version ${version}" above the list of downloads
        - if it does not, click on the "Previous Version" link below the


@@ 25,12 25,16 @@ in
          Also consider updating this package yourself (you probably just need
          to change the `version` variable and update the sha256 to the one of
          the new file) or opening an issue at the nixpkgs repo.
      - click the "Download" link
      - click "Download"
      - sign in or create an oracle account if neccessary
      - on the next page, click the "${name}" link

      and then add the file to the Nix store using either:

        nix-store --add-fixed sha256 ${name}

      or

        nix-prefetch-url --type sha256 file:///path/to/${name}
    '';
    sha256 = "b478af0eb8a1bd864d47c06d242bc662ffc030f651781acd88469f5a839c18c7";