From bada71574cc2f51d0aef6a74190aa5f7db13bcb5 Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 14 Aug 2024 22:44:36 +0900 Subject: [PATCH] various updates and rmove logseq --- flake.nix | 4 +--- home-manager/common/desktops/plasma6/plasma-manager.nix | 1 - lib/packages.nix | 2 -- nixos/common/software/gui/firefox.nix | 4 ++-- nixos/users/albert/desktop.nix | 3 +-- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index a7518c4c..d6525ddd 100644 --- a/flake.nix +++ b/flake.nix @@ -21,8 +21,6 @@ nur.url = "github:nix-community/NUR"; # sops-nix - Secret Management with SOPS using GPG Keys sops-nix.url = "github:Mic92/sops-nix"; - # doom-emacs - The Doom Emacs distribution` - # doom-emacs.url = "github:nix-community/nix-doom-emacs"; # nixos-hardware - Hardware Configurations nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # nixos-generators - Automated Image / ISO Creation @@ -41,7 +39,7 @@ plasma-manager.url = "github:pjones/plasma-manager"; plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; # Hyprland Flake - # hyprland.url = "github:hyprwm/Hyprland"; + hyprland.url = "github:hyprwm/Hyprland"; # Steam Deck configs for NixOS jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; }; diff --git a/home-manager/common/desktops/plasma6/plasma-manager.nix b/home-manager/common/desktops/plasma6/plasma-manager.nix index d5878add..5ff0884f 100644 --- a/home-manager/common/desktops/plasma6/plasma-manager.nix +++ b/home-manager/common/desktops/plasma6/plasma-manager.nix @@ -84,7 +84,6 @@ "applications:bitwarden.desktop" "applications:org.kde.konsole.desktop" "applications:steam.desktop" - "applications:logseq.desktop" ]; }; } diff --git a/lib/packages.nix b/lib/packages.nix index 66ba156e..21a638e8 100644 --- a/lib/packages.nix +++ b/lib/packages.nix @@ -4,7 +4,6 @@ inherit system; config = { allowUnfree = unfree; - permittedInsecurePackages = [ "electron-27.3.11" ]; }; hostPlatform = system; }); @@ -13,7 +12,6 @@ inherit system; config = { allowUnfree = unfree; - permittedInsecurePackages = [ "electron-27.3.11" ]; }; hostPlatform = system; }); diff --git a/nixos/common/software/gui/firefox.nix b/nixos/common/software/gui/firefox.nix index 6a69688a..dd903f3c 100644 --- a/nixos/common/software/gui/firefox.nix +++ b/nixos/common/software/gui/firefox.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: { +{ ... }: { programs.firefox = { enable = true; # https://search.nixos.org/options?channel=23.05&show=programs.firefox.preferences&from=0&size=50&sort=relevance&type=packages&query=firefox @@ -43,4 +43,4 @@ "distribution.searchplugins.defaultLocale" = "en-US"; }; }; -} \ No newline at end of file +} diff --git a/nixos/users/albert/desktop.nix b/nixos/users/albert/desktop.nix index 5d183ade..d504b636 100644 --- a/nixos/users/albert/desktop.nix +++ b/nixos/users/albert/desktop.nix @@ -1,8 +1,7 @@ -{ config, lib, pkgs, pkgs-unstable, desktop, inputs, system, ... }: { +{ pkgs, pkgs-unstable, ... }: { # Steam, Vintage Story areu nfree. environment.systemPackages = [ # General Desktop stuff - pkgs-unstable.logseq pkgs.bitwarden pkgs.lutris pkgs.vlc