misc updates

pull/1/head
Tudor Roman 2022-06-25 12:35:43 +02:00
parent 3506530a3e
commit 31af622c30
5 changed files with 42 additions and 32 deletions

View File

@ -85,11 +85,11 @@
},
"flake-utils": {
"locked": {
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
@ -105,11 +105,11 @@
]
},
"locked": {
"lastModified": 1643933536,
"narHash": "sha256-yRmsWAG4DnLxLIUtlaZsl0kH7rN5xSoyNRlf0YZrcH4=",
"lastModified": 1650841545,
"narHash": "sha256-AF3fk+p/mHbdtyrI3kpms+MoMVOdGIBGJ+7LT7WWdaU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2860d7e3bb350f18f7477858f3513f9798896831",
"rev": "236c6ec21420e44c38ec76de4fc3335bec1859b5",
"type": "github"
},
"original": {
@ -127,11 +127,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1637574694,
"narHash": "sha256-UHYvqGnsU4h5/Kt3gbiRbaMcN7hJ8u7ey8t4qO8maUI=",
"lastModified": 1649665804,
"narHash": "sha256-g475am1T55nDIU5GqkmkATdw+qxLyIMsNN0Sk/PbOoE=",
"owner": "Mic92",
"repo": "nix-ld",
"rev": "6faa38511602d9c1c5ae44eaa0fc531e4b657576",
"rev": "e528b353e78bde92a9fa8d0fe30ea65b6ea29e77",
"type": "github"
},
"original": {
@ -142,11 +142,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1645346782,
"narHash": "sha256-3qd0cu+2kapIP7cdHW9n8zh1wCvRGg83K7/cCj5Xv+A=",
"lastModified": 1650522846,
"narHash": "sha256-SxWHXRI3qJwswyXAtzsi6PKVY3KLNNnb072KaJthII8=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "1ccfe243aa6e94bf80f2a66f6be41d086d37fc87",
"rev": "6b4ebea9093c997c5f275c820e679108de4871ab",
"type": "github"
},
"original": {
@ -173,11 +173,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1645493675,
"narHash": "sha256-9xundbZQbhFodsQRh6QMN1GeSXfo3y/5NL0CZcJULz0=",
"lastModified": 1650937716,
"narHash": "sha256-3Tuspfl36JKnQekMVII3kiL2afj+ngPY2iPVN3zeReU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "74b10859829153d5c5d50f7c77b86763759e8654",
"rev": "293a5455f31039a590cca0b844d134736fedae46",
"type": "github"
},
"original": {
@ -189,11 +189,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1645159530,
"narHash": "sha256-RXBjZ4hwKI/aAgHk3prUFmHIb0BkIBkHRN8l01Z5yXk=",
"lastModified": 1650830814,
"narHash": "sha256-P7vGsHdS19eHVUJt4BeQA4JfauL2nOpEcnYKIbX76YM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4afca382d80b68bff9e154a97210e5a7bf5df8b3",
"rev": "c254b8c915ac912ae9ee9dc74eac555ccbf33795",
"type": "github"
},
"original": {
@ -312,11 +312,11 @@
"flake-utils": "flake-utils"
},
"locked": {
"lastModified": 1639385028,
"narHash": "sha256-oqorKz3mwf7UuDJwlbCEYCB2LfcWLL0DkeCWhRIL820=",
"lastModified": 1647259887,
"narHash": "sha256-yEkMbEHVO9qydluQ3uHGWX1PkfZhgDKxnd1rhZYZ72w=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "be1be083af014720c14f3b574f57b6173b4915d0",
"rev": "06dba5f3b4fa2cc0bfc98ce9cd6f9a4d8db11d46",
"type": "github"
},
"original": {

View File

@ -13,7 +13,7 @@
# So i don't have to recompile it every time i update flakes
emacs-overlay.url = github:nix-community/emacs-overlay/5a501bb198eb96a327cdd3275608305d767e489d;
emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
#emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
nixos-hardware.url = github:nixos/nixos-hardware;
nixos-hardware.inputs.nixpkgs.follows = "nixpkgs";
@ -60,6 +60,10 @@
blog = blog.defaultPackage.${prev.system};
co-pong = co.packages.${prev.system}.pong;
};
unstable = import nixpkgs-unstable {
system = prev.system;
config.allowUnfree = true;
};
})
];
};

View File

@ -12,15 +12,18 @@ with lib; {
};
};
config = mkIf cfg.enable {
config = let
gcc = pkgs.gcc;
clang = pkgs.llvmPackages_latest.clang;
in mkIf cfg.enable {
tudor.home = {
programs.fish.shellAliases = {
gcc = "${gcc}/bin/gcc";
clang = "${clang}/bin/clang";
};
home.packages = with pkgs; [
bear
ccls
(pkgs.hiPrio clang_10)
clang-tools
cmake
gcc
gdb
gnumake
meson
@ -28,8 +31,8 @@ with lib; {
];
home.sessionVariables = {
"CC" = "clang";
"CXX" = "clang++";
"CC" = "${clang}/bin/clang";
"CXX" = "${clang}/bin/clang++";
};
};
};

View File

@ -3,7 +3,6 @@
environment.variables = {
NIX_LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [
stdenv.cc.cc
gcc-unwrapped.lib
];
NIX_LD = pkgs.binutils.dynamicLinker;
};

View File

@ -1,7 +1,8 @@
{ inputs, config, lib, pkgs, ... }:
let
cfg = config.tudor.tools.emacs;
emacsKind = pkgs.emacsPgtkGcc;
langCfg = config.tudor.langs;
emacsKind = pkgs.unstable.emacsNativeComp;
in
with lib; {
options = {
@ -36,7 +37,10 @@ with lib; {
libvterm
libgccjit
];
] ++ (optionals (langCfg.c.enable) [
bear
ccls
]);
programs.emacs = {
enable = true;