stylix, formatting

lib/home.nix

@@ -1,6 +1,5 @@
 { user
 , name
-, hyprland
 , work ? false
 , displays ? [ ]
 , userName
@@ -35,5 +34,6 @@
   roles.work.enable = work;
   roles.personal.enable = !work;
   roles.mpd.enable = true;
+  programs.editor.neovim = true;
 
 }

lib/mkconf.nix

@@ -4,7 +4,6 @@ name:
 , home-manager
 , system
 , user
-, hyprland
 , laptop ? false
 , work ? false
 , userName
@@ -18,7 +17,7 @@ nixpkgs.lib.nixosSystem rec {
 
   modules = [
 
-    ({inputs, pkgs, ...}: {
+    ({ inputs, pkgs, ... }: {
       programs.hyprland = {
         enable = true;
         package = inputs.hyprland.packages.${pkgs.system}.hyprland;
@@ -30,14 +29,16 @@ nixpkgs.lib.nixosSystem rec {
         trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
       };
     }
+    inputs.stylix.nixosModules.stylix
+    ({ pkgs, ... }: {
+      stylix.image = ../images/demonslayer.png;
+      stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
+    })
     home-manager.nixosModules.home-manager
     {
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
-      home-manager.users.${user}.imports = [
-        hyprland.homeManagerModules.default
-      ];
     }
-    (import ./home.nix { inherit user userName name hyprland laptop work; })
+    (import ./home.nix { inherit inputs user userName name laptop work; })
   ];
 }

lib/modules/editor.nix

@@ -5,7 +5,7 @@ let
   pkg = editor.package;
   terminal = config.programs.terminal.package;
   termcmd = "${terminal}/bin/${terminal.pname}";
-  menu = config.programs.menu.package+config.programs.menu.dmenuCommand;
+  menu = config.programs.menu.package + config.programs.menu.dmenuCommand;
 in
 {
   options.programs = {
@@ -23,21 +23,26 @@ in
       programs.vscode = {
         enable = true;
         package = editor.package;
-        extensions = with pkgs; [
-          vscode-extensions.asvetliakov.vscode-neovim
-        ];
+        extensions =
+          if editor.neovim then with pkgs; [
+            vscode-extensions.asvetliakov.vscode-neovim
+          ] else [ ];
         userSettings = {
-          "vscode-neovim.neovimExecutablePaths.linux" = "${pkgs.neovim}/bin/nvim";
           "keyboard.dispatch" = "keyCode";
           "terminal.integrated.sendKeybindingsToShell" = true;
           "aws.telemetry" = false;
           "gitlens.telemetry.enabled" = false;
           "redhat.telemetry.enabled" = false;
           "cSpell.language" = "en,en-GB";
-        };
+        } // (if editor.neovim then {
+          "vscode-neovim.neovimExecutablePaths.linux" = "${pkgs.neovim}/bin/nvim";
+          "extensions.experimental.affinity" = {
+            "asvetliakov.vscode-neovim" = 1;
+          };
+        } else { });
       };
 
-      programs.neovim = {
+      programs.neovim = mkIf editor.neovim {
         enable = true;
         defaultEditor = true;
         coc = {
@@ -63,6 +68,7 @@ in
           vnoremap * y/\V<C-R>=escape(@",'/\')<CR><CR>
           vnoremap <C-R> "ry:%s/<C-R>=escape(@r,'/\')<CR>
           vnoremap A :norm A
+          noremap <C-S-I> :CocCommand editor.action.formatDocument<CR>
           set number
           set rnu
           set ignorecase
@@ -97,8 +103,8 @@ in
         esac
       '';
       install = false;
-      hotkeys = [{key = "C";}];
+      hotkeys = [{ key = "C"; }];
     }];
   };
-  
+
 }

lib/modules/mpd.nix

@@ -6,7 +6,7 @@ in
 {
   options.roles.mpd = {
     enable = mkEnableOption "setup mpd client";
-    host = mkOption {default = "music.local";};
+    host = mkOption { default = "192.168.1.2"; };
   };
 
   config = mkIf cfg.enable {
@@ -27,6 +27,21 @@ in
         enable = true;
         mpd.host = cfg.host;
       };
+      programs.waybar.settings.mainBar.mpd.server = cfg.host;
+      systemd.user.services = {
+        snapclient = {
+          Unit = {
+            Description = "Snapclient";
+          };
+          Service = {
+            ExecStart = "${pkgs.snapcast}/bin/snapclient -h ${cfg.host}";
+          };
+          Install = {
+            WantedBy = [ "graphical-session.target" ];
+          };
+        };
+      };
     }];
   };
+
 }

lib/modules/personal.nix

@@ -16,17 +16,20 @@ with lib;
     roles.dev.enable = true;
     roles.gamer.enable = true;
 
-    i18n.defaultLocale = "eo.UTF-8";
     i18n.supportedLocales = [
       "eo/UTF-8"
-      "en_US.UTF-8/UTF-8"
       "en_GB.UTF-8/UTF-8"
+      "en_US.UTF-8/UTF-8"
     ];
-    services.xserver.layout = "epo";
 
     home-manager.users.${user}.imports = [{
       services.nextcloud-client.enable = true;
       services.gnome-keyring.enable = true;
+
+      home.language = {
+        base = "eo.UTF-8";
+      };
+
       home.packages = with pkgs; [
         godot_4
         ardour
@@ -34,6 +37,7 @@ with lib;
         musescore
         jellyfin-media-player
         monero-gui
+        electrum
         xmrig
         transmission-remote-gtk
         krita
@@ -43,7 +47,7 @@ with lib;
         libsForQt5.neochat
         bookworm
       ];
-      
+
     }];
   };
 }

lib/modules/wayland.nix

@@ -238,9 +238,6 @@ in
                 paused = "⏸️";
               };
             };
-            mpd = {
-              server = "music.local";
-            };
             battery = {
               format = "{icon} {capacity}%";
               format-icons = [ "🤏" "🪫" "🔋" "🔋" ];