From 092d5695c153d6c6ff438dd29f2a95471e171d4c Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Fri, 23 Sep 2022 21:26:59 +0300 Subject: [PATCH] multiple updates --- flake.lock | 138 ++++----- machines/AMD-Workstation/default.nix | 4 +- machines/Dell-Laptop/default.nix | 2 +- profiles/applications/packages.nix | 2 +- profiles/applications/vscode/extensions.nix | 38 ++- profiles/filesystems.nix | 8 +- profiles/network.nix | 9 +- profiles/virtualisation.nix | 3 +- profiles/workspace/hyprland/default.nix | 12 +- profiles/workspace/waybar/default.nix | 306 ++++++++++++++++---- 10 files changed, 361 insertions(+), 161 deletions(-) diff --git a/flake.lock b/flake.lock index 0c11df6..efbb83a 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1661276035, - "narHash": "sha256-9jZuUOeIfDQF7YwFOxSREZGWaIR9qpyTtr+cEnMk3EI=", + "lastModified": 1662893183, + "narHash": "sha256-NyP/kJlV1Ai7os3gMqukKMdRSQ78GAjPCJkZDZtDdeo=", "owner": "arkenfox", "repo": "user.js", - "rev": "06bfef8fd155fdf62e409c30cd1d68572f0c8b41", + "rev": "3f09afdee07c5aea33f6dc4194e1425d6400a0d7", "type": "github" }, "original": { @@ -92,11 +92,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1656989878, - "narHash": "sha256-SvK+H9M62lhPvVRWfl7HGG0oRO90r1E8ju3PPp6A6N8=", + "lastModified": 1663284638, + "narHash": "sha256-rXAX14yB8v9BOG4ZsdGEedpZAnNqhQ4DtjQwzFX/TLY=", "owner": "nix-community", "repo": "comma", - "rev": "f5732a6e8871348bafa3139a2f0d9bb7bc34c076", + "rev": "c83ff3839983b3cb8deb407ff618ca12179de588", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -275,11 +275,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1661824092, - "narHash": "sha256-nSWLWytlXbeLrx5A+r5Pso7CvVrX5EgmIIXW/EXvPHQ=", + "lastModified": 1663835995, + "narHash": "sha256-XNHQ+mdHbjNR1Oit00SFAEcrAZoCS08E7uAFcVMtwhM=", "owner": "nix-community", "repo": "home-manager", - "rev": "5bd66dc6cd967033489c69d486402b75d338eeb6", + "rev": "bd83eab6220226085c82e637931a7ae3863d9893", "type": "github" }, "original": { @@ -296,11 +296,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1661888127, - "narHash": "sha256-7oRh2X4lyykcFlHSppIo7fB1fuc8HguxxfZOTexkFQA=", + "lastModified": 1663866803, + "narHash": "sha256-wfhZ//vxhipvF9n9f+s4W0Ql35B5IsLiO5cYAqbxIDQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "1cf46fd6a26cb16104a39a4fe73ca7ccd6c1ba36", + "rev": "ef3eb37c7f2cdbbab23e611aedc438c317463ef8", "type": "github" }, "original": { @@ -315,11 +315,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1661688575, - "narHash": "sha256-UHn3Jqw4Xob2KlgbmbUWr/XHEK0A5mSTcAplhhr8cPo=", + "lastModified": 1663503058, + "narHash": "sha256-wagaFmv4qvsMO9A4kqGgfxsaRu71IecB9oKjDMss8u0=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "7eb6467092ee7983873906afb472fb673918324b", + "rev": "05a081a254f4bc7ca026a6ebdcf9864170208bc3", "type": "github" }, "original": { @@ -370,11 +370,11 @@ ] }, "locked": { - "lastModified": 1659964474, - "narHash": "sha256-PK8yYgRg7IG07Town2pVWB0tmtBBzIXtX5pqssHW6B4=", + "lastModified": 1661448932, + "narHash": "sha256-0Ryhy6w3f8AhQn5ZllCt6+6t5+ky5PtTesslMXFjLUw=", "owner": "lourkeur", "repo": "miniguest", - "rev": "dd5c5ef2dc4933bcb0504d7120c410219de607e2", + "rev": "6182fb1f074efe16bdab59b159e910c81b165e2f", "type": "github" }, "original": { @@ -391,11 +391,11 @@ ] }, "locked": { - "lastModified": 1653413650, - "narHash": "sha256-wojDHjb+eU80MPH+3HQaK0liUy8EgR95rvmCl24i58Y=", + "lastModified": 1662220400, + "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=", "owner": "nix-community", "repo": "naersk", - "rev": "69daaceebe12c070cd5ae69ba38f277bbf033695", + "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3", "type": "github" }, "original": { @@ -412,11 +412,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1661758191, - "narHash": "sha256-spw1+WufLY/rvWa8VUgque5VbJnU50nNBqwj1DNbF4g=", + "lastModified": 1663761049, + "narHash": "sha256-E/D8+fYvI+s6XlLIDkRlDD5T9tf6ZHsoZAw/jU+pDsw=", "owner": "nixos", "repo": "nix", - "rev": "ddb82ffda993d237d62d59578f7808a9d98c77fe", + "rev": "f704c2720f136a6bb73a2e91d4a85e0e9a42ff6f", "type": "github" }, "original": { @@ -434,11 +434,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1657876248, - "narHash": "sha256-UkcXnWq9ukTFgLhxafg3cnQZmWL/jNgLbJbE1Geo4k4=", + "lastModified": 1663228762, + "narHash": "sha256-bWDz4dsjP90hDmf+7v8qeYzGbdLdzvCCjCt0kVW6HaE=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "897f10267138748956b7720c5a82bba8a90a832e", + "rev": "c70016ff920795f84115bf3774fb55355e0be2b1", "type": "github" }, "original": { @@ -531,11 +531,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1661648408, - "narHash": "sha256-EYTUe3i0qJB02yV87ohQjSL0VXIGEyFjfYqtJX09KWo=", + "lastModified": 1663463003, + "narHash": "sha256-X2k3WagXicaNiBswEJz3PqznEtovp1fKbuAMUMOHzeg=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "d199f9f8cab305f23fa3928aea84d37c53fd675a", + "rev": "30286fa7fb374fa3ffc80ac35eb7fadf572ae357", "type": "github" }, "original": { @@ -546,11 +546,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1661896989, - "narHash": "sha256-GlMFKzY8akzy2eCaoLkq8SC1eNUZHfvR1zXadXEn9Xc=", + "lastModified": 1663867771, + "narHash": "sha256-4vu3CatfxujbDX6FkHhY29Q1bFzjo/uvsWLa83MZx8w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a6903f147cc145024c7beb4dcc9314c246aff57", + "rev": "a22f7345336c7bbb785d3525c6760c5391c3171f", "type": "github" }, "original": { @@ -594,11 +594,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1661788116, - "narHash": "sha256-bLPHlcCGZYojB/Z7L/lmbLAMsxGgqrFhlxF0jMsIm/I=", + "lastModified": 1663760840, + "narHash": "sha256-ym5Iycs5H4cOaLfE2/vC0tsLp8XuBJQIHGV8/uXSy8M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cc634d9aa08ed89c9ff655de06ab2e593c72ebc1", + "rev": "9bdbbaa634aa666eb6a27096bdcb991c59181244", "type": "github" }, "original": { @@ -618,11 +618,11 @@ ] }, "locked": { - "lastModified": 1661885258, - "narHash": "sha256-8stPbH14AYzkuQh4eJ2cyCMi/MxrERNIdSEVbowmddo=", + "lastModified": 1663787477, + "narHash": "sha256-gk4hht7ukjipy5Xw6glCwgCY3nNqQxrsNLsj6PxtDe0=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "7053d8b49b45d587256d14d36186d4067f2bed51", + "rev": "3c06306de01e463b09e88d312bfe17971aaadb9d", "type": "github" }, "original": { @@ -665,11 +665,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1661720780, - "narHash": "sha256-AJNGyaB2eKZAYaPNjBZOzap87yL+F9ZLaFzzMkvega0=", + "lastModified": 1663761423, + "narHash": "sha256-bDLXl2BVq7eIQz/8CduZI1SLyhG9u/CrckHd6f7bwPE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a63021a330d8d33d862a8e29924b42d73037dd37", + "rev": "d6490a0bd9dfb298fcd8382d3363b86870dc7340", "type": "github" }, "original": { @@ -681,11 +681,11 @@ }, "nur": { "locked": { - "lastModified": 1661883947, - "narHash": "sha256-qaz+6u+PJAfiW/dhSd8HWu5Mpm9jru53aH/gk3TruIM=", + "lastModified": 1663871140, + "narHash": "sha256-1HLjTL67ubOdPnIyECioP9TPNtL+NuxlY9D/qHpk7rA=", "owner": "nix-community", "repo": "NUR", - "rev": "2ec06c9e786ef01e7dd4bfab9644ffe0d9e0a71d", + "rev": "a643ef20f4722ae40f8949be4c453271172be25a", "type": "github" }, "original": { @@ -706,11 +706,11 @@ ] }, "locked": { - "lastModified": 1657626303, - "narHash": "sha256-O/JJ0hSBCmlx0oP8QGAlRrWn0BvlC5cj7/EZ0CCWHTU=", + "lastModified": 1662879385, + "narHash": "sha256-ZmiyHn0uPH4xHYcOhY0e0sPtfyM6jCF/shmVq2aTOLc=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "920ba682377d5c0d87945c5eb6141ab8447ca509", + "rev": "4f8d61cd936f853242a4ce1fd476f5488c288c26", "type": "github" }, "original": { @@ -745,11 +745,11 @@ "qbittorrent-ee": { "flake": false, "locked": { - "lastModified": 1661791725, - "narHash": "sha256-BlL/vovW2F3JlPU2iuf01w7M6n3UjhRcDdkS3wmvO4U=", + "lastModified": 1663656922, + "narHash": "sha256-ktYOkbTWhNwBiw3bwW4xWlWJpXvexDeVkqK/FuYEhYc=", "owner": "c0re100", "repo": "qBittorrent-Enhanced-Edition", - "rev": "696b4d88512d9928d127285ea58e384ec696fb0d", + "rev": "325910487c6e5c92f7a11e7476a68c2b1dd86c06", "type": "github" }, "original": { @@ -806,11 +806,11 @@ "rycee": { "flake": false, "locked": { - "lastModified": 1661832198, - "narHash": "sha256-XO0uhcARgHUQtUZzQ62mHwxen3pyw/2RgJGAjAfd+PQ=", + "lastModified": 1663819364, + "narHash": "sha256-+dv4D+C2NRS6OnzfAvxYbE9GA65FhZQ0E+biMtHWDNo=", "owner": "rycee", "repo": "nur-expressions", - "rev": "0cc005da69952b82ed72655282b68c62445352b1", + "rev": "7f27fc9880250a0eaf6386aa93286198ceaecbe0", "type": "gitlab" }, "original": { @@ -844,11 +844,11 @@ }, "utils": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -859,11 +859,11 @@ }, "utils_2": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -911,11 +911,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1660930713, - "narHash": "sha256-bY7q1NqG/sjCUAWPn/Ne9NCigLlPlH5Lk1WCMqv3rTU=", + "lastModified": 1663507239, + "narHash": "sha256-LISZtkPVe8lQ2N8YwVe+KxCkXWLP9mdw6Q2kG93wE8A=", "owner": "wlroots", "repo": "wlroots", - "rev": "7c575922c05e4d5fd9a403c2aa631a54c7531d44", + "rev": "2ad25b1460400e66ea26bd6489b04072be7d9dbb", "type": "gitlab" }, "original": { @@ -960,11 +960,11 @@ "zsh-you-should-use": { "flake": false, "locked": { - "lastModified": 1656492197, - "narHash": "sha256-1NL/GcW656Qn8+OrJVESF2O+GzFxl44iZqXGSnymOB4=", + "lastModified": 1661951724, + "narHash": "sha256-1XMn1TjPi8Ic3loDx9ICLeKw0oOZifNJbwIiW+XWZy4=", "owner": "MichaelAquilina", "repo": "zsh-you-should-use", - "rev": "09d9aa2cad2b7caf48cce8f321ebbbf8f47ce1c3", + "rev": "13c86356553b80e0e0cbf1ecf6d82cfa79751b5a", "type": "github" }, "original": { diff --git a/machines/AMD-Workstation/default.nix b/machines/AMD-Workstation/default.nix index 182606c..031ce3d 100644 --- a/machines/AMD-Workstation/default.nix +++ b/machines/AMD-Workstation/default.nix @@ -1,4 +1,4 @@ -{ inputs, lib, pkgs, ... }: { +{ inputs, config, lib, pkgs, ... }: { imports = [ ./hardware-configuration.nix inputs.self.nixosRoles.workstation @@ -32,6 +32,6 @@ home-manager.users.alukard.home.packages = lib.mkIf config.deviceSpecific.enableVirtualisation [ inputs.nixos-generators.packages.${pkgs.system}.nixos-generators - miniguest + inputs.miniguest.packages.${pkgs.system}.miniguest ]; } diff --git a/machines/Dell-Laptop/default.nix b/machines/Dell-Laptop/default.nix index 3729fca..320cd41 100644 --- a/machines/Dell-Laptop/default.nix +++ b/machines/Dell-Laptop/default.nix @@ -24,7 +24,7 @@ deviceSpecific.isHost = false; deviceSpecific.isShared = false; deviceSpecific.isGaming = true; - deviceSpecific.enableVirtualisation = false; + deviceSpecific.enableVirtualisation = true; deviceSpecific.wireguard.enable = true; boot.blacklistedKernelModules = [ diff --git a/profiles/applications/packages.nix b/profiles/applications/packages.nix index 933d012..dcb2ece 100644 --- a/profiles/applications/packages.nix +++ b/profiles/applications/packages.nix @@ -54,6 +54,7 @@ with config.deviceSpecific; { foliate gparted jellyfin-media-player + networkmanagerapplet # persepolis pinta qbittorrent @@ -66,7 +67,6 @@ with config.deviceSpecific; { zathura # libsForQt5.networkmanager-qt - # networkmanagerapplet xdg-utils # awesome-shell diff --git a/profiles/applications/vscode/extensions.nix b/profiles/applications/vscode/extensions.nix index 80f2d18..7254761 100644 --- a/profiles/applications/vscode/extensions.nix +++ b/profiles/applications/vscode/extensions.nix @@ -14,8 +14,8 @@ { name = "project-manager"; publisher = "alefragnani"; - version = "12.6.1"; - sha256 = "0lmva34pmadkny55rr7fm9wv2k0q4sjx9b7984azwlrbkvb1jhha"; + version = "12.7.0"; + sha256 = "023xglwiqs8dp521h34zgny1d3wma1xn5pdm0srqwl7adsz304xc"; } { name = "nix-env-selector"; @@ -56,14 +56,14 @@ { name = "dart-code"; publisher = "Dart-Code"; - version = "3.47.20220808"; - sha256 = "1g1nmmfkk4wfvrjbw45lrbrw1kvdazwpzw89cx74gy485x6qk98a"; + version = "3.49.20220916"; + sha256 = "03fl6l8nbsnrsccjgk2bpnca8w96z77axl3c6ph5l04zj7pj0q72"; } { name = "flutter"; publisher = "Dart-Code"; - version = "3.46.0"; - sha256 = "1gjc7yxf7prpadi82ml5jqq2f5svcnnfryhn87is79wmgy3dxk3z"; + version = "3.48.0"; + sha256 = "102dda4l4m11f116ysz05smfficcazh58y2skd5cjp483yfjgyvb"; } { name = "wal-theme"; @@ -74,8 +74,8 @@ { name = "gitlens"; publisher = "eamodio"; - version = "12.2.0"; - sha256 = "070v27i7cd72a6pnn6r9qzh75b8czsrykcj68842i3h42gfa8jk4"; + version = "2022.8.3105"; + sha256 = "11axaxi06j0hb9xv35azqy4fys15pllg67gk3sqsc3s66q4qzk6w"; } { name = "tokyo-night"; @@ -86,8 +86,8 @@ { name = "vsc-material-theme-icons"; publisher = "equinusocio"; - version = "2.3.1"; - sha256 = "1djm4k3hcn4aq63d4mxs2n4ffq5x1qr82q6gxwi5pmabrb0hrb30"; + version = "2.4.0"; + sha256 = "0grqsb6snj8817saialdgx0ilblky5jw4i8yxaf8nymiysywzkyq"; } { name = "bloc"; @@ -98,8 +98,8 @@ { name = "vscode-pull-request-github"; publisher = "GitHub"; - version = "0.49.2022083009"; - sha256 = "1ksvnhvbigy52nc5ls2zsimbm30qaz3fmwk63v4qv9rm7a8sjszl"; + version = "0.51.2022092209"; + sha256 = "1g19qlnb8ffh932qk6sb5j1gcm6vl1i9j0c59k58g3ldsl3wj5i6"; } { name = "vscode-env"; @@ -110,8 +110,8 @@ { name = "plantuml"; publisher = "jebbs"; - version = "2.17.3"; - sha256 = "1i78q44y5qriai1r4y0icdv5gl5v9wzhm0rkwp2pvk0vwr4v2fks"; + version = "2.17.4"; + sha256 = "1s6jp1rx1k03ir7j3fsyqkhnnp9m6akabznb4pmjxpkvn2wzlz3y"; } { name = "codeacejumper"; @@ -131,11 +131,17 @@ version = "1.30.0"; sha256 = "000zhgzijf3h6abhv4p3cz99ykj6489wfn81j0s691prr8q9lxxh"; } + { + name = "vscode-docker"; + publisher = "ms-azuretools"; + version = "1.22.1"; + sha256 = "1ix363fjxi9g450rs3ghx44z3hppvasf0xpzgha93m90djd7ai52"; + } { name = "remote-ssh"; publisher = "ms-vscode-remote"; - version = "0.85.2022071315"; - sha256 = "195c22wvvw727li8wf0nhfpccgynx9sd48gzz39j8wxmi7qqvjli"; + version = "0.87.2022090715"; + sha256 = "02qr68q5fc5kfs2qwjnfmapr6x5b1lbbrs3bks783svlnqdgbr76"; } { name = "remote-ssh-edit"; diff --git a/profiles/filesystems.nix b/profiles/filesystems.nix index 1273fd9..93d8d80 100644 --- a/profiles/filesystems.nix +++ b/profiles/filesystems.nix @@ -7,9 +7,11 @@ with deviceSpecific; secrets.samba.services = []; secrets.files-veracrypt = {}; - environment.etc.crypttab.text = lib.mkIf (device == "AMD-Workstation") '' - files-veracrypt /dev/disk/by-partuuid/15fa11a1-a6d8-4962-9c03-74b209d7c46a /var/secrets/files-veracrypt tcrypt-veracrypt - ''; + environment.etc.crypttab = lib.mkIf (device == "AMD-Workstation") { + text = '' + files-veracrypt /dev/disk/by-partuuid/15fa11a1-a6d8-4962-9c03-74b209d7c46a /var/secrets/files-veracrypt tcrypt-veracrypt + ''; + }; fileSystems = { "/shared/nixos" = lib.mkIf isVM { diff --git a/profiles/network.nix b/profiles/network.nix index 4a4e6de..a762cb0 100644 --- a/profiles/network.nix +++ b/profiles/network.nix @@ -2,9 +2,10 @@ with config.deviceSpecific; { networking = { - networkmanager.enable = false; + networkmanager.enable = true; wireless = { - enable = isLaptop; + # enable = isLaptop; + enable = false; interfaces = lib.mkIf (config.device == "Dell-Laptop") [ "wlo1" ]; @@ -34,7 +35,9 @@ with config.deviceSpecific; firewall = { enable = true; allowPing = true; - allowedTCPPorts = lib.mkIf isGaming [ 25565 ]; + # allowedTCPPorts = lib.mkIf isGaming [ 25565 ]; + allowedTCPPorts = [ 80 443 9443 8080 8081 ]; + allowedUDPPorts = [ 80 443 9443 8080 8081 ]; }; usePredictableInterfaceNames = true; diff --git a/profiles/virtualisation.nix b/profiles/virtualisation.nix index e711e33..2117c9a 100644 --- a/profiles/virtualisation.nix +++ b/profiles/virtualisation.nix @@ -2,7 +2,7 @@ with config.deviceSpecific; { config = lib.mkIf enableVirtualisation { virtualisation.docker = { - enable = isServer; + enable = true; }; virtualisation.oci-containers.backend = "docker"; @@ -26,6 +26,7 @@ with config.deviceSpecific; { environment.systemPackages = with pkgs; if isServer then [ ] else [ + docker-compose virt-manager ]; }; diff --git a/profiles/workspace/hyprland/default.nix b/profiles/workspace/hyprland/default.nix index 49817b1..f889871 100644 --- a/profiles/workspace/hyprland/default.nix +++ b/profiles/workspace/hyprland/default.nix @@ -75,7 +75,11 @@ in with config.deviceSpecific; with lib; { monitor=,preffered,0x0,1 ''} general { - sensitivity=0.7 + ${if config.device == "AMD-Workstation" then '' + sensitivity=0.7 + '' else '' + sensitivity=1.3 + ''} apply_sens_to_raw=false main_mod=${modifier} border_size=1 @@ -259,7 +263,11 @@ in with config.deviceSpecific; with lib; { windowrule=opaque,firefox windowrule=float,Waydroid - windowrule=size 2400 1080,Waydroid + ${if config.device == "AMD-Workstation" then '' + windowrule=size 2400 1080,Waydroid + '' else '' + windowrule=size 1600 900,Waydroid + ''} windowrule=center,Waydroid windowrule=opaque,Waydroid diff --git a/profiles/workspace/waybar/default.nix b/profiles/workspace/waybar/default.nix index 0c9bd66..a742de8 100644 --- a/profiles/workspace/waybar/default.nix +++ b/profiles/workspace/waybar/default.nix @@ -5,14 +5,16 @@ mainBar = { layer = "top"; position = "top"; + margin = "10 10 0 8"; modules-left = [ "wlr/workspaces" ]; modules-right = [ - "cpu" - "custom/separator" + # "cpu" "disk" - "custom/separator" + "temperature" + "custom/mem" + "backlight" + "battery" "clock" - "custom/separator" "tray" ]; cpu = { @@ -24,9 +26,6 @@ format = "{free}"; path = "/"; }; - clock = { - format = "{:%a, %d %b, %H:%M}"; - }; "custom/separator" = { format = "|"; interval = "once"; @@ -41,86 +40,267 @@ "Music" = "Mus"; }; }; + temperature = { + critical-threshold = 80; + format = "{temperatureC}°C {icon}"; + format-icons = [ "" "" "" "" "" ]; + tooltip = false; + }; + "custom/mem" = { + format = "{} "; + interval = 3; + exec = "free -h | awk '/Mem:/{printf $7}'"; + tooltip = false; + }; + backlight = { + device = "intel_backlight"; + format = "{percent}% {icon}"; + format-icons = [ "" "" "" "" "" "" "" ]; + min-length = 7; + }; + battery = { + states = { + warning = 30; + critical = 15; + }; + format = "{capacity}% {icon}"; + format-charging = "{capacity}% "; + format-plugged = "{capacity}% "; + format-alt = "{time} {icon}"; + format-icons = [ + "" "" "" "" "" "" "" "" "" "" + ]; + on-update = "$HOME/.config/waybar/scripts/check_battery.sh"; + }; + clock = { + format = "{:%a, %d %b, %H:%M}"; + tooltip-format = "{:%Y %B}\n{calendar}"; + }; + tray = { + icon-size = 16; + spacing = 0; + }; }; }; style = '' * { border: none; border-radius: 0; - font-family: Roboto, Helvetica, Arial, sans-serif; - font-size: 13px; - min-height: 0; - } + /* `otf-font-awesome` is required to be installed for icons */ + font-family: IBM Plex Mono; + font-size: 14px; + min-height: 14px; + } - window#waybar { - background: alpha(@theme_bg_color, 0.8); - border-bottom: 3px solid alpha(@borders, 0.8); - color: white; - } - - tooltip { - background: rgba(43, 48, 59, 0.5); - border: 1px solid rgba(100, 114, 125, 0.5); - } - tooltip label { - color: white; - } - - #workspaces button { - padding: 0 5px; + window#waybar { background: transparent; + } + + window#waybar.hidden { + opacity: 0.2; + } + + #workspaces { + margin-right: 8px; + border-radius: 10px; + transition: none; + background: #383c4a; + } + + #workspaces button { + transition: none; + color: #7c818c; + background: transparent; + padding: 5px; + font-size: 12px; + } + + #workspaces button.persistent { + color: #7c818c; + font-size: 12px; + } + + #workspaces button:hover { + transition: none; + box-shadow: inherit; + text-shadow: inherit; + border-radius: inherit; + color: #383c4a; + background: #7c818c; + } + + #workspaces button.focused { color: white; - border-bottom: 3px solid transparent; - } + } - #workspaces button.focused { - background: #64727D; - border-bottom: 3px solid white; - } + #language { + padding-left: 16px; + padding-right: 8px; + border-radius: 10px 0px 0px 10px; + transition: none; + color: #ffffff; + background: #383c4a; + } - #workspaces button.active { - background: @theme_selected_bg_color; - } + #keyboard-state { + margin-right: 8px; + padding-right: 16px; + border-radius: 0px 10px 10px 0px; + transition: none; + color: #ffffff; + background: #383c4a; + } - #mode, #clock, #battery { - padding: 0 10px; - } + #custom-pacman { + padding-left: 16px; + padding-right: 8px; + border-radius: 10px 0px 0px 10px; + transition: none; + color: #ffffff; + background: #383c4a; + } - #mode { - background: #64727D; - border-bottom: 3px solid white; - } + #custom-mail { /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ - #clock { - background-color: #64727D; - } + margin-right: 8px; + padding-right: 16px; + border-radius: 0px 10px 10px 0px; + transition: none; + color: #ffffff; + background: #383c4a; + } - #battery { - background-color: #ffffff; - color: black; - } + #mode { + padding-left: 16px; + padding-right: 16px; + border-radius: 10px; + transition: none; + color: #ffffff; + background: #383c4a; + } - #battery.charging { - color: white; + #clock { + padding-left: 16px; + padding-right: 16px; + border-radius: 10px 0px 0px 10px; + transition: none; + color: #ffffff; + background: #383c4a; + } + + #custom-weather { + padding-right: 16px; + border-radius: 0px 10px 10px 0px; + transition: none; + color: #ffffff; + background: #383c4a; + } + + #pulseaudio { + margin-right: 8px; + padding-left: 16px; + padding-right: 16px; + border-radius: 10px; + transition: none; /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ + + color: #ffffff; + background: #383c4a; + } + + #pulseaudio.muted { + background-color: #90b1b1; + color: #2a5c45; + } + + #custom-mem { + margin-right: 8px; + padding-left: 16px; + padding-right: 16px; + border-radius: 10px; + transition: none; + color: #ffffff; + background: #383c4a; + } + + #temperature { + margin-right: 8px; + padding-left: 16px; + padding-right: 16px; + border-radius: 10px; + transition: none; + color: #ffffff; + background: #383c4a; + } + + #temperature.critical { + background-color: #eb4d4b; + } + + #backlight { + margin-right: 8px; + padding-left: 16px; + padding-right: 16px; + border-radius: 10px; + transition: none; + color: #ffffff; + background: #383c4a; + } + + #disk { + margin-right: 8px; + padding-left: 16px; + padding-right: 16px; + border-radius: 10px; + transition: none; + color: #ffffff; + background: #383c4a; + } + + #battery { + margin-right: 8px; + padding-left: 16px; + padding-right: 16px; + border-radius: 10px; + transition: none; + color: #ffffff; + background: #383c4a; + } + + #battery.charging { + color: #ffffff; background-color: #26A65B; - } + } - @keyframes blink { - to { - background-color: #ffffff; - color: black; - } - } + #battery.warning:not(.charging) { + background-color: #ffbe61; + color: black; + } - #battery.warning:not(.charging) { - background: #f53c3c; - color: white; + #battery.critical:not(.charging) { + background-color: #f53c3c; + color: #ffffff; animation-name: blink; animation-duration: 0.5s; animation-timing-function: linear; animation-iteration-count: infinite; animation-direction: alternate; - } + } + + #tray { + padding-left: 16px; + padding-right: 16px; + border-radius: 10px; + transition: none; + color: #ffffff; + background: #383c4a; + } + + @keyframes blink { + to { + background-color: #ffffff; + color: #000000; + } + } ''; systemd.enable = true; systemd.target = "hyprland-session.target";