update tooling
This commit is contained in:
parent
5a48afaccc
commit
95d2252b1e
7 changed files with 44 additions and 26 deletions
|
@ -67,9 +67,7 @@ in
|
|||
"sd_mod"
|
||||
];
|
||||
loader.systemd-boot.enable = true;
|
||||
extraModulePackages = [
|
||||
config.boot.kernelPackages.ddcci-driver
|
||||
];
|
||||
extraModulePackages = [ config.boot.kernelPackages.ddcci-driver ];
|
||||
kernelModules = [
|
||||
"ddcci_backlight"
|
||||
"i2c-dev"
|
||||
|
|
|
@ -106,10 +106,12 @@ in
|
|||
|
||||
services.dbus.implementation = "broker";
|
||||
|
||||
grimmShared.tooling.nvim.plugins = with pkgs.vimPlugins; [
|
||||
vim-scala
|
||||
grimmShared.tooling.nvim = {
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
fugitive
|
||||
nvim-lspconfig
|
||||
];
|
||||
};
|
||||
|
||||
boot.tmp.cleanOnBoot = true;
|
||||
zramSwap.enable = true;
|
||||
|
|
|
@ -27,7 +27,9 @@ in
|
|||
|
||||
environment.sessionVariables = lib.mkIf pkgs.config.allowUnfree { NIXPKGS_ALLOW_UNFREE = "1"; };
|
||||
|
||||
grimmShared.tooling.nvim.plugins = with pkgs.vimPlugins; [ vim-nix ];
|
||||
grimmShared.tooling.nvim.extraLuaRC = lib.singleton ''
|
||||
require'lspconfig'.nixd.setup{}
|
||||
'';
|
||||
|
||||
nix.settings = {
|
||||
experimental-features = [
|
||||
|
|
|
@ -13,7 +13,18 @@ in
|
|||
lib.mkIf (enable && tooling.enable) {
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
[ python3 ] ++ lib.optionals cfg.graphical [ jetbrains.pycharm-community ];
|
||||
[
|
||||
(python3.withPackages (
|
||||
python-pkgs: with python-pkgs; [
|
||||
requests
|
||||
matplotlib
|
||||
numpy
|
||||
scipy
|
||||
pygobject3
|
||||
]
|
||||
))
|
||||
]
|
||||
++ lib.optionals cfg.graphical [ jetbrains.pycharm-community ];
|
||||
|
||||
programs.xonsh = {
|
||||
enable = true;
|
||||
|
@ -22,7 +33,7 @@ in
|
|||
name: value: ''aliases["${name}"] = "${value}"''
|
||||
) config.environment.shellAliases
|
||||
);
|
||||
package = pkgs.xonsh.override {
|
||||
package = pkgs.xonsh.wrapper.override {
|
||||
extraPackages =
|
||||
ps: with ps; [
|
||||
requests
|
||||
|
|
|
@ -28,11 +28,11 @@ let
|
|||
};
|
||||
|
||||
nixpkgs_patches = [
|
||||
# {
|
||||
# # tlpui
|
||||
# url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/305278.patch";
|
||||
# hash = "sha256-vmzj7gF8jwHdqxN+dQiJ4MRxKpHvBTzbrUvFgt1DK8I=";
|
||||
# }
|
||||
{
|
||||
# xonsh update
|
||||
url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/305316.patch";
|
||||
hash = "sha256-oUjCyA18RvIChTUwPqkO4+v2skTqLBYf2DMd+ADiGE8=";
|
||||
}
|
||||
];
|
||||
|
||||
# enable ccache for lix if ccache is enabled
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
{config, ...}: let
|
||||
{ config, ... }:
|
||||
let
|
||||
inherit (config.serverConfig) ports vhosts;
|
||||
inherit (config.networking) domain;
|
||||
in {
|
||||
|
||||
in
|
||||
{
|
||||
|
||||
services.authentik = {
|
||||
enable = true;
|
||||
|
|
|
@ -53,8 +53,12 @@ in
|
|||
{ config, ... }:
|
||||
let
|
||||
type_lookup = {
|
||||
proxy = { locations."/".proxyPass = "http://127.0.0.1:${builtins.toString config.port}"; };
|
||||
redirect = { locations."/".return = "307 https://${domain}"; };
|
||||
proxy = {
|
||||
locations."/".proxyPass = "http://127.0.0.1:${builtins.toString config.port}";
|
||||
};
|
||||
redirect = {
|
||||
locations."/".return = "307 https://${domain}";
|
||||
};
|
||||
custom = { };
|
||||
none = { };
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue