update wallpapers and screenshots

README.md

@@ -2,7 +2,9 @@
 
 Very similar to [dotfiles-void](https://git.meex.lol/MeexReay/dotfiles-void)
 
-![](screenshot.png)
+![](screenshot-sway.png)
+
+![](screenshot-gnome.png)
 
 ## How to install
 

flake.nix

@@ -31,7 +31,7 @@
               inputs.nix-flatpak.homeManagerModules.nix-flatpak
             ];
 
-            home-manager.backupFileExtension = "backup92";
+            home-manager.backupFileExtension = "backup93";
           }
         ];
       };

modules/default.nix

@@ -30,6 +30,8 @@
 
   xdg.mimeApps.enable = true;
 
+  
+
   programs.home-manager.enable = true;
   home.stateVersion = "25.05";
 }

modules/gnome-quirks/default.nix

@@ -21,12 +21,12 @@
     gnome-extension-manager
   ];
  
-  # gtk = {
-  #   enable = true;
-  #   theme.name = "Adwaita-dark";
-  #   iconTheme.name = "Adwaita";
-  #   gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
-  # };
+  gtk = {
+    enable = true;
+    theme.name = "Adwaita";
+    iconTheme.name = "Adwaita";
+    gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
+  };
 
   # qt.enable = true;
   # qt.style.name = "adwaita-dark";
@@ -83,12 +83,11 @@
       unity-backlit-items = false;
     };
     "org/gnome/desktop/background" = {
-      picture-uri = "file:///${../wallpaper.jpg}";
-      picture-uri-dark = "file://${../wallpaper.jpg}";
+      picture-uri = "file:///${../wallpaper-sequoia.png}";
+      picture-uri-dark = "file://${../wallpaper-sequoia.png}";
     };
     "org/gnome/desktop/input-sources" = {
       show-all-sources = true;
-      # sources = [ (mkTuple [ "xkb" "us" ]) (mkTuple [ "xkb" "ru" ]) ];
       xkb-options = [ "grp:alt_caps_toggle" ];
     };
     "org/gnome/desktop/wm/preferences" = {

modules/sway/default.nix

@@ -216,7 +216,7 @@
 
   xdg.configFile."sway/idle.sh".source = ./idle.sh;
   xdg.configFile."sway/startup.sh".source = ./startup.sh;
-  xdg.configFile."sway/wallpaper.jpg".source = ../wallpaper.jpg;
+  xdg.configFile."sway/wallpaper.png".source = ../wallpaper-sequoia.png;
   xdg.configFile."waybar" = { source = ./waybar; recursive = true; };
 
   xdg.mimeApps.defaultApplications = {

modules/sway/startup.sh

@@ -3,7 +3,7 @@
 dunst &
 copyq &
 blueman-applet &
-swaybg -m fill -i ~/.config/sway/wallpaper.jpg &
+swaybg -m fill -i ~/.config/sway/wallpaper.png &
 ~/.startup &
 
 wait

modules/sway/waybar/config.jsonc

@@ -11,7 +11,6 @@
   // -------------------------------------------------------------------------
   "layer": "top",
   "position": "top",
-  // If height property would be not present, it'd be calculated dynamically
   "height": 23,
   "modules-left": [
     "sway/workspaces",
@@ -23,21 +22,14 @@
     "tray",
     "custom/keyboard-layout",
     "backlight",
-    //"keyboard-state",
-    // "bluetooth",
     "pulseaudio",
     "memory",
     "cpu",
-    // "temperature",
-    // "custom/keyboard-layout",
-    //"battery",
-    //"battery#bat2",
-    // "pulseaudio",
-    // "tray",
     "clock#date",
     "clock#time",
     "custom/power"
   ],
+  
   // -------------------------------------------------------------------------
   // Modules
   // -------------------------------------------------------------------------
@@ -68,36 +60,11 @@
     "format": " {status}",
     "format-connected": " {device_alias}",
     "format-connected-battery": " {device_alias} {device_battery_percentage}%",
-    // "format-device-preference": [ "device1", "device2" ], // preference list deciding the displayed device
     "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
     "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
     "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
     "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%"
   },
-  "battery": {
-    "interval": 10,
-    "states": {
-      "warning": 30,
-      "critical": 15
-    },
-    // Connected to AC
-    "format": "  {capacity}%", // Icon: bolt
-    // Not connected to AC
-    "format-discharging": "{icon}  {capacity}%",
-    "format-icons": [
-      "", // Icon: battery-full
-      "", // Icon: battery-three-quarters
-      "", // Icon: battery-half
-      "", // Icon: battery-quarter
-      "" // Icon: battery-empty
-    ],
-    "format-alt": "{time} {icon}",
-    "tooltip": true,
-    "on-click": "gnome-power-statistics"
-  },
-  "battery#bat2": {
-    "bat": "BAT2"
-  },
   "clock#time": {
     "interval": 1,
     "format": "{:%H:%M:%S}",
@@ -125,13 +92,10 @@
   },
   "custom/keyboard-layout": {
     "exec": "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4",
-    // Interval set only as a fallback, as the value is updated by signal
     "interval": 1,
-    "format": "  {}", // Icon: keyboard
-    // Signal sent by Sway key binding (~/.config/sway/key-bindings)
-    "signal": 1, // SIGHUP
+    "format": "  {}",
+    "signal": 1,
     "tooltip": false
-    // "locale": "ru_RU.UTF-8"
   },
   "memory": {
     "interval": 5,
@@ -218,7 +182,8 @@
       "shutdown": "systemctl poweroff",
       "reboot": "systemctl reboot",
       "suspend": "systemctl suspend",
-      "hibernate": "systemctl hibernate"
+      "hibernate": "systemctl hibernate",
+      "logout": "pkill sway"
     }
   }
 }

modules/sway/waybar/custom_modules/power_menu.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkMenu" id="menu">
-    <child>
-		<object class="GtkMenuItem" id="suspend">
-			<property name="label">Suspend</property>
-        </object>
-	</child>
-	<child>
-        <object class="GtkMenuItem" id="hibernate">
-			<property name="label">Hibernate</property>
-        </object>
-	</child>
-    <child>
-        <object class="GtkMenuItem" id="shutdown">
-			<property name="label">Shutdown</property>
-        </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="delimiter1"/>
-    </child>
-    <child>
-		<object class="GtkMenuItem" id="reboot">
-			<property name="label">Reboot</property>
-		</object>
-    </child>
-  </object>
-</interface>

modules/sway/waybar/power_menu.xml

@@ -16,13 +16,15 @@
   			<property name="label">Shutdown</property>
       </object>
     </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="delimiter1"/>
-    </child>
     <child>
     	<object class="GtkMenuItem" id="reboot">
     		<property name="label">Reboot</property>
   		</object>
     </child>
+    <child>
+    	<object class="GtkMenuItem" id="logout">
+    		<property name="label">Logout</property>
+  		</object>
+    </child>
   </object>
 </interface>