diff --git a/README.md b/README.md index 0561389..a6a470c 100644 --- a/README.md +++ b/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 diff --git a/flake.nix b/flake.nix index b755774..46f9723 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ inputs.nix-flatpak.homeManagerModules.nix-flatpak ]; - home-manager.backupFileExtension = "backup92"; + home-manager.backupFileExtension = "backup93"; } ]; }; diff --git a/modules/default.nix b/modules/default.nix index 1c011cf..b261858 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -30,6 +30,8 @@ xdg.mimeApps.enable = true; + + programs.home-manager.enable = true; home.stateVersion = "25.05"; } diff --git a/modules/gnome-quirks/default.nix b/modules/gnome-quirks/default.nix index aa37b52..a5bb9a0 100644 --- a/modules/gnome-quirks/default.nix +++ b/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" = { diff --git a/modules/sway/default.nix b/modules/sway/default.nix index 9927565..d5336c3 100644 --- a/modules/sway/default.nix +++ b/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 = { diff --git a/modules/sway/startup.sh b/modules/sway/startup.sh index e934081..3777b09 100755 --- a/modules/sway/startup.sh +++ b/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 diff --git a/modules/sway/waybar/config.jsonc b/modules/sway/waybar/config.jsonc index 116994e..4f617d8 100755 --- a/modules/sway/waybar/config.jsonc +++ b/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" } } } diff --git a/modules/sway/waybar/custom_modules/power_menu.xml b/modules/sway/waybar/custom_modules/power_menu.xml deleted file mode 100755 index aa2a42c..0000000 --- a/modules/sway/waybar/custom_modules/power_menu.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - Suspend - - - - - Hibernate - - - - - Shutdown - - - - - - - - Reboot - - - - diff --git a/modules/sway/waybar/power_menu.xml b/modules/sway/waybar/power_menu.xml index aa2a42c..547ebad 100755 --- a/modules/sway/waybar/power_menu.xml +++ b/modules/sway/waybar/power_menu.xml @@ -2,27 +2,29 @@ - - Suspend - - - - - Hibernate - - + + Suspend + + + + + Hibernate + + - - Shutdown - + + Shutdown + - + + Reboot + - - Reboot - + + Logout + diff --git a/modules/wallpaper-anime.png b/modules/wallpaper-anime.png new file mode 100644 index 0000000..76e0d01 Binary files /dev/null and b/modules/wallpaper-anime.png differ diff --git a/modules/wallpaper-sequoia.png b/modules/wallpaper-sequoia.png new file mode 100644 index 0000000..619dccc Binary files /dev/null and b/modules/wallpaper-sequoia.png differ diff --git a/modules/wallpaper.jpg b/modules/wallpaper.jpg deleted file mode 100644 index a8e5505..0000000 Binary files a/modules/wallpaper.jpg and /dev/null differ diff --git a/screenshot-gnome.png b/screenshot-gnome.png new file mode 100644 index 0000000..b49c460 Binary files /dev/null and b/screenshot-gnome.png differ diff --git a/screenshot-sway.png b/screenshot-sway.png new file mode 100644 index 0000000..d241265 Binary files /dev/null and b/screenshot-sway.png differ diff --git a/screenshot.png b/screenshot.png deleted file mode 100644 index 29ab62f..0000000 Binary files a/screenshot.png and /dev/null differ