init for thinkpad

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

arch_packages.txt

@@ -8,3 +8,5 @@ hyprsunset
 satty
 kitty
 mangohud
+brave-bin
+zen-browser-bin

flake.lock

@@ -117,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771851181,
-        "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=",
+        "lastModified": 1772060133,
+        "narHash": "sha256-VuyRptb8v1lVGMlLp4/1vRX3Efwec0CN0S6mKmDPzLg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c",
+        "rev": "ce9b6e52500a0ea0ec48f0bbf6d7a3e431d9dfa4",
         "type": "github"
       },
       "original": {
@@ -205,11 +205,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1772022552,
-        "narHash": "sha256-L3zktLSXcvsqczTz7YL5PXYgn4a08tRfl9t6YYLESM8=",
+        "lastModified": 1772107319,
+        "narHash": "sha256-qdeeNrWmUe1P2FsnNU1ngoZl8UxczEMJBziwm78V42I=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "457617b5a31f70ea63e1fcc0729f29e4a9e6b486",
+        "rev": "c71fbd854dfdedaae011f4b8b1fdb81f8054b309",
         "type": "github"
       },
       "original": {
@@ -483,11 +483,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1771369470,
-        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+        "lastModified": 1771848320,
+        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0182a361324364ae3f436a63005877674cf45efb",
+        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
         "type": "github"
       },
       "original": {

flake.nix

@@ -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 = "LVDS-1"; # only for some applications: you still need to set hyprland monitors yourself!
         statusBar = "ashell"; # available: ashell|waybar
 
         pathConfig = {
@@ -49,11 +49,16 @@
           obsidian = "Dokumenty/obsidian";
         };
       };
+
+      system = "x86_64-linux";
     in
     {
       homeConfigurations = {
         "arch" = home-manager.lib.homeManagerConfiguration {
-          pkgs = import nixpkgs { system = "x86_64-linux"; };
+          pkgs = import nixpkgs {
+            inherit system;
+            config.allowUnfree = true;
+          };
           extraSpecialArgs = {
             inherit
               inputs
@@ -69,7 +74,10 @@
 
         };
         "nixos" = home-manager.lib.homeManagerConfiguration {
-          pkgs = import nixpkgs { system = "x86_64-linux"; };
+          pkgs = import nixpkgs {
+            inherit system;
+            config.allowUnfree = true;
+          };
           extraSpecialArgs = {
             inherit
               inputs

home.nix

@@ -74,6 +74,7 @@
   home.sessionVariables = {
     EDITOR = "nvim";
     VISUAL = "nvim";
+    XDG_DATA_DIRS = "$HOME/.nix-profile/share/applications:$XDG_DATA_DIRS";
   };
 
   programs.home-manager.enable = true;

modules/desktop.nix

@@ -1,31 +1,44 @@
 { ... }:
 
-{
-  xdg.desktopEntries = {
-    x = {
-      name = "X";
-      genericName = "Social Media Client";
-      comment = "Open X (twitter)";
-      exec = "uwsm app -- chromium --app=https://x.com";
-      icon = "twitter";
+let
+  mkWebApp =
+    {
+      name,
+      url,
+      icon,
+      wmClass,
+    }:
+    {
+      inherit name icon;
+      genericName = "Web app";
+      comment = "Open ${name}";
+      exec = "uwsm app -- brave --app=https://${url}";
       terminal = false;
       categories = [
         "Network"
         "WebBrowser"
         "X-Social"
       ];
+      settings = {
+        StartupWMClass = wmClass;
+      };
+    };
+in
+{
+
+  xdg.desktopEntries = {
+    x = mkWebApp {
+      name = "X";
+      url = "x.com";
+      icon = "twitter";
+      wmClass = "brave-x.com__-Default";
     };
 
-    proton-mail = {
-      name = "Proton mail";
-      genericName = "Proton mail";
-      comment = "Open Proton Mail";
-      exec = "uwsm app -- chromium --app=https://mail.proton.me/u/0/inbox.com";
-      terminal = false;
-      categories = [ "Email" ];
-      settings = {
-        StartupWMClass = "proton-mail.com";
-      };
+    proton-mail = mkWebApp {
+      name = "Proton-mail";
+      url = "mail.proton.me/u/0/inbox.com";
+      icon = "proton-mail";
+      wmClass = "brave-mail.proton.me__u_0_inbox.com-Default";
     };
   };
 }

modules/gui/mako.nix

@@ -35,13 +35,12 @@
       border-color=#FF6347
 
       [urgency=critical]
-      on-notify =
-        ${
-          if isNixOS then
-            "exec ${pkgs.pulseaudio}/bin/paplay ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/dialog-information.oga"
-          else
-            "exec paplay /usr/share/sounds/freedesktop/stereo/dialog-information.oga"
-        };
+      on-notify=${
+        if isNixOS then
+          "exec ${pkgs.pulseaudio}/bin/paplay ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/dialog-information.oga"
+        else
+          "exec paplay /usr/share/sounds/freedesktop/stereo/dialog-information.oga"
+      }
       border-color=#FF0000
 
       [mode=do-not-disturb]

modules/hypr/hyprland.nix

@@ -2,6 +2,7 @@
   isNixOS,
   lib,
   userConfig,
+  inputs,
   pkgs,
   ...
 }:
@@ -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";
@@ -50,7 +56,7 @@ in
         "col.inactive_border" = "$overlay1";
         resize_on_border = false;
         allow_tearing = false;
-        layout = "dwindle";
+        layout = "scrolling";
       };
 
       animations = {
@@ -193,7 +199,7 @@ in
         "match:class ^(zen)$, workspace 2"
         "match:class ^(com.github.IsmaelMartinez.teams_for_linux)$, workspace 2"
         "match:class ^(FreeTube)$, workspace 2"
-        "match:class ^(chrome-x.com__-Default)$, workspace 2"
+        "match:class ^(brave-x.com__-Default)$, workspace 2"
         "match:class ^(chrome-www.inoreader.com__all_articles-Default)$, workspace 2"
         "match:class ^(chrome-mail.proton.me__u_0_inbox.com-Default)$, workspace 2"
         "match:class ^(chrome-app.tuta.com__-Default)$, workspace 2"
@@ -281,7 +287,7 @@ in
           "$mainMod Control_L, m, exec, [workspace 9] uwsm app -- $music_player"
           "$mainMod Control_L, f, exec, uwsm app -- freetube"
           "$mainMod Control_L, f, focuswindow, class:^(freetube)$"
-          "$mainMod Control_L, x, exec, uwsm app -- ~/.local/share/applications/x.desktop"
+          "$mainMod Control_L, x, exec, uwsm app -- ~/.nix-profile/share/applications/x.desktop"
           "$mainMod Control_L, x, focuswindow, class:^(chrome-x.com__-Default)$"
           "$mainMod CONTROL_L L_SHIFT, B, exec, killall ashell && uwsm app -- ashell"
         ];

modules/packages.nix

@@ -2,6 +2,9 @@
 
 {
   home.packages = with pkgs; [
+    waypaper
+    swww
+    gnupg
     libnotify
     cliphist
     gh

modules/xdg.nix

@@ -1,5 +1,13 @@
 { ... }:
 
+let
+  browserFallback = [
+    "zen-beta.desktop"
+    "zen.desktop"
+    "brave.desktop"
+    "chromium.desktop"
+  ];
+in
 {
   xdg.portal.config = {
     common = {
@@ -15,16 +23,16 @@
     defaultApplications = {
       "application/pdf" = [ "org.pwmt.zathura.desktop" ];
 
-      "text/html" = [ "zen.desktop" ];
-      "application/xhtml+xml" = [ "zen.desktop" ];
-      "x-scheme-handler/http" = [ "zen.desktop" ];
-      "x-scheme-handler/https" = [ "zen.desktop" ];
-      "x-scheme-handler/chrome" = [ "zen.desktop" ];
-      "application/x-extension-htm" = [ "zen.desktop" ];
-      "application/x-extension-html" = [ "zen.desktop" ];
-      "application/x-extension-shtml" = [ "zen.desktop" ];
-      "application/x-extension-xht" = [ "zen.desktop" ];
-      "application/x-extension-xhtml" = [ "zen.desktop" ];
+      "text/html" = browserFallback;
+      "application/xhtml+xml" = browserFallback;
+      "x-scheme-handler/http" = browserFallback;
+      "x-scheme-handler/https" = browserFallback;
+      "x-scheme-handler/chrome" = browserFallback;
+      "application/x-extension-htm" = browserFallback;
+      "application/x-extension-html" = browserFallback;
+      "application/x-extension-shtml" = browserFallback;
+      "application/x-extension-xht" = browserFallback;
+      "application/x-extension-xhtml" = browserFallback;
 
       "audio/*" = [ "mpv.desktop" ];
       "audio/mpeg" = [ "mpv.desktop" ];
@@ -39,4 +47,17 @@
       "x-scheme-handler/tuta" = [ "tutanota-desktop.desktop" ];
     };
   };
+
+  xdg.userDirs = {
+    enable = true;
+    createDirectories = true;
+    desktop = null;
+    documents = "$HOME/Dokumenty";
+    download = "$HOME/Pobrane";
+    music = null;
+    pictures = "$HOME/Obrazy";
+    videos = "$HOME/Video";
+    templates = null;
+    publicShare = null;
+  };
 }