From ce228bf80b1684269772bec96f64c8cb5552e710 Mon Sep 17 00:00:00 2001 From: Gustav Bruhn Date: Sun, 24 Aug 2025 20:56:23 +0200 Subject: [PATCH] refactor done --- hosts/desktop/configuration.nix | 2 +- modules/nixos/common.nix | 4 ++-- modules/nixos/niri.nix | 9 ++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index ad286b8..be191f9 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -27,7 +27,7 @@ }; }; - myOptions.niri.enable = true; + myOptions.niri.enable = false; networking.hostName = "desktop"; # Define your hostname. diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix index 35b8a44..671f8af 100644 --- a/modules/nixos/common.nix +++ b/modules/nixos/common.nix @@ -6,7 +6,7 @@ }: { imports = [ inputs.home-manager.nixosModules.default - # ../../modules/nixos/cosmic.nix + ../../modules/nixos/cosmic.nix ./niri.nix ]; @@ -20,7 +20,7 @@ # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; - + i18n.extraLocaleSettings = { LC_ADDRESS = "sv_SE.UTF-8"; LC_IDENTIFICATION = "sv_SE.UTF-8"; diff --git a/modules/nixos/niri.nix b/modules/nixos/niri.nix index f7fc4db..7913354 100644 --- a/modules/nixos/niri.nix +++ b/modules/nixos/niri.nix @@ -1,11 +1,11 @@ { - myOptions, + config, pkgs, lib, ... }: - lib.mkIf myOptions.niri.enable - { +lib.mkIf config.myOptions.niri.enable +{ services.displayManager.ly = { x11Support = false; enable = true; @@ -17,5 +17,4 @@ ]; services.gnome.gnome-keyring.enable = true; security.pam.services.swaylock = {}; - - } +}