Merge branch 'master' of https://github.com/szymon-jozef/amazing-dotfiles

flake.nix

@@ -32,7 +32,7 @@
     }@inputs:
 
     let
-      userConfig = {
+      baseUserConfig = {
         username = "szymon";
         # for git
         email = "szymon_jozef@proton.me";
@@ -40,7 +40,7 @@
         # your public ssh key
         signingKey = "~/.ssh/github.pub";
 
-        mainMonitor = "eDP-1"; # only for some applications: you still need to set hyprland monitors yourself!
+        mainMonitor = "DP-1"; # only for some applications: you still need to set hyprland monitors yourself!
         statusBar = "ashell"; # available: ashell|waybar
 
         pathConfig = {
@@ -51,45 +51,70 @@
       };
 
       system = "x86_64-linux";
+
+      general_import = import nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+      };
+
+      general_module_import = [
+        ./home.nix
+        catppuccin.homeModules.catppuccin
+        nixvim.homeModules.nixvim
+      ];
+
+      mkHomeConfig =
+        {
+          isNixOS,
+          overrides ? { },
+          hostName,
+        }:
+        home-manager.lib.homeManagerConfiguration {
+          pkgs = general_import;
+
+          extraSpecialArgs = {
+            inherit inputs isNixOS hostName;
+            userConfig = baseUserConfig // overrides;
+          };
+
+          modules = general_module_import;
+        };
+
     in
     {
       homeConfigurations = {
-        "arch" = home-manager.lib.homeManagerConfiguration {
+        "arch" = mkHomeConfig {
-          pkgs = import nixpkgs {
+          isNixOS = false;
-            inherit system;
+          hostName = "arch";
-            config.allowUnfree = true;
-          };
-          extraSpecialArgs = {
-            inherit
-              inputs
-              userConfig
-              ;
-            isNixOS = false;
-          };
-          modules = [
-            ./home.nix
-            catppuccin.homeModules.catppuccin
-            nixvim.homeModules.nixvim
-          ];
-
         };
-        "nixos" = home-manager.lib.homeManagerConfiguration {
+
-          pkgs = import nixpkgs {
+        "nixos" = mkHomeConfig {
-            inherit system;
+          isNixOS = true;
-            config.allowUnfree = true;
+          hostName = "nixos";
+        };
+
+        "pitagoras" = mkHomeConfig {
+          isNixOS = true;
+          overrides = {
+            mainMonitor = "eDP-1";
           };
-          extraSpecialArgs = {
+          hostName = "pitagoras";
-            inherit
+        };
-              inputs
+
-              userConfig
+        "pilecki" = mkHomeConfig {
-              ;
+          isNixOS = true;
-            isNixOS = true;
+          overrides = {
+            mainMonitor = "LVDS-1";
           };
-          modules = [
+          hostName = "pilecki";
-            ./home.nix
+        };
-            catppuccin.homeModules.catppuccin
+
-            nixvim.homeModules.nixvim
+        "paderewski" = mkHomeConfig {
-          ];
+          isNixOS = false;
+          overrides = {
+            mainMonitor = "DP-1";
+          };
+          hostName = "paderewski";
         };
       };
     };

modules/cli/fish.nix

@@ -1,4 +1,4 @@
-{ isNixOS, ... }:
+{ isNixOS, hostName, ... }:
 
 {
   programs.fish = {
@@ -45,7 +45,7 @@
                     
                     set -l rel_file (realpath --relative-to=$config_dir $file)
                     
-                    if nh home switch $config_dir -c ${if isNixOS then "nixos" else "arch"}
+                    if nh home switch $config_dir -c ${hostName}
                         git add -A
                         set commit_msg "update: $rel_file"
                         git commit -m "$commit_msg"
@@ -61,7 +61,7 @@
 
       reload_dotfiles = {
         body = # fish
-          "nh home switch ~/.config/home-manager -c ${if isNixOS then "nixos" else "arch"}";
+          "nh home switch ~/.config/home-manager -c ${hostName}";
       };
 
       ls = {

modules/hypr/hyprland.nix

@@ -3,6 +3,7 @@
   lib,
   userConfig,
   pkgs,
+  inputs,
   ...
 }:
 let
@@ -24,7 +25,12 @@ in
 {
   wayland.windowManager.hyprland = {
     enable = true;
-    package = lib.mkIf (!isNixOS) null;
+    package =
+      if isNixOS then inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland else null;
+    portalPackage = lib.mkIf (
+      isNixOS
+    ) inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+    xwayland.enable = true;
 
     settings = {
       "$mainMod" = "SUPER";
@@ -32,7 +38,7 @@ in
       "$menu" = "hyprlauncher";
       "$music_player" = "flatpak run com.spotify.Client";
       "$notes" = "obsidian";
-      "$browser" = "zen-browser";
+      "$browser" = if isNixOS then "zen-beta" else "zen-browser"; # beta on nixos
       "$openrgb_color" = "09ce30";
 
       env = [
@@ -50,7 +56,7 @@ in
         "col.inactive_border" = "$overlay1";
         resize_on_border = false;
         allow_tearing = false;
-        layout = "dwindle";
+        layout = "scrolling";
       };
 
       animations = {
@@ -168,6 +174,7 @@ in
 
       workspace = [
         "1, monitor:DP-2"
+        "1, layout: dwindle"
         "2, monitor:DP-1"
         "3, monitor:DP-1"
         "4, monitor:DP-1"
@@ -191,6 +198,7 @@ in
         "match:class ^(vesktop)$, workspace 1 silent"
         "match:class ^(chrome-facebook.com__-Default)$, workspace 1"
         "match:class ^(zen)$, workspace 2"
+        "match:class ^(zen-beta)$, workspace 2"
         "match:class ^(com.github.IsmaelMartinez.teams_for_linux)$, workspace 2"
         "match:class ^(FreeTube)$, workspace 2"
         "match:class ^(brave-x.com__-Default)$, workspace 2"
@@ -343,8 +351,8 @@ in
       bindd = [
         "$mainMod, F, Make app fullscreen, fullscreen"
         "$mainMod, T, Toggle floating, togglefloating"
-        "$mainMod, P, Toggle pseudo, pseudo"
+        "$mainMod, S, layoutmsg, swapsplit"
-        "$mainMod, S, Toggle split, togglesplit"
+        "$mainMod, C, layoutmsg, togglesplit"
         "$mainMod, Q, Kill active window, killactive"
       ];
     };