diff --git a/flake.nix b/flake.nix index 74fd39b..0b7910b 100644 --- a/flake.nix +++ b/flake.nix @@ -55,7 +55,6 @@ disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs-unstable"; - inputs.home-manager.follows = "home-manager-unstable"; }; #hyprland = { # url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; @@ -74,7 +73,7 @@ modifications unstable-packages stable-packages - nur.overlay + nur.overlays.default ]; }; defaultModules = [ ./modules agenix.nixosModules.default overlays ]; diff --git a/home-manager/firefox/default.nix b/home-manager/firefox/default.nix index dcd5828..9119773 100644 --- a/home-manager/firefox/default.nix +++ b/home-manager/firefox/default.nix @@ -109,7 +109,7 @@ in { visibility: collapse !important; } ''; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ clearurls darkreader sponsorblock @@ -137,7 +137,7 @@ in { visibility: collapse !important; } ''; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ clearurls darkreader sponsorblock @@ -164,7 +164,7 @@ in { (import ./config/preferences.nix) (import ./config/speed.nix) ] ++ lib.optionals osConfig.custom.hardware.nvidia.enable [(import ./config/nvidia-fixes.nix)]); - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ clearurls darkreader sponsorblock diff --git a/home-manager/nixvim/cmp.nix b/home-manager/nixvim/cmp.nix index 98d2636..6dc7ea0 100644 --- a/home-manager/nixvim/cmp.nix +++ b/home-manager/nixvim/cmp.nix @@ -4,8 +4,10 @@ luasnip.enable = true; copilot-lua = { enable = true; - suggestion.enabled = false; - panel.enabled = false; + settings = { + suggestion.enabled = false; + panel.enabled = false; + }; }; cmp-buffer = { enable = true; }; diff --git a/modules/graphical/audio.nix b/modules/graphical/audio.nix index e5eeb77..9169883 100644 --- a/modules/graphical/audio.nix +++ b/modules/graphical/audio.nix @@ -10,9 +10,9 @@ in config = mkIf cfg.enable { # Enable sound with pipewire. - hardware.pulseaudio.enable = false; security.rtkit.enable = true; + services.pulseaudio.enable = false; services.pipewire = { enable = true; alsa.enable = true; diff --git a/modules/graphical/hyprland.nix b/modules/graphical/hyprland.nix index 329f5a7..a235a0f 100644 --- a/modules/graphical/hyprland.nix +++ b/modules/graphical/hyprland.nix @@ -13,11 +13,8 @@ in { xkb.layout = config.mainUser.layout; xkb.variant = config.mainUser.variant; enable = true; - displayManager = - lib.mkIf (!config.services.xserver.displayManager.gdm.enable) { - sddm.enable = true; - }; }; + services.displayManager.sddm.enable = !config.services.xserver.displayManager.gdm.enable; #nix.settings = { # substituters = [ "https://hyprland.cachix.org" ]; @@ -26,11 +23,6 @@ in { # ]; #}; - hardware = { - # Opengl - opengl.enable = true; - }; - xdg.portal.enable = true; xdg.portal.extraPortals = lib.mkDefault [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-hyprland ];