This commit is contained in:
Vivian 2023-04-24 10:00:56 +02:00
parent 8d092693af
commit 3dd06c0bfb
3 changed files with 15 additions and 7 deletions

View file

@ -831,16 +831,15 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1682181988,
"narHash": "sha256-CYWhlNi16cjGzMby9h57gpYE59quBcsHPXiFgX4Sw5k=",
"lastModified": 1682318825,
"narHash": "sha256-rTFe23xSneBU2AqiwTGnXyQBfIDyJzxRKdLYti4BgB8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6c43a3495a11e261e5f41e5d7eda2d71dae1b2fe",
"rev": "6577af679354e6df48fac646b46178455412abc1",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}

View file

@ -9,7 +9,7 @@
# * https://github.com/Infinidoge/nix-minecraft
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs";
nixpkgs_22-11.url = "github:nixos/nixpkgs/nixos-22.11";
nur.url = "github:nix-community/NUR";

View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ pkgs, ... }:
{ pkgs, lib, ... }:
let
fix-vscode = pkgs.writeScriptBin "fix-vscode" ''
#!${pkgs.stdenv.shell}
@ -23,6 +23,15 @@ in {
./hardware-configuration.nix
];
# This _should_ fix vscode errors as well
programs.nix-ld.enable = true;
# environment.variables = {
# NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [
# pkgs.stdenv.cc.cc
# ];
# # NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker";
# };
# Use the GRUB 2 boot loader.
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
@ -36,7 +45,7 @@ in {
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.11"; # Did you read the comment?
virtualisation.podman.enable = true;
virtualisation.podman.enable = true;
# Additional packages
environment.systemPackages = with pkgs; [