diff --git a/.gitignore b/.gitignore index 13bb7b5923d234f0509c1b4c9d3c410210cc529f..e16eb680cfadc8df1b976f0c3ee2b2e60acfb924 100644 --- a/.gitignore +++ b/.gitignore @@ -153,3 +153,4 @@ devenv.local.nix .pre-commit-config.yaml /Session.vim +.direnv/ diff --git a/devenv.lock b/devenv.lock index a9b3b229863f84225ad9b061845a54d8a07b7718..37e09b76deb57700e918a9e5b9807fd8eba11f66 100644 --- a/devenv.lock +++ b/devenv.lock @@ -74,16 +74,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698288402, - "narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=", + "lastModified": 1702346276, + "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "60b9db998f71ea49e1a9c41824d09aa274be1344", + "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/devenv.nix b/devenv.nix index 5fdd16fc881ee44b44ef65da1bde82d539b83d8a..a32c8d72e179f540d15855bd5f1d00133938112f 100644 --- a/devenv.nix +++ b/devenv.nix @@ -13,7 +13,7 @@ delve dialog drill - exa + eza fd fd feh @@ -76,7 +76,7 @@ PATH="''${PATH}":${pkgs.gnutar}/bin PATH="''${PATH}":${pkgs.gzip}/bin/ PATH="''${PATH}":${pkgs.procps}/bin/ - PATH="''${PATH}":${pkgs.exa}/bin/ + PATH="''${PATH}":${pkgs.eza}/bin/ PATH="''${PATH}":${pkgs.git}/bin/ PATH="''${PATH}":${pkgs.gnugrep}/bin/ PATH="''${PATH}":${ @@ -101,7 +101,7 @@ PATH="''${PATH}":${pkgs.moreutils}/bin/ PATH="''${PATH}":${pkgs.gnutar}/bin PATH="''${PATH}":${pkgs.gzip}/bin/ - PATH="''${PATH}":${pkgs.exa}/bin/ + PATH="''${PATH}":${pkgs.eza}/bin/ PATH="''${PATH}":${pkgs.git}/bin/ PATH="''${PATH}":${ inputs.version.defaultPackage."${builtins.currentSystem}" diff --git a/devenv.yaml b/devenv.yaml index 525a6f02f172bb9108a23c335a4ced3e80f78502..1fd1de965babf46e2b567fbc260a81006a4c01d1 100644 --- a/devenv.yaml +++ b/devenv.yaml @@ -1,6 +1,6 @@ inputs: nixpkgs: - url: github:nixos/nixpkgs/nixos-23.05 + url: github:nixos/nixpkgs/nixos-23.11 version: url: git+https://gitlab.schukai.com/oss/utilities/version.git diff --git a/go.mod b/go.mod index c1ef92fa59f71efb087450993a543429a67b9c10..0dd84282ce58097c3a6a9ce239dbfecc28f714ba 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module gitlab.schukai.com/oss/libraries/go/markup/html -go 1.20 +go 1.21 require ( github.com/andybalholm/cascadia v1.3.2