From 05d66e4a0e2b8cf5b6416770ea117e3e046a6754 Mon Sep 17 00:00:00 2001 From: albert Date: Mon, 8 Apr 2024 21:56:39 +0900 Subject: [PATCH] Updates --- flake.nix | 7 ++++--- home-manager/common/software/gui/firefox.nix | 16 ++++++++++++++-- nixos/common/desktops/xfce/default.nix | 3 +-- nixos/containers/rdesktop/default.nix | 3 ++- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index f8f8474d..fdf2f6b8 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,10 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Nix colorizer / themer stylix.url = "github:danth/stylix/release-23.11"; + # nixvim - neovim configuration management in nix + nixvim.url = "github:nix-community/nixvim/nixos-23.11"; + nixvim.inputs.nixpkgs.follows = "nixpkgs"; + # lanzaboote - Secureboot Configuration lanzaboote.url = "github:nix-community/lanzaboote"; lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; @@ -43,9 +47,6 @@ compose2nix.inputs.nixpkgs.follows = "nixpkgs"; # Hyprland Flake hyprland.url = "github:hyprwm/Hyprland"; - # nixvim - neovim configuration management in nix - nixvim.url = "github:nix-community/nixvim/nixos-23.11"; - nixvim.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { self, nixpkgs, nixpkgs-wayland, home-manager, lanzaboote, nur, sops-nix, doom-emacs, nixos-generators, deploy-rs, ... } @inputs: let diff --git a/home-manager/common/software/gui/firefox.nix b/home-manager/common/software/gui/firefox.nix index ec606166..bce89b57 100644 --- a/home-manager/common/software/gui/firefox.nix +++ b/home-manager/common/software/gui/firefox.nix @@ -47,9 +47,21 @@ definedAliases = [ "@np" ]; }; + "NixOS Options" = { + urls = [{ + template = "https://search.nixos.org/options"; + params = [ + { name = "type"; value = "options"; } + { name = "query"; value = "{searchTerms}"; } + ]; + }]; + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ "@no" ]; + }; + "NixOS Wiki" = { - urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }]; - iconUpdateURL = "https://nixos.wiki/favicon.png"; + urls = [{ template = "https://wiki.nixos.org/index.php?search={searchTerms}"; }]; + iconUpdateURL = "https://wiki.nixos.org/favicon.png"; updateInterval = 24 * 60 * 60 * 1000; # every day definedAliases = [ "@nw" ]; }; diff --git a/nixos/common/desktops/xfce/default.nix b/nixos/common/desktops/xfce/default.nix index 4c5c73cb..806d9a4f 100644 --- a/nixos/common/desktops/xfce/default.nix +++ b/nixos/common/desktops/xfce/default.nix @@ -4,9 +4,8 @@ ]; # Enable sound with pipewire. - nixpkgs.config.pulseaudio = true; + hardware.pulseaudio.enable = false; sound.enable = true; - hardware.pulseaudio.enable = true; security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/nixos/containers/rdesktop/default.nix b/nixos/containers/rdesktop/default.nix index 5752b0dd..1a661ce4 100644 --- a/nixos/containers/rdesktop/default.nix +++ b/nixos/containers/rdesktop/default.nix @@ -1,4 +1,4 @@ -{ desktop, username, ... }: { +{ pkgs, desktop, username, ... }: { imports = [ ../../users/${username} ../../common/desktops/${desktop} @@ -7,4 +7,5 @@ services.xrdp.openFirewall = true; services.xrdp.enable = true; + environment.systemPackages = [ pkgs.pulseaudio-module-xrdp ]; }