wip

elythh · Aug 31, 2024 · 3ad0909 · 3ad0909
1 parent 2a532d2
commit 3ad0909
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 60 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/home/programs/graphical/wms/hyprland/default.nix b/modules/home/programs/graphical/wms/hyprland/default.nix
@@ -8,7 +8,7 @@
   ...
 }:
 let
-  inherit (lib) mkIf mkEnableOption getExe;
+  inherit (lib) mkIf mkEnableOption;
   inherit (lib.${namespace}) enabled;
   inherit (inputs) hyprland;
 
@@ -214,15 +214,7 @@ in
           ${cfg.appendConfig}
         '';
 
-      package =
-        if cfg.enableDebug then
-          hyprland.packages.${system}.hyprland-debug
-        else
-          hyprland.packages.${system}.hyprland;
-
-      settings = {
-        exec = [ "${getExe pkgs.libnotify} --icon ~/.face -u normal \"Hello $(whoami)\"" ];
-      };
+      package = hyprland.packages.${system}.hyprland;
 
       systemd = {
         enable = true;

diff --git a/modules/home/suites/wlroots/default.nix b/modules/home/suites/wlroots/default.nix
@@ -45,10 +45,10 @@ in
       };
     };
 
-    # using nixos module
+    # using homemanager module
     # services.network-manager-applet.enable = true;
     services = {
-      blueman-applet.enable = true;
+      blueman-applet.enable = false;
     };
   };
 }
diff --git a/modules/nixos/hardware/bluetooth/default.nix b/modules/nixos/hardware/bluetooth/default.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   namespace,
   ...
 }:
@@ -20,12 +19,10 @@ in
     hardware.bluetooth = {
       enable = true;
 
-      package = pkgs.bluez-experimental;
+      #package = pkgs.bluez-experimental;
       powerOnBoot = true;
     };
 
-    boot.kernelParams = [ "btusb" ];
-
     services.blueman = {
       enable = true;
     };

diff --git a/modules/nixos/services/dbus/default.nix b/modules/nixos/services/dbus/default.nix
@@ -24,6 +24,7 @@ in
         dconf
         gcr
         udisks2
+        blueman
       ];
 
       implementation = "broker";

diff --git a/modules/nixos/suites/wlroots/default.nix b/modules/nixos/suites/wlroots/default.nix
@@ -24,7 +24,7 @@ in
       };
     };
     programs = {
-      nm-applet.enable = true;
+      # nm-applet.enable = true;
 
       wshowkeys = {
         enable = true;

diff --git a/modules/nixos/system/locale/default.nix b/modules/nixos/system/locale/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  inherit (lib) mkIf mkForce;
+  inherit (lib) mkIf;
   inherit (lib.${namespace}) mkBoolOpt;
 
   cfg = config.${namespace}.system.locale;
@@ -21,11 +21,24 @@ in
       LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
     };
 
-    i18n.defaultLocale = "en_US.UTF-8";
+    i18n = {
+      defaultLocale = "en_US.UTF-8";
+      extraLocaleSettings = {
+        LC_ADDRESS = "fr_FR.UTF-8";
+        LC_IDENTIFICATION = "fr_FR.UTF-8";
+        LC_MEASUREMENT = "fr_FR.UTF-8";
+        LC_MONETARY = "fr_FR.UTF-8";
+        LC_NAME = "fr_FR.UTF-8";
+        LC_NUMERIC = "fr_FR.UTF-8";
+        LC_PAPER = "fr_FR.UTF-8";
+        LC_TELEPHONE = "fr_FR.UTF-8";
+        LC_TIME = "fr_FR.UTF-8";
+      };
+    };
 
     console = {
       font = "Lat2-Terminus16";
-      keyMap = mkForce "us";
+      useXkbConfig = true;
     };
   };
 }
diff --git a/modules/shared/nix/default.nix b/modules/shared/nix/default.nix
@@ -36,7 +36,7 @@ in
     };
 
     environment = {
-      variables.FLAKE = "/home/gwen/Documents/dots/elythh/flake";
+      variables.FLAKE = "/etc/nixos/flake/";
       etc = with inputs; {
         # set channels (backwards compatibility)
         "nix/flake-channels/system".source = self;

diff --git a/systems/x86_64-linux/grovetender/networking.nix b/systems/x86_64-linux/grovetender/networking.nix
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ in @@
             dconf
             gcr
             udisks2
+            blueman
           ];
           implementation = "broker";
@@ Expand Down @@