diff --git a/flake.lock b/flake.lock index 6de4fad..238c22b 100644 --- a/flake.lock +++ b/flake.lock @@ -6,27 +6,27 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756331205, - "narHash": "sha256-zbqFaQ5cfnjurlTu+HxDlAbS3E6lDu7pIhDQkg1CEvw=", - "owner": "MeexReay", + "lastModified": 1757189909, + "narHash": "sha256-csgWLnQrfvkn/WO4YXy4cGIGIwRW8dah99ZFmnIJ3zM=", + "owner": "locomiadev", "repo": "envfetch", - "rev": "f923953a6c1c927a8a3b6c2107ec11c0281ff3c1", + "rev": "5928ea4b30c43c1a2d001e26a8944f75f8a56e7e", "type": "github" }, "original": { - "owner": "MeexReay", + "owner": "locomiadev", "repo": "envfetch", "type": "github" } }, "flake-compat": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69" }, "original": { "type": "tarball", @@ -38,11 +38,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1750792728, - "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", + "lastModified": 1756679287, + "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", + "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1736952876, - "narHash": "sha256-dJXuLP2CBkIG333L+Rb3e1D0oXHYbl0MgmKPGuvFuAI=", + "lastModified": 1754777568, + "narHash": "sha256-0bBqT+3XncgF8F03RFAamw9vdf0VmaDoIJLTGkjfQZs=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "b6966d5fa96b0fae99a4da0b5bdfbb0a75f5c058", + "rev": "62f636b87ef6050760a8cb325cadb90674d1e23e", "type": "github" }, "original": { @@ -142,11 +142,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1751159883, - "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752866191, - "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=", + "lastModified": 1749494155, + "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a", + "rev": "88331c17ba434359491e8d5889cce872464052c2", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750622754, - "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", + "lastModified": 1756886854, + "narHash": "sha256-6tooT142NLcFjt24Gi4B0G1pgWLvfw7y93sYEfSHlLI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", + "rev": "0e6684e6c5755325f801bda1751a8a4038145d7d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 866621f..0565b65 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixcord.url = "github:KaylorBen/nixcord/411d48a6"; nix-flatpak.url = "github:gmodena/nix-flatpak"; - envfetch.url = "github:MeexReay/envfetch"; + envfetch.url = "github:locomiadev/envfetch"; }; outputs = inputs@{ nixpkgs, home-manager, ... }: { @@ -30,7 +30,7 @@ inputs.nix-flatpak.homeManagerModules.nix-flatpak ]; - home-manager.backupFileExtension = "backup99"; + home-manager.backupFileExtension = "backup90"; } ]; }; diff --git a/modules/default.nix b/modules/default.nix index 791b1cc..1c011cf 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -5,7 +5,7 @@ ./packages ./sway # ./proxies - # ./gnome-quirks + ./gnome-quirks ]; home.username = "user"; diff --git a/modules/gnome-quirks/default.nix b/modules/gnome-quirks/default.nix index 0ccc9f9..aa37b52 100644 --- a/modules/gnome-quirks/default.nix +++ b/modules/gnome-quirks/default.nix @@ -4,17 +4,32 @@ home.packages = with pkgs; [ libadwaita adwaita-icon-theme + + gnomeExtensions.app-hider + gnomeExtensions.clipboard-indicator + gnomeExtensions.dash-to-dock + gnomeExtensions.gsconnect + gnomeExtensions.tray-icons-reloaded + gnomeExtensions.gtk4-desktop-icons-ng-ding + gnomeExtensions.simple-workspaces-bar + gnomeExtensions.desktop-cube + gnomeExtensions.category-sorted-app-grid + gnomeExtensions.blur-my-shell + + dconf-editor + gnome-tweaks + 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-dark"; + # iconTheme.name = "Adwaita"; + # gtk3.extraConfig.gtk-application-prefer-dark-theme = 1; + # }; - qt.enable = true; - qt.style.name = "adwaita-dark"; + # qt.enable = true; + # qt.style.name = "adwaita-dark"; dconf.settings = { "org/gnome/desktop/interface" = { @@ -32,6 +47,8 @@ "clipboard-indicator@tudmotu.com" "gtk4-ding@smedius.gitlab.com" "desktop-cube@schneegans.github.com" + "blur-my-shell@aunetx" + "category-sorted-app-grid@noobping.dev" ]; }; "org/gnome/shell/extensions/dash-to-dock" = { @@ -39,35 +56,39 @@ animate-show-apps = true; apply-custom-theme = false; apply-glossy-effect = false; - background-opacity = 0.80000000000000004; + background-opacity = 0.8; custom-theme-customize-running-dots = true; custom-theme-running-dots-border-width = 0; custom-theme-shrink = true; dance-urgent-applications = true; - dash-max-icon-size = 42; - dock-fixed = true; - dock-position = "RIGHT"; - extend-height = true; - height-fraction = 0.90000000000000002; + dash-max-icon-size = 48; + dock-fixed = false; + dock-position = "BOTTOM"; + extend-height = false; + height-fraction = 0.9; + icon-size-fixed = false; + intellihide-mode = "FOCUS_APPLICATION_WINDOWS"; isolate-locations = true; + max-alpha = 0.8; preferred-monitor = -2; - preferred-monitor-by-connector = "HDMI-0"; + preferred-monitor-by-connector = "HDMI-1"; preview-size-scale = 0.0; - running-indicator-dominant-color = false; + running-indicator-dominant-color = true; running-indicator-style = "DOTS"; show-apps-always-in-the-edge = true; show-apps-at-top = false; show-mounts = false; show-mounts-only-mounted = true; + transparency-mode = "DEFAULT"; unity-backlit-items = false; }; "org/gnome/desktop/background" = { - picture-uri = "file:///${config.home.homeDirectory}/.local/share/backgrounds/2024-09-02-12-25-09-wallpaper.png"; - picture-uri-dark = "file:///${config.home.homeDirectory}/.local/share/backgrounds/2024-09-02-12-25-09-wallpaper.png"; + picture-uri = "file:///${../wallpaper.jpg}"; + picture-uri-dark = "file://${../wallpaper.jpg}"; }; "org/gnome/desktop/input-sources" = { show-all-sources = true; - sources = [ (mkTuple [ "xkb" "us" ]) (mkTuple [ "xkb" "ru" ]) ]; + # sources = [ (mkTuple [ "xkb" "us" ]) (mkTuple [ "xkb" "ru" ]) ]; xkb-options = [ "grp:alt_caps_toggle" ]; }; "org/gnome/desktop/wm/preferences" = { diff --git a/modules/packages/default.nix b/modules/packages/default.nix index 5f0433b..92c32d0 100644 --- a/modules/packages/default.nix +++ b/modules/packages/default.nix @@ -109,7 +109,7 @@ # internet spotify - firefox + firefox-bin telegram-desktop (chromium.override { enableWideVine = true; }) revolt-desktop diff --git a/modules/proxies/hysteria. b/modules/proxies/hysteria. new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/modules/proxies/hysteria. @@ -0,0 +1 @@ + diff --git a/modules/sway/default.nix b/modules/sway/default.nix index 68c297e..32999b0 100644 --- a/modules/sway/default.nix +++ b/modules/sway/default.nix @@ -215,8 +215,7 @@ xdg.configFile."sway/idle.sh".source = ./idle.sh; xdg.configFile."sway/startup.sh".source = ./startup.sh; - xdg.configFile."sway/random-bg.py".source = ./random-bg.py; - xdg.configFile."sway/wallpapers" = { source = ./wallpapers; recursive = true; }; + xdg.configFile."sway/wallpaper.jpg".source = ../wallpaper.jpg; xdg.configFile."waybar" = { source = ./waybar; recursive = true; }; xdg.mimeApps.defaultApplications = { diff --git a/modules/sway/random-bg.py b/modules/sway/random-bg.py deleted file mode 100755 index d6a220c..0000000 --- a/modules/sway/random-bg.py +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env python - -import random -import time -import subprocess -import threading -import sys -import os -import psutil - -WALLPAPERS_DIR = os.path.join(os.path.dirname(__file__), "wallpapers/") -INTERVAL_SECONDS = 60 * 10 - -def get_wallpapers(): - return [os.path.join(WALLPAPERS_DIR, i) for i in os.listdir(WALLPAPERS_DIR)] - -def get_random_wallpaper(): - return random.choice(get_wallpapers()) - -def create_wallpaper_process(path): - process = subprocess.Popen( - ["swaybg", "-m", "fill", "-i", path], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE - ) - return process - -def send_wallpaper(path, interval): - process = create_wallpaper_process(path) - time.sleep(1) - kill_old_processes(process.pid) - time.sleep(interval-1) - process.kill() - -def kill_old_processes(new_pid): - for proc in psutil.process_iter(): - if proc.pid != new_pid and proc.name() == "swaybg": - print(proc.name(), proc.pid) - proc.kill() - -def main(): - args = sys.argv[1:] - - if len(args) == 1: - if args[0] == "loop": - while True: - wallpapers = get_wallpapers() - random.shuffle(wallpapers) - - for wallpaper in wallpapers: - thread = threading.Thread( - target = lambda: send_wallpaper( - wallpaper, - INTERVAL_SECONDS + 1 - ) - ) - thread.start() - time.sleep(INTERVAL_SECONDS) - return - elif args[0] == "onetime": - process = create_wallpaper_process(get_random_wallpaper()) - while process.stdout.read() not in "1234567890-:_": - time.sleep(1/60) - if process.poll() is None: - kill_old_processes(process.pid) - process.wait() - return - - print("Usage:", sys.argv[0], "") - -if __name__ == "__main__": - main() diff --git a/modules/sway/startup.sh b/modules/sway/startup.sh index 61e15c9..e934081 100755 --- a/modules/sway/startup.sh +++ b/modules/sway/startup.sh @@ -3,8 +3,7 @@ dunst & copyq & blueman-applet & -# ~/.config/sway/random-bg.py loop & -swaybg -m fill -i ~/.config/sway/wallpapers/wallhaven-218d7y.jpg & +swaybg -m fill -i ~/.config/sway/wallpaper.jpg & ~/.startup & wait diff --git a/modules/sway/wallpapers/1086198.png b/modules/sway/wallpapers/1086198.png deleted file mode 100755 index 1f2d8a1..0000000 Binary files a/modules/sway/wallpapers/1086198.png and /dev/null differ diff --git a/modules/sway/wallpapers/108764.jpg b/modules/sway/wallpapers/108764.jpg deleted file mode 100755 index 956e0f8..0000000 Binary files a/modules/sway/wallpapers/108764.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/110811.jpg b/modules/sway/wallpapers/110811.jpg deleted file mode 100755 index 022f847..0000000 Binary files a/modules/sway/wallpapers/110811.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/113424.jpg b/modules/sway/wallpapers/113424.jpg deleted file mode 100755 index 2d50d80..0000000 Binary files a/modules/sway/wallpapers/113424.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/12-Dark.jpg b/modules/sway/wallpapers/12-Dark.jpg deleted file mode 100644 index 19ce671..0000000 Binary files a/modules/sway/wallpapers/12-Dark.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/12-Light.jpg b/modules/sway/wallpapers/12-Light.jpg deleted file mode 100644 index bcf4df3..0000000 Binary files a/modules/sway/wallpapers/12-Light.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/1270543.jpg b/modules/sway/wallpapers/1270543.jpg deleted file mode 100755 index 9cdf02e..0000000 Binary files a/modules/sway/wallpapers/1270543.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/127852.jpg b/modules/sway/wallpapers/127852.jpg deleted file mode 100755 index d89ad94..0000000 Binary files a/modules/sway/wallpapers/127852.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/1289103.jpg b/modules/sway/wallpapers/1289103.jpg deleted file mode 100755 index 9ea5d7e..0000000 Binary files a/modules/sway/wallpapers/1289103.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/13-Ventura-Dark.jpg b/modules/sway/wallpapers/13-Ventura-Dark.jpg deleted file mode 100644 index 736667e..0000000 Binary files a/modules/sway/wallpapers/13-Ventura-Dark.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/13-Ventura-Light.jpg b/modules/sway/wallpapers/13-Ventura-Light.jpg deleted file mode 100644 index 04806cb..0000000 Binary files a/modules/sway/wallpapers/13-Ventura-Light.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/1300257.jpg b/modules/sway/wallpapers/1300257.jpg deleted file mode 100755 index 92913c2..0000000 Binary files a/modules/sway/wallpapers/1300257.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/1355110.jpeg b/modules/sway/wallpapers/1355110.jpeg deleted file mode 100755 index e3fba2e..0000000 Binary files a/modules/sway/wallpapers/1355110.jpeg and /dev/null differ diff --git a/modules/sway/wallpapers/14-Sonoma-Dark.jpg b/modules/sway/wallpapers/14-Sonoma-Dark.jpg deleted file mode 100644 index 08b7759..0000000 Binary files a/modules/sway/wallpapers/14-Sonoma-Dark.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/14-Sonoma-Horizon.png b/modules/sway/wallpapers/14-Sonoma-Horizon.png deleted file mode 100644 index b97cfc0..0000000 Binary files a/modules/sway/wallpapers/14-Sonoma-Horizon.png and /dev/null differ diff --git a/modules/sway/wallpapers/14-Sonoma-Light.jpg b/modules/sway/wallpapers/14-Sonoma-Light.jpg deleted file mode 100644 index 9ddcf5d..0000000 Binary files a/modules/sway/wallpapers/14-Sonoma-Light.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/15-Sequoia-Dark-thumbnail.jpg b/modules/sway/wallpapers/15-Sequoia-Dark-thumbnail.jpg deleted file mode 100644 index 15e81b0..0000000 Binary files a/modules/sway/wallpapers/15-Sequoia-Dark-thumbnail.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/15-Sequoia-Light-thumbnail.jpg b/modules/sway/wallpapers/15-Sequoia-Light-thumbnail.jpg deleted file mode 100644 index 455c11e..0000000 Binary files a/modules/sway/wallpapers/15-Sequoia-Light-thumbnail.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/15-Sequoia-Sunrise.png b/modules/sway/wallpapers/15-Sequoia-Sunrise.png deleted file mode 100644 index 619dccc..0000000 Binary files a/modules/sway/wallpapers/15-Sequoia-Sunrise.png and /dev/null differ diff --git a/modules/sway/wallpapers/18208.jpg b/modules/sway/wallpapers/18208.jpg deleted file mode 100755 index a41691f..0000000 Binary files a/modules/sway/wallpapers/18208.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/450618.jpg b/modules/sway/wallpapers/450618.jpg deleted file mode 100755 index 8b4d3cb..0000000 Binary files a/modules/sway/wallpapers/450618.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/582120.png b/modules/sway/wallpapers/582120.png deleted file mode 100755 index df50516..0000000 Binary files a/modules/sway/wallpapers/582120.png and /dev/null differ diff --git a/modules/sway/wallpapers/603973.jpg b/modules/sway/wallpapers/603973.jpg deleted file mode 100755 index 1f14a71..0000000 Binary files a/modules/sway/wallpapers/603973.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/6844.jpg b/modules/sway/wallpapers/6844.jpg deleted file mode 100755 index 4820c01..0000000 Binary files a/modules/sway/wallpapers/6844.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/6857.jpg b/modules/sway/wallpapers/6857.jpg deleted file mode 100755 index 969f416..0000000 Binary files a/modules/sway/wallpapers/6857.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/705791.png b/modules/sway/wallpapers/705791.png deleted file mode 100755 index a9d6d14..0000000 Binary files a/modules/sway/wallpapers/705791.png and /dev/null differ diff --git a/modules/sway/wallpapers/722359.png b/modules/sway/wallpapers/722359.png deleted file mode 100755 index 9be6910..0000000 Binary files a/modules/sway/wallpapers/722359.png and /dev/null differ diff --git a/modules/sway/wallpapers/722362.jpg b/modules/sway/wallpapers/722362.jpg deleted file mode 100755 index ddbe084..0000000 Binary files a/modules/sway/wallpapers/722362.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/733828.png b/modules/sway/wallpapers/733828.png deleted file mode 100755 index b0422be..0000000 Binary files a/modules/sway/wallpapers/733828.png and /dev/null differ diff --git a/modules/sway/wallpapers/849696.png b/modules/sway/wallpapers/849696.png deleted file mode 100755 index 60f9d5a..0000000 Binary files a/modules/sway/wallpapers/849696.png and /dev/null differ diff --git a/modules/sway/wallpapers/849709.jpg b/modules/sway/wallpapers/849709.jpg deleted file mode 100755 index 51a8a30..0000000 Binary files a/modules/sway/wallpapers/849709.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/969569.jpg b/modules/sway/wallpapers/969569.jpg deleted file mode 100755 index fc29c08..0000000 Binary files a/modules/sway/wallpapers/969569.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/997285.jpg b/modules/sway/wallpapers/997285.jpg deleted file mode 100755 index 72dfb97..0000000 Binary files a/modules/sway/wallpapers/997285.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/big-sur-day.jpg b/modules/sway/wallpapers/big-sur-day.jpg deleted file mode 100755 index 810b461..0000000 Binary files a/modules/sway/wallpapers/big-sur-day.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/catalina-day.jpg b/modules/sway/wallpapers/catalina-day.jpg deleted file mode 100755 index 3fa9a15..0000000 Binary files a/modules/sway/wallpapers/catalina-day.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/cirno-nixos.png b/modules/sway/wallpapers/cirno-nixos.png deleted file mode 100644 index d440e9e..0000000 Binary files a/modules/sway/wallpapers/cirno-nixos.png and /dev/null differ diff --git a/modules/sway/wallpapers/day.jpg b/modules/sway/wallpapers/day.jpg deleted file mode 100755 index 56fbdb6..0000000 Binary files a/modules/sway/wallpapers/day.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/elcapitan.jpg b/modules/sway/wallpapers/elcapitan.jpg deleted file mode 100755 index b3dabb6..0000000 Binary files a/modules/sway/wallpapers/elcapitan.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/high-sierra.jpg b/modules/sway/wallpapers/high-sierra.jpg deleted file mode 100755 index d044d9f..0000000 Binary files a/modules/sway/wallpapers/high-sierra.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/leopard.png b/modules/sway/wallpapers/leopard.png deleted file mode 100755 index 9bafd66..0000000 Binary files a/modules/sway/wallpapers/leopard.png and /dev/null differ diff --git a/modules/sway/wallpapers/lion.png b/modules/sway/wallpapers/lion.png deleted file mode 100755 index aca6d39..0000000 Binary files a/modules/sway/wallpapers/lion.png and /dev/null differ diff --git a/modules/sway/wallpapers/mavericks.jpg b/modules/sway/wallpapers/mavericks.jpg deleted file mode 100755 index 62d5077..0000000 Binary files a/modules/sway/wallpapers/mavericks.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/mountain-lion.jpg b/modules/sway/wallpapers/mountain-lion.jpg deleted file mode 100755 index 285108f..0000000 Binary files a/modules/sway/wallpapers/mountain-lion.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/nix-owo.png b/modules/sway/wallpapers/nix-owo.png deleted file mode 100644 index c47afed..0000000 Binary files a/modules/sway/wallpapers/nix-owo.png and /dev/null differ diff --git a/modules/sway/wallpapers/nix-wallpaper-binary-black.png b/modules/sway/wallpapers/nix-wallpaper-binary-black.png deleted file mode 100755 index 51a6097..0000000 Binary files a/modules/sway/wallpapers/nix-wallpaper-binary-black.png and /dev/null differ diff --git a/modules/sway/wallpapers/nix-wallpaper-dracula.png b/modules/sway/wallpapers/nix-wallpaper-dracula.png deleted file mode 100755 index 8e439ac..0000000 Binary files a/modules/sway/wallpapers/nix-wallpaper-dracula.png and /dev/null differ diff --git a/modules/sway/wallpapers/nix-wallpaper-gear.png b/modules/sway/wallpapers/nix-wallpaper-gear.png deleted file mode 100644 index a04e524..0000000 Binary files a/modules/sway/wallpapers/nix-wallpaper-gear.png and /dev/null differ diff --git a/modules/sway/wallpapers/nix-wallpaper-moonscape.png b/modules/sway/wallpapers/nix-wallpaper-moonscape.png deleted file mode 100644 index 966263c..0000000 Binary files a/modules/sway/wallpapers/nix-wallpaper-moonscape.png and /dev/null differ diff --git a/modules/sway/wallpapers/nix-wallpaper-nineish-catppuccin-mocha-alt.png b/modules/sway/wallpapers/nix-wallpaper-nineish-catppuccin-mocha-alt.png deleted file mode 100644 index 5b6e5e1..0000000 Binary files a/modules/sway/wallpapers/nix-wallpaper-nineish-catppuccin-mocha-alt.png and /dev/null differ diff --git a/modules/sway/wallpapers/nix-wallpaper-nineish.png b/modules/sway/wallpapers/nix-wallpaper-nineish.png deleted file mode 100755 index 3fff85b..0000000 Binary files a/modules/sway/wallpapers/nix-wallpaper-nineish.png and /dev/null differ diff --git a/modules/sway/wallpapers/nix-wallpaper-simple-dark-gray.png b/modules/sway/wallpapers/nix-wallpaper-simple-dark-gray.png deleted file mode 100755 index fc87597..0000000 Binary files a/modules/sway/wallpapers/nix-wallpaper-simple-dark-gray.png and /dev/null differ diff --git a/modules/sway/wallpapers/nix-wallpaper-waterfall.png b/modules/sway/wallpapers/nix-wallpaper-waterfall.png deleted file mode 100755 index 6a31430..0000000 Binary files a/modules/sway/wallpapers/nix-wallpaper-waterfall.png and /dev/null differ diff --git a/modules/sway/wallpapers/nix-wallpaper-watersplash.png b/modules/sway/wallpapers/nix-wallpaper-watersplash.png deleted file mode 100644 index 23907db..0000000 Binary files a/modules/sway/wallpapers/nix-wallpaper-watersplash.png and /dev/null differ diff --git a/modules/sway/wallpapers/nixos-anime.png b/modules/sway/wallpapers/nixos-anime.png deleted file mode 100755 index deeb088..0000000 Binary files a/modules/sway/wallpapers/nixos-anime.png and /dev/null differ diff --git a/modules/sway/wallpapers/nixos-wallpaper-catppuccin-mocha.png b/modules/sway/wallpapers/nixos-wallpaper-catppuccin-mocha.png deleted file mode 100755 index 3c31091..0000000 Binary files a/modules/sway/wallpapers/nixos-wallpaper-catppuccin-mocha.png and /dev/null differ diff --git a/modules/sway/wallpapers/sierra.jpg b/modules/sway/wallpapers/sierra.jpg deleted file mode 100755 index 082873c..0000000 Binary files a/modules/sway/wallpapers/sierra.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/snapedit_1740823344276.png b/modules/sway/wallpapers/snapedit_1740823344276.png deleted file mode 100755 index 55a4d47..0000000 Binary files a/modules/sway/wallpapers/snapedit_1740823344276.png and /dev/null differ diff --git a/modules/sway/wallpapers/snowleopard.png b/modules/sway/wallpapers/snowleopard.png deleted file mode 100755 index 61d39f9..0000000 Binary files a/modules/sway/wallpapers/snowleopard.png and /dev/null differ diff --git a/modules/sway/wallpapers/void-anime-wallpaper.jpg b/modules/sway/wallpapers/void-anime-wallpaper.jpg deleted file mode 100644 index d1b48ff..0000000 Binary files a/modules/sway/wallpapers/void-anime-wallpaper.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/wallpapernixos.png b/modules/sway/wallpapers/wallpapernixos.png deleted file mode 100755 index 879b65a..0000000 Binary files a/modules/sway/wallpapers/wallpapernixos.png and /dev/null differ diff --git a/modules/sway/wallpapers/watersplash.png b/modules/sway/wallpapers/watersplash.png deleted file mode 100755 index 6a31430..0000000 Binary files a/modules/sway/wallpapers/watersplash.png and /dev/null differ diff --git a/modules/sway/wallpapers/yosemite.jpg b/modules/sway/wallpapers/yosemite.jpg deleted file mode 100755 index 9384722..0000000 Binary files a/modules/sway/wallpapers/yosemite.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/Без имени.jpg b/modules/sway/wallpapers/Без имени.jpg deleted file mode 100755 index 0b8d76f..0000000 Binary files a/modules/sway/wallpapers/Без имени.jpg and /dev/null differ diff --git a/modules/sway/wallpapers/wallhaven-218d7y.jpg b/modules/wallpaper.jpg similarity index 100% rename from modules/sway/wallpapers/wallhaven-218d7y.jpg rename to modules/wallpaper.jpg diff --git a/system/default.nix b/system/default.nix index 2866730..ea2a402 100644 --- a/system/default.nix +++ b/system/default.nix @@ -10,6 +10,7 @@ [ ./hardware-configuration.nix ./sway-quirks.nix + ./gnome.nix ]; # bootloader stuff @@ -80,7 +81,8 @@ # Network settings networking = { hostName = "desktop"; - + + firewall = { enable = true; @@ -194,7 +196,7 @@ # system-wide packages environment.systemPackages = with pkgs; [ - vim curl git openssl + vim curl git openssl helix ]; # enable xdg portal and flatpak diff --git a/system/gnome.nix b/system/gnome.nix new file mode 100644 index 0000000..9337c6e --- /dev/null +++ b/system/gnome.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + services.xserver = { + displayManager.gdm.enable = true; + desktopManager.gnome.enable = true; + }; +} diff --git a/system/sway-quirks.nix b/system/sway-quirks.nix index b533bc7..8a634d2 100644 --- a/system/sway-quirks.nix +++ b/system/sway-quirks.nix @@ -3,17 +3,19 @@ { programs.dconf.enable = true; - services.greetd = { - enable = true; - settings = { - default_session = { - command = "bash -c \"LANG=en_US.UTF-8 ${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway\""; - user = "greeter"; - }; - }; - }; + # services.greetd = { + # enable = true; + # settings = { + # default_session = { + # command = "bash -c \"LANG=en_US.UTF-8 ${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway\""; + # user = "greeter"; + # }; + # }; + # }; - users.users.greeter = {}; + # users.users.greeter = {}; + + services.displayManager.sessionPackages = [ pkgs.sway ]; security.polkit.enable = true; security.pam.services.swaylock = {}; @@ -22,5 +24,5 @@ services.udisks2.enable = true; services.devmon.enable = true; - environment.systemPackages = [ pkgs.sway ]; + # environment.systemPackages = [ pkgs.sway ]; }