From f4ab58edc885854b1efa9158177cd38f6e4733df Mon Sep 17 00:00:00 2001 From: elythh Date: Sat, 31 Aug 2024 16:56:26 +0200 Subject: [PATCH] wipwip --- flake.lock | 6 ++-- .../graphical/wms/hyprland/default.nix | 12 ++----- modules/home/suites/wlroots/default.nix | 4 +-- modules/nixos/hardware/bluetooth/default.nix | 5 +-- modules/nixos/services/dbus/default.nix | 1 + modules/nixos/suites/wlroots/default.nix | 2 +- modules/nixos/system/locale/default.nix | 19 ++++++++-- modules/shared/nix/default.nix | 2 +- .../x86_64-linux/grovetender/networking.nix | 36 ------------------- 9 files changed, 27 insertions(+), 60 deletions(-) delete mode 100644 systems/x86_64-linux/grovetender/networking.nix diff --git a/flake.lock b/flake.lock index 10233a16..bdf912c8 100644 --- a/flake.lock +++ b/flake.lock @@ -1476,11 +1476,11 @@ }, "nur": { "locked": { - "lastModified": 1725029189, - "narHash": "sha256-iKjvutomaXnPFP198YFhsGJAmSS/qX0gRPEJwoco0BI=", + "lastModified": 1725054295, + "narHash": "sha256-iSyXHViYz4BwA9s0/5snN7/nl7G/QZhMzw9NXgcaYvo=", "owner": "nix-community", "repo": "NUR", - "rev": "758483969436e4a5f202760e7f158704572df459", + "rev": "a82303a6f2ca060958d14d43e04364f8f240d951", "type": "github" }, "original": { diff --git a/modules/home/programs/graphical/wms/hyprland/default.nix b/modules/home/programs/graphical/wms/hyprland/default.nix index ab6e47b5..2efc2792 100644 --- 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 index ada82cd0..31987142 100644 --- 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 index 57b05101..40809695 100644 --- 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 index 6ed4c530..02666ffb 100644 --- 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 index 05966461..55f2a6b9 100644 --- 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 index 77963860..73d13e07 100644 --- 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 index 4f4edbd5..eb7ce04f 100644 --- 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 deleted file mode 100644 index 49c1a9e9..00000000 --- a/systems/x86_64-linux/grovetender/networking.nix +++ /dev/null @@ -1,36 +0,0 @@ -_: { - networking = { - networkmanager = { - ensureProfiles = { - profiles = { - dib = { - ipv4 = { - dns-search = "~doitbestcorp.com"; - method = "auto"; - }; - }; - }; - }; - }; - }; - - systemd = { - network.networks = { - # wired interfaces e.g. ethernet - "30-network-defaults-wired" = { - matchConfig.Name = "en* | eth* | usb*"; - networkConfig = { - # Address = "192.168.1.3/24"; - # Gateway = "192.168.1.1"; - DHCP = "ipv4"; - MulticastDNS = true; - # IPv6AcceptRA = true; - # IPForward = "yes"; - # IPMasquerade = "no"; - }; - }; - }; - - services."systemd-networkd".environment.SYSTEMD_LOG_LEVEL = "debug"; - }; -}