diff --git a/flake.lock b/flake.lock index 510acbd..debf9ca 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1755946532, - "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", + "lastModified": 1759499898, + "narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", + "rev": "655e067f96fd44b3f5685e17f566b0e4d535d798", "type": "github" }, "original": { @@ -123,11 +123,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1759829282, - "narHash": "sha256-mg+XLmTnQr3o8CT88P1zsKSXRBWZyjF/n686HZp9Els=", + "lastModified": 1759854845, + "narHash": "sha256-3r2wzF+7VYqlSdh3y8z2ZBf9yt9KFWpGusmHYJYt0ak=", "ref": "main", - "rev": "cb6fa4450ae8e3e8920b307ea2b5684b4567e049", - "revCount": 1, + "rev": "aa6db50822ea9ba67472b4da55e14a597bfdc8a0", + "revCount": 2, "type": "git", "url": "https://git.wastring.com/fw/confetti" }, @@ -140,11 +140,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1756083905, - "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", + "lastModified": 1758112371, + "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", + "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", "type": "github" }, "original": { @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -223,27 +223,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -308,11 +287,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1759523803, + "narHash": "sha256-PTod9NG+i3XbbnBKMl/e5uHDBYpwIWivQ3gOWSEuIEM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835", "type": "github" }, "original": { @@ -384,7 +363,10 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": [ + "neovim-nightly-overlay", + "flake-parts" + ], "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -411,11 +393,11 @@ ] }, "locked": { - "lastModified": 1758184248, - "narHash": "sha256-TOazVsj8D1LTGQ6q8xdtfoPs9Z+PiqUS952WvZPssR0=", + "lastModified": 1759853171, + "narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf7056c6a2d893d80db18d06d7e730d6515aaae8", + "rev": "1a09eb84fa9e33748432a5253102d01251f72d6d", "type": "github" }, "original": { @@ -469,11 +451,11 @@ ] }, "locked": { - "lastModified": 1757542864, - "narHash": "sha256-8i9tsVoOmLQDHJkNgzJWnmxYFGkJNsSndimYpCoqmoA=", + "lastModified": 1759490292, + "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "aa9d14963b94186934fd0715d9a7f0f2719e64bb", + "rev": "9431db625cd9bb66ac55525479dce694101d6d7a", "type": "github" }, "original": { @@ -498,11 +480,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1758110629, - "narHash": "sha256-uHE+FdhKBohAUeO29034b68RN0ITf/KRy2tkaXQdLCY=", + "lastModified": 1759837778, + "narHash": "sha256-12GZqSrRYyhKl7NpNMUQECDi/Zyx17QZhhQ7+mBJMns=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "1cb8cd3930e2c8410bbc99baa0a5bea91994bd71", + "rev": "5ba2d2217b649c4ca2db7e3f383b3f6af6e70d65", "type": "github" }, "original": { @@ -591,11 +573,11 @@ ] }, "locked": { - "lastModified": 1757508108, - "narHash": "sha256-bTYedtQFqqVBAh42scgX7+S3O6XKLnT6FTC6rpmyCCc=", + "lastModified": 1759080228, + "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "119bcb9aa742658107b326c50dcd24ab59b309b7", + "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", "type": "github" }, "original": { @@ -620,11 +602,11 @@ ] }, "locked": { - "lastModified": 1756810301, - "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", + "lastModified": 1758927902, + "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", + "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", "type": "github" }, "original": { @@ -645,11 +627,11 @@ ] }, "locked": { - "lastModified": 1756117388, - "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=", + "lastModified": 1759490926, + "narHash": "sha256-7IbZGJ5qAAfZsGhBHIsP8MBsfuFYS0hsxYHVkkeDG5Q=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0", + "rev": "94cce794344538c4d865e38682684ec2bbdb2ef3", "type": "github" }, "original": { @@ -690,11 +672,11 @@ ] }, "locked": { - "lastModified": 1748977843, - "narHash": "sha256-0gXtFVan+Urb79AjFOjHdjl3Q73m8M3wFSo3ZhjxcBA=", + "lastModified": 1758260686, + "narHash": "sha256-k/rEvNWUTge1uYwwSMfgM7CDoKanIm8ED3vo5mqDe08=", "owner": "niksingh710", "repo": "minimal-tmux-status", - "rev": "de2bb049a743e0f05c08531a0461f7f81da0fc72", + "rev": "118b44b05b3fb4e46a38373ddcef35d4c5e2d01e", "type": "github" }, "original": { @@ -714,11 +696,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1758153943, - "narHash": "sha256-jXnUMejhammEWX6rqC+bKRNN8k6kWlXUwZ8GrUqLXeA=", + "lastModified": 1759795531, + "narHash": "sha256-iY43k/GpJJqv5WmHsJpDsOZsOqb2qydM7wWnpJygiUk=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "500b1019f07a48adf8f42c57deb5f44f6e9b6eff", + "rev": "df3d6d30529e6f4d2c1709914cb3e6e3896dd64e", "type": "github" }, "original": { @@ -730,11 +712,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1758137374, - "narHash": "sha256-cNyIdXePxgwHy2rLm/M0wXl3lc+ZmvBNhO1tQBDU0v4=", + "lastModified": 1759794827, + "narHash": "sha256-eN26ZJbzwuv0fvc33v4vR5hESWr/+TzJUXaKfdUQx+I=", "owner": "neovim", "repo": "neovim", - "rev": "5148c1247e4dffbe59bebb89084a285bb9f50677", + "rev": "1c4e0e50449d95465e7f256d39fea54b307e0e33", "type": "github" }, "original": { @@ -777,11 +759,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -793,11 +775,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1758029226, - "narHash": "sha256-TjqVmbpoCqWywY9xIZLTf6ANFvDCXdctCjoYuYPYdMI=", + "lastModified": 1759632233, + "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08b8f92ac6354983f5382124fef6006cade4a1c1", + "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10", "type": "github" }, "original": { @@ -809,11 +791,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1758035966, - "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", + "lastModified": 1759733170, + "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", + "rev": "8913c168d1c56dc49a7718685968f38752171c3b", "type": "github" }, "original": { @@ -851,11 +833,11 @@ ] }, "locked": { - "lastModified": 1756961635, - "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", + "lastModified": 1758998580, + "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", "owner": "nix-community", "repo": "NUR", - "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", + "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", "type": "github" }, "original": { @@ -874,11 +856,11 @@ ] }, "locked": { - "lastModified": 1757588530, - "narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=", + "lastModified": 1758108966, + "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411", + "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "type": "github" }, "original": { @@ -926,11 +908,11 @@ ] }, "locked": { - "lastModified": 1758007585, - "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", + "lastModified": 1759635238, + "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", + "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133", "type": "github" }, "original": { @@ -946,7 +928,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" @@ -960,11 +942,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1757956156, - "narHash": "sha256-f0W7qbsCqpi6swQ5w8H+0YrAbNwsHgCFDkNRMTJjqrE=", + "lastModified": 1759690047, + "narHash": "sha256-Vlpa0d1xOgPO9waHwxJNi6LcD2PYqB3EjwLRtSxXlHc=", "owner": "nix-community", "repo": "stylix", - "rev": "0ce0103b498bb22f899ed8862d8d7f9503ed9cdb", + "rev": "09022804b2bcd217f3a41a644d26b23d30375d12", "type": "github" }, "original": { @@ -1054,11 +1036,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1754779259, - "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", + "lastModified": 1757716333, + "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", + "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", "type": "github" }, "original": { @@ -1070,11 +1052,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1754788770, - "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", + "lastModified": 1757811970, + "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", + "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", "type": "github" }, "original": { @@ -1086,11 +1068,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1755613540, - "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", + "lastModified": 1757811247, + "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", + "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", "type": "github" }, "original": { @@ -1107,11 +1089,11 @@ ] }, "locked": { - "lastModified": 1756662192, - "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", + "lastModified": 1758728421, + "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", + "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8556851..e5cba7b 100644 --- a/flake.nix +++ b/flake.nix @@ -86,7 +86,7 @@ home-manager.nixosModules.home-manager sops-nix.nixosModules.sops catppuccin.nixosModules.catppuccin - confetti.nixosModules.confetti + confetti.nixosModules.default ]; }; diff --git a/maskiner/core/configuration.nix b/maskiner/core/configuration.nix index 89b4cbe..0d4faee 100644 --- a/maskiner/core/configuration.nix +++ b/maskiner/core/configuration.nix @@ -54,6 +54,17 @@ in ./../../moduler/programs/waybar inputs.catppuccin.homeModules.catppuccin ]; + waybar = { + enable = true; + # configPath = ./../../moduler/programs/waybar/waybar-laptop.jsonc; + }; + gtk = { + enable = true; + iconTheme = { + name = "oomox-gruvbox-dark"; + package = pkgs.gruvbox-dark-icons-gtk; + }; + }; catppuccin = { librewolf = { enable = true; @@ -73,11 +84,11 @@ in }; boot.kernelPackages = pkgs.linuxPackages_latest; - boot.extraModulePackages = [ - (btusb.overrideAttrs (_: { - patches = [ ../../moduler/btusb-add-mt7925.patch ]; - })) - ]; + # boot.extraModulePackages = [ + # (btusb.overrideAttrs (_: { + # patches = [ ../../moduler/btusb-add-mt7925.patch ]; + # })) + # ]; networking.hostName = myhostname; diff --git a/moduler/dev.nix b/moduler/dev.nix index a530c23..8994d1c 100644 --- a/moduler/dev.nix +++ b/moduler/dev.nix @@ -35,6 +35,7 @@ in dotnetCorePackages.dotnet_9.sdk jira-cli-go gh + mermaid-cli # Minio awscli diff --git a/moduler/fish.nix b/moduler/fish.nix index eeacbd0..58e01c9 100644 --- a/moduler/fish.nix +++ b/moduler/fish.nix @@ -35,6 +35,7 @@ ]; shellAbbrs = { ls = "eza -l"; + lg = "lazygit"; ka = "kubectl apply -f"; t = "timew"; todo = "jira issue list -a 'Fredrik Wastring' -s ~Done -s ~Closed -s ~Released --plain"; diff --git a/moduler/hyprland.nix b/moduler/hyprland.nix index 3a3b9d0..0b2793e 100644 --- a/moduler/hyprland.nix +++ b/moduler/hyprland.nix @@ -19,12 +19,11 @@ in hyprland-qtutils waypipe wmenu - playerctl + playerctl ]; - fonts.packages = with pkgs; [ - font-awesome + font-awesome ]; services = { @@ -149,9 +148,9 @@ in }; decoration = { - rounding = 0; - active_opacity = 0.9; - inactive_opacity = 0.8; + rounding = 10; + active_opacity = 0.8; + inactive_opacity = 0.7; fullscreen_opacity = 0.9; blur = { @@ -275,7 +274,7 @@ in # Screencapture "$mod SHIFT, s, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png" - # special + # special "SUPER+SHIFT, code:201, exec, confetti" ]; @@ -284,6 +283,15 @@ in "$mod, mouse:273, resizewindow" ]; + windowrulev2 = [ + "float, class:^(org.pulseaudio.pavucontrol)$" + "size 500 400, class:^(org.pulseaudio.pavucontrol)" + "move onscreen cursor -250 0, class:^(org.pulseaudio.pavucontrol)" + "float, title:^(Bluetooth Devices)$" + "size 500 400, title:^(Bluetooth Devices)" + "move onscreen cursor -250 0, title:^(Bluetooth Devices)" + ]; + env = [ "NIXOS_OZONE_WL,1" "_JAVA_AWT_WM_NONREPARENTING,1" diff --git a/moduler/programs.nix b/moduler/programs.nix index 259a575..84dbe8a 100644 --- a/moduler/programs.nix +++ b/moduler/programs.nix @@ -27,7 +27,6 @@ feishin signal-desktop thunderbird - libreoffice discord slack speedcrunch @@ -36,7 +35,7 @@ via drawio freecad-wayland - kdePackages.okular + evince angryipscanner vlc diff --git a/moduler/programs/waybar/default.nix b/moduler/programs/waybar/default.nix index 3c18973..5ea72a2 100644 --- a/moduler/programs/waybar/default.nix +++ b/moduler/programs/waybar/default.nix @@ -1,4 +1,5 @@ { + lib, config, inputs, pkgs, @@ -6,18 +7,32 @@ }: let + in +with lib; { - programs = { + options = { waybar = { - enable = true; - systemd = { - enable = true; + enable = mkEnableOption "enables waybar"; + configPath = lib.mkOption { + type = lib.types.path; + default = ./waybar.jsonc; + description = "The path to the waybar config"; }; }; }; - xdg.configFile."waybar/config.jsonc".source = ./waybar.jsonc; - xdg.configFile."waybar/style.css".source = ./waybar.css; + config = mkIf config.waybar.enable { + programs = { + waybar = { + enable = true; + systemd = { + enable = true; + }; + }; + }; + xdg.configFile."waybar/config.jsonc".source = config.waybar.configPath; + xdg.configFile."waybar/style.css".source = ./waybar.css; + }; # catppuccin.waybar = { # enable = true; # flavor = "latte"; diff --git a/moduler/programs/waybar/waybar-laptop.jsonc b/moduler/programs/waybar/waybar-laptop.jsonc new file mode 100644 index 0000000..2bd3dec --- /dev/null +++ b/moduler/programs/waybar/waybar-laptop.jsonc @@ -0,0 +1,77 @@ +{ + "layer": "top", + "position": "top", + "margin-top": 10, + "margin-left": 14, + "margin-right": 14, + "spacing": 12, + "modules-left": [ + "hyprland/workspaces" + ], + "modules-right": [ + "mpris", + "bluetooth", + "pulseaudio", + "upower", + "clock" + ], + "mpris": { + "player": "Feishin", + "format": "{player_icon} {title} — {artist}", + "format-paused": " {player_icon} {title}", + "format-stopped": "", + "player-icons": { + "default": "", + "Feishin": "" + }, + "max-length": 45, + "interval": 1, + "tooltip": true, + "tooltip-format": "{player} — {status}\n{artist}\n{title}\n{album}", + "on-click": "playerctl -p Feishin play-pause", + "on-scroll-up": "playerctl -p Feishin next", + "on-scroll-down": "playerctl -p Feishin previous" + }, + "bluetooth": { + "format": " {status}", + "format-connected": " {device_alias}", + "format-connected-battery": " {device_alias} {device_battery_percentage}%", + "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}%", + "on-click": "pgrep .blueman-manage && pkill .blueman-manage || blueman-manager &" + }, + "upower": { + "icon-size": 20, + "hide-if-empty": true, + "tooltip": true, + "tooltip-spacing": 20 + }, + "pulseaudio": { + //"scroll-step": 1, + "format": "{icon} {volume}%", + "format-bluetooth": "{icon}  {volume}%", + "format-muted": "", + "format-icons": { + "headphones": "", + "handsfree": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": [ + "", + "" + ] + }, + "on-click": "pgrep pavucontrol && pkill pavucontrol || pavucontrol &" + }, + "clock": { + "format": "{:%c}", + "locale": "sv_SE.UTF-8", + "tooltip": true, + "tooltip-format": "{:%A, %d %B %Y}\n %H:%M:%S", + "interval": 1 + } +} diff --git a/moduler/programs/waybar/waybar.css b/moduler/programs/waybar/waybar.css index eba4aa3..007030e 100644 --- a/moduler/programs/waybar/waybar.css +++ b/moduler/programs/waybar/waybar.css @@ -15,33 +15,33 @@ /* -------- Base Styles -------- */ * { - font-family: "FiraCode Nerd Font Bold", "Font Awesome 7 Free Regular", sans-serif; + font-family: "FiraCode Nerd Font", "Font Awesome 7 Free"; font-size: 15px; } window#waybar { - background: @mocha-base; + /* background: @mocha-base; */ + background: transparent; box-shadow: 0 6px 18px rgba(0, 0, 0, 0.35); transition: background-color .35s ease, color .35s ease; - padding: 4px 8px; } window#waybar.hidden { opacity: 0.2; } -window#waybar.termite { background: @mocha-mantle; } +window#waybar.termite { background: @mocha-base; } window#waybar.chromium { background: @mocha-base; border: none; } /* -------- Module “pill” look -------- */ -#workspaces, #clock, #mpris { - background: @mocha-mantle; - border: 1px solid @mocha-surface2; - border-radius: 10px; +#workspaces, #clock, #mpris, #pulseaudio, #bluetooth, #upower { + background: @mocha-base; + border: none; + border-radius: 5px; padding: 3px 8px; } /* consistent gaps between modules */ .modules-left > widget, .modules-right > widget { - margin: 0 6px; + margin: 0 15px; } .modules-left > widget:first-child { margin-left: 0; } .modules-right > widget:last-child { margin-right: 0; } @@ -73,8 +73,7 @@ button:active { /* -------- Workspaces -------- */ #workspaces { - padding: 4px 6px; - background: @mocha-mantle; + background: @mocha-base; } #workspaces button { @@ -106,16 +105,38 @@ button:active { color: @mocha-base; font-weight: 600; letter-spacing: 0.2px; - padding: 4px 10px; } -/* -------- Clock -------- */ +/* -------- Mpris -------- */ #mpris { background: @mocha-peach; color: @mocha-base; font-weight: 600; letter-spacing: 0.2px; - padding: 4px 10px; +} + +/* -------- Pavu -------- */ +#pulseaudio { + background: @mocha-peach; + color: @mocha-base; + font-weight: 600; + letter-spacing: 0.2px; +} + +/* -------- Bluetooth -------- */ +#bluetooth { + background: @mocha-peach; + color: @mocha-base; + font-weight: 600; + letter-spacing: 0.2px; +} + +/* -------- Upower -------- */ +#bluetooth { + background: @mocha-peach; + color: @mocha-base; + font-weight: 600; + letter-spacing: 0.2px; } /* -------- Helpers -------- */ diff --git a/moduler/programs/waybar/waybar.jsonc b/moduler/programs/waybar/waybar.jsonc index 84e2f81..ce4c371 100644 --- a/moduler/programs/waybar/waybar.jsonc +++ b/moduler/programs/waybar/waybar.jsonc @@ -1,29 +1,70 @@ { - "layer": "top", - "position": "top", - - "modules-left": ["hyprland/workspaces"], - "modules-right": ["mpris","clock"], - "mpris": { - "player": "Feishin", - "format": "{player_icon} {artist} — {title}", - "format-paused": "{player_icon} {title}", - "format-stopped": "", - "player-icons": { "default": "", "Feishin": "" }, - "max-length": 45, - "interval": 1, - "tooltip": true, - "tooltip-format": "{player} — {status}\n{artist}\n{title}\n{album}", - "on-click": "playerctl -p Feishin play-pause", - "on-scroll-up": "playerctl -p Feishin next", - "on-scroll-down": "playerctl -p Feishin previous" - }, - - "clock": { - "format": "{:%c}", - "locale": "sv_SE.UTF-8", - "tooltip": true, - "tooltip-format": "{:%A, %d %B %Y}\n %H:%M:%S", - "interval": 1 - } + "layer": "top", + "position": "top", + "margin-top": 10, + "margin-left": 14, + "margin-right": 14, + "spacing": 12, + "modules-left": [ + "hyprland/workspaces" + ], + "modules-right": [ + "mpris", + "bluetooth", + "pulseaudio", + "clock" + ], + "mpris": { + "player": "Feishin", + "format": "{player_icon} {title} — {artist}", + "format-paused": " {player_icon} {title}", + "format-stopped": "", + "player-icons": { + "default": "", + "Feishin": "" + }, + "max-length": 45, + "interval": 1, + "tooltip": true, + "tooltip-format": "{player} — {status}\n{artist}\n{title}\n{album}", + "on-click": "playerctl -p Feishin play-pause", + "on-scroll-up": "playerctl -p Feishin next", + "on-scroll-down": "playerctl -p Feishin previous" + }, + "bluetooth": { + "format": " {status}", + "format-connected": " {device_alias}", + "format-connected-battery": " {device_alias} {device_battery_percentage}%", + "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}%", + "on-click": "pgrep .blueman-manage && pkill .blueman-manage || blueman-manager &" + }, + "pulseaudio": { + //"scroll-step": 1, + "format": "{icon} {volume}%", + "format-bluetooth": "{icon}  {volume}%", + "format-muted": "", + "format-icons": { + "headphones": "", + "handsfree": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": [ + "", + "" + ] + }, + "on-click": "pgrep pavucontrol && pkill pavucontrol || pavucontrol &" + }, + "clock": { + "format": "{:%c}", + "locale": "sv_SE.UTF-8", + "tooltip": true, + "tooltip-format": "{:%A, %d %B %Y}\n %H:%M:%S", + "interval": 1 + } } diff --git a/moduler/system.nix b/moduler/system.nix index bce6d3c..5ece59c 100644 --- a/moduler/system.nix +++ b/moduler/system.nix @@ -58,7 +58,6 @@ # system call monitoring strace # system call monitoring - ltrace # library call monitoring lsof # list open files # system tools