fix: remove override for obsidian

This commit is contained in:
gwg313 2024-07-13 18:25:31 -04:00
parent 511bbae135
commit 0da1f0978a
Signed by: gwg313
GPG key ID: 60FF63B4826B7400
4 changed files with 3 additions and 17 deletions

View file

@ -25,7 +25,6 @@
../modules/devenv.nix ../modules/devenv.nix
../modules/gh-dash.nix ../modules/gh-dash.nix
../modules/ssh.nix ../modules/ssh.nix
../modules/obsidian.nix
]; ];
nixpkgs = { nixpkgs = {
@ -42,11 +41,6 @@
neovim = inputs.neovim-config.packages."x86_64-linux".default; neovim = inputs.neovim-config.packages."x86_64-linux".default;
}) })
# obsidian electron build issue
(final: prev: {
obsidian-wayland = prev.obsidian.override {electron = final.electron_24;};
})
# Or define it inline, for example: # Or define it inline, for example:
# (final: prev: { # (final: prev: {
# hi = final.hello.overrideAttrs (oldAttrs: { # hi = final.hello.overrideAttrs (oldAttrs: {

View file

@ -206,7 +206,7 @@
]; ];
timeouts = [ timeouts = [
{ {
timeout = 300; timeout = 1800;
command = "${pkgs.swaylock}/bin/swaylock -f"; command = "${pkgs.swaylock}/bin/swaylock -f";
} }
]; ];

View file

@ -14,7 +14,7 @@
element-desktop # A feature-rich client for Matrix.org element-desktop # A feature-rich client for Matrix.org
gimp # GNU Image Manipulation Program, a powerful and open-source raster graphics editor for tasks like photo editing and graphic design. gimp # GNU Image Manipulation Program, a powerful and open-source raster graphics editor for tasks like photo editing and graphic design.
gparted # Gnome Partition Editor, a graphical partition manager for creating, resizing, and managing disk partitions. gparted # Gnome Partition Editor, a graphical partition manager for creating, resizing, and managing disk partitions.
kicad # An open-source electronic design automation (EDA) suite for creating schematics, PCB layouts, and 3D models. # kicad # An open-source electronic design automation (EDA) suite for creating schematics, PCB layouts, and 3D models.
kodi # An open-source media center, providing a versatile platform for streaming and organizing media content. kodi # An open-source media center, providing a versatile platform for streaming and organizing media content.
pavucontrol # PulseAudio Volume Control, a feature-rich GUI for controlling and configuring the PulseAudio sound system. pavucontrol # PulseAudio Volume Control, a feature-rich GUI for controlling and configuring the PulseAudio sound system.
#sublime-music # A modern and feature-rich music player with a clean user interface and advanced playback options. #sublime-music # A modern and feature-rich music player with a clean user interface and advanced playback options.
@ -22,5 +22,6 @@
wireshark # Open-source network protocol analyzer for real-time packet inspection and analysis. wireshark # Open-source network protocol analyzer for real-time packet inspection and analysis.
nicotine-plus nicotine-plus
anki anki
obsidian
]; ];
} }

View file

@ -1,9 +0,0 @@
{pkgs, ...}: {
nixpkgs.config = {
allowUnfree = true;
permittedInsecurePackages = [
"electron-24.8.6"
];
};
home.packages = with pkgs; [obsidian-wayland];
}