Update to 23.11!!

This commit is contained in:
Natsu Kagami 2023-12-01 22:05:54 +01:00
parent fb9d120c37
commit 32c9474e7e
Signed by: nki
GPG key ID: 55A032EB38B49ADB
11 changed files with 29 additions and 55 deletions

View file

@ -1,7 +1,6 @@
{ config, pkgs, lib, ... }:
let
texlab = pkgs.unstable.texlab;
in
{
imports = [
@ -52,7 +51,7 @@ in
## Python
python3
## Scala
pkgs.unstable.scala-cli
scala-cli
# Fonts
fantasque-sans-mono
@ -116,7 +115,7 @@ in
direnv.nix-direnv.enable = true;
direnv.config.global.load_dotenv = true;
exa = {
eza = {
enable = true;
enableAliases = true;
};

View file

@ -22,7 +22,7 @@
inkscape # for TeX svg
# Java & sbt
pkgs.unstable.jdk20
jdk21
sbt
# Gaming stuff

View file

@ -53,10 +53,7 @@ in
(if pkgs.stdenv.isAarch64 then
pkgs.hello
else
logseq.override {
# https://github.com/electron/electron/issues/32760
electron = pkgs.electron_25;
})
logseq)
# (if stdenv.isAarch64 then zotero else pkgs.unstable.zotero) // kinda fucked for now from CVE
libreoffice
@ -72,19 +69,8 @@ in
]));
nki.programs.discord.enable = pkgs.stdenv.isx86_64;
nki.programs.discord.package = (pkgs.callPackage pkgs.unstable.vesktop.override {
electron = pkgs.electron_27;
nodePackages = pkgs.nodePackages // { nodejs = pkgs.nodejs; };
}).overrideAttrs (attrs: {
nki.programs.discord.package = pkgs.vesktop.overrideAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.nss_latest ];
postBuild = ''
pnpm build
# using `pnpm exec` here apparently makes it ignore ELECTRON_SKIP_BINARY_DOWNLOAD
./node_modules/.bin/electron-builder \
--dir \
-c.electronDist=${pkgs.electron_27}/lib/electron \
-c.electronVersion=${pkgs.electron_27.version}
'';
postInstall = ''
ln -s $out/bin/vencorddesktop $out/bin/discord
'';

View file

@ -2,7 +2,7 @@
let
notificationModule = { config, pkgs, lib, ... }:
let
swaync = pkgs.unstable.swaynotificationcenter;
swaync = pkgs.swaynotificationcenter;
in
with lib; mkIf (config.linux.graphical.type == "wayland") {
home.packages = [ swaync ];

View file

@ -120,7 +120,7 @@ in
config.wayland.windowManager.sway = mkIf cfg.enable {
enable = true;
systemdIntegration = true;
systemd.enable = true;
config = {
### Inputs