diff --git a/flake.lock b/flake.lock index 79107bf..51b2080 100644 --- a/flake.lock +++ b/flake.lock @@ -402,22 +402,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", @@ -426,7 +410,9 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "treefmt-nix": "treefmt-nix" }, "locked": { diff --git a/flake.nix b/flake.nix index 354afbc..db71c63 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixvim.url = "github:nix-community/nixvim"; + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; plasma-manager = { url = "github:pjones/plasma-manager"; diff --git a/home-manager/traverseda/home.nix b/home-manager/traverseda/home.nix index c5c803a..1f9efd6 100644 --- a/home-manager/traverseda/home.nix +++ b/home-manager/traverseda/home.nix @@ -136,7 +136,6 @@ }; plugins.indent-blankline.enable = true; plugins.lsp-format.enable = true; - plugins.lsp-status.enable = true; plugins.lsp = { enable = true; servers = { diff --git a/nixos/cad.nix b/nixos/cad.nix index 5d001b8..cb6c880 100644 --- a/nixos/cad.nix +++ b/nixos/cad.nix @@ -1,7 +1,11 @@ -{ config, pkgs, lib, ... }: +{ +# config, + pkgs, +# lib, + ... }: { - environment.systemPackages = with pkgs; [ + environment.systemPackages = [ #pkgs.creality-print (pkgs.appimageTools.wrapType2 { @@ -11,6 +15,7 @@ sha256 = "sha256-WUsL7UbxSY94H4F1Ww8vLsfRyeg2/DZ+V4B6eH3M6+M="; }; }) + pkgs.lightburn pkgs.openscad pkgs.blender-cadsketcher #pkgs.py-slvs diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 90150d7..eec1e8c 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -88,7 +88,7 @@ vimAlias = true; }; - environment.systemPackages = with pkgs; [ + environment.systemPackages = [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget pkgs.mosh @@ -96,10 +96,12 @@ pkgs.git pkgs.usbutils pkgs.pciutils + pkgs.lsof + pkgs.p7zip pkgs.atool pkgs.comma pkgs.home-manager - appimage-run + pkgs.appimage-run pkgs.linuxPackages.usbip ]; diff --git a/nixos/work.nix b/nixos/work.nix index e290ab7..023e863 100644 --- a/nixos/work.nix +++ b/nixos/work.nix @@ -1,4 +1,9 @@ -{ config, pkgs, lib, ros, ... }: +{ +# config, + pkgs, +# lib, +# ros, + ... }: { virtualisation.virtualbox.host.enable = true; @@ -14,8 +19,26 @@ programs.firejail = { enable = true; }; + programs.nix-ld = { + enable = true; + #Include libstdc++ in the nix-ld profile + libraries = [ + pkgs.stdenv.cc.cc + pkgs.zlib + pkgs.fuse3 + pkgs.icu + pkgs.nss + pkgs.openssl + pkgs.curl + pkgs.expat + pkgs.xorg.libX11 + pkgs.vulkan-headers + pkgs.vulkan-loader + pkgs.vulkan-tools + ]; + }; - environment.systemPackages = with pkgs; [ + environment.systemPackages = [ pkgs.qemu pkgs.qgroundcontrol pkgs.vscode @@ -29,6 +52,10 @@ pkgs.element-desktop pkgs.act pkgs.logseq + (pkgs.writeShellScriptBin "python" '' + export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH + exec ${pkgs.python3}/bin/python "$@" + '') ]; }