Compare commits

..

2 commits

Author SHA1 Message Date
Bad
ea48d8a19f Update flake.lock 2022-06-08 12:28:15 +02:00
Bad
e7557d0d55 Fix rust-analyzer 2022-06-08 11:21:14 +02:00
3 changed files with 87 additions and 55 deletions

View file

@ -57,7 +57,10 @@
}, },
"darwin_2": { "darwin_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": [
"digga",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1650976225, "lastModified": 1650976225,
@ -101,7 +104,10 @@
"devshell": { "devshell": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2" "nixpkgs": [
"digga",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1650389807, "lastModified": 1650389807,
@ -159,15 +165,15 @@
}, },
"fenix": { "fenix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs",
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1654496848, "lastModified": 1654669569,
"narHash": "sha256-EbJVZtV0zvMtLt7RaIvu22S4qITlnDDoTCDQzNwvrBQ=", "narHash": "sha256-CSP6T1zAUwAAOiDknJMqOSkFBitjXiIaKzhByTbmVx8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "54bbc3b0994a16ab97795e11ac6bb91d96b1b601", "rev": "02664b6e639f0461e9f03e85707326029776341e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -209,6 +215,22 @@
} }
}, },
"flake-compat_3": { "flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_4": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1648199409, "lastModified": 1648199409,
@ -289,16 +311,22 @@
}, },
"home": { "home": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3",
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
],
"nmd": "nmd",
"nmt": "nmt",
"utils": [
"flake-utils"
] ]
}, },
"locked": { "locked": {
"lastModified": 1654422613, "lastModified": 1654628474,
"narHash": "sha256-ZxkMM13AnrMwYOV99ohzcqeTkAOqD9Q2SBdZ9WoFE9Y=", "narHash": "sha256-Llm9X8Af15uC9IMStxqjCfO15WgYTqTnsQq8wMcpp5Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "20703892473d01c70fb10248442231fe94f4ceb4", "rev": "70824bb5c790b820b189f62f643f795b1d2ade2e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -310,11 +338,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1654230545, "lastModified": 1654593855,
"narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", "narHash": "sha256-c+SyXvj7THre87OyIdZfRVR+HhI/g1ZDrQ3VUtTuHkU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec", "rev": "033bd4fa9a8fbe0c68a88e925d9a884161044b25",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -331,11 +359,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1653413650, "lastModified": 1654608517,
"narHash": "sha256-wojDHjb+eU80MPH+3HQaK0liUy8EgR95rvmCl24i58Y=", "narHash": "sha256-KIxHjDDJYhoiLanLjpeAk5AuZsfip8M62JhkuloEGb0=",
"owner": "nmattia", "owner": "nmattia",
"repo": "naersk", "repo": "naersk",
"rev": "69daaceebe12c070cd5ae69ba38f277bbf033695", "rev": "14997a79cd78fe34ad6390f18a327ee0593e5eec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -346,11 +374,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1654360807, "lastModified": 1654540670,
"narHash": "sha256-wYG86PUkPZ1P/oHsCpepTkb/U26poaEPPp1XFjRsgdA=", "narHash": "sha256-qNg3cUyDWvkC5AUZZEQ9WWb49Y/BT4HQ10e/8wfvcgY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d9794b04bffb468b886c553557489977ae5f4c65", "rev": "f05e7d39a48db1cd5bcdc7775e171779d7b4a8a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -377,40 +405,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1653996475, "lastModified": 1654593855,
"narHash": "sha256-r/UA7h3Dfgf4dlOCkakpqejf1Tagfb+6T+9OdT0qBgU=", "narHash": "sha256-c+SyXvj7THre87OyIdZfRVR+HhI/g1ZDrQ3VUtTuHkU=",
"path": "/nix/store/1qw0ck830swiwrqkw90cxy2bm4svgjz6-source",
"rev": "ec6eaba9dfcfdd11547d75a193e91e26701bf7e3",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1654398695,
"narHash": "sha256-Kw/KeoFXszNsF5mORP45mrxCP+k9Aq03hWcuWCL9sdI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c5d810f4c74c824ae0fb788103003c6c9d366a08",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1654230545,
"narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec", "rev": "033bd4fa9a8fbe0c68a88e925d9a884161044b25",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -420,9 +419,41 @@
"type": "github" "type": "github"
} }
}, },
"nmd": {
"flake": false,
"locked": {
"lastModified": 1653339422,
"narHash": "sha256-8nc7lcYOgih3YEmRMlBwZaLLJYpLPYKBlewqHqx8ieg=",
"owner": "rycee",
"repo": "nmd",
"rev": "9e7a20e6ee3f6751f699f79c0b299390f81f7bcd",
"type": "gitlab"
},
"original": {
"owner": "rycee",
"repo": "nmd",
"type": "gitlab"
}
},
"nmt": {
"flake": false,
"locked": {
"lastModified": 1648075362,
"narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
"owner": "rycee",
"repo": "nmt",
"rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
"type": "gitlab"
},
"original": {
"owner": "rycee",
"repo": "nmt",
"type": "gitlab"
}
},
"nvfetcher": { "nvfetcher": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_4",
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"
], ],
@ -463,11 +494,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1654453799, "lastModified": 1654598816,
"narHash": "sha256-wYxRnGvTvIDk9OPbXXM9j6AYtPcLHaW/SodiDy0RYYA=", "narHash": "sha256-xecNom9kI3c1Z1sjNzm71MyQUwiK7CBxjx+1jO10mgY=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "ad6810e90bf89a4ef0ae21349d077050bc2a4fa2", "rev": "66a842124b52cb005e9dee4605df161badb295e0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -20,6 +20,7 @@
home.url = "github:nix-community/home-manager/master"; home.url = "github:nix-community/home-manager/master";
# home.url = "path:/home/mae/home-manager"; # home.url = "path:/home/mae/home-manager";
home.inputs.nixpkgs.follows = "nixos"; home.inputs.nixpkgs.follows = "nixos";
home.inputs.utils.follows = "flake-utils";
darwin.url = "github:LnL7/nix-darwin"; darwin.url = "github:LnL7/nix-darwin";
darwin.inputs.nixpkgs.follows = "nixos"; darwin.inputs.nixpkgs.follows = "nixos";

View file

@ -159,7 +159,7 @@
"typescript" "typescript"
]; ];
"prettier.useTabs" = true; "prettier.useTabs" = true;
"rust-analyzer.server.path" = "${pkgs.fenix.rust-analyzer}"; "rust-analyzer.server.path" = "${pkgs.fenix.rust-analyzer}/bin/rust-analyzer";
"rust-analyzer.updates.prompt" = false; "rust-analyzer.updates.prompt" = false;
"rust-analyzer.updates.checkOnStartup" = false; "rust-analyzer.updates.checkOnStartup" = false;
"rust-analyzer.cargo.loadOutDirsFromCheck" = true; "rust-analyzer.cargo.loadOutDirsFromCheck" = true;