diff --git a/common/default.nix b/common/default.nix index 88ee8ea6..df655bea 100644 --- a/common/default.nix +++ b/common/default.nix @@ -51,13 +51,13 @@ "https://nix-community.cachix.org" "https://nixpkgs-review-bot.cachix.org" "https://cachix.cachix.org" - "https://cosmic.cachix.org" + "https://hyprland.cachix.org" ]; trusted-public-keys = [ "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-review-bot.cachix.org-1:eppgiDjPk7Hkzzz7XlUesk3rcEHqNDozGOrcLc8IqwE=" - "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; }; optimise = { diff --git a/common/desktop/home.nix b/common/desktop/home.nix index ea027e22..07489b02 100644 --- a/common/desktop/home.nix +++ b/common/desktop/home.nix @@ -109,7 +109,6 @@ in xdg.autoStart = { packages = with pkgs; [ - obsidian element-desktop firefox discord diff --git a/common/hm-modules/catppuccin/default.nix b/common/hm-modules/catppuccin/default.nix index a17b7433..8d6149a9 100644 --- a/common/hm-modules/catppuccin/default.nix +++ b/common/hm-modules/catppuccin/default.nix @@ -6,20 +6,7 @@ }: with lib; let - inherit (builtins) fromTOML readFile; cfg = config.themes.v.catppuccin; - mako = pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "mako"; - rev = "9dd088aa5f4529a3dd4d9760415e340664cb86df"; - sha256 = "sha256-nUzWkQVsIH4rrCFSP87mXAka6P+Td2ifNbTuP7NM/SQ="; - }; - starship = pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "starship"; - rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f"; - sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0="; - }; in { options.themes.v.catppuccin = { @@ -27,8 +14,24 @@ in }; config = mkIf cfg.enable { catppuccin = { + enable = true; flavor = "frappe"; accent = "pink"; + + waybar.enable = false; + + mako.enable = true; + rofi.enable = true; + # gtk = { + # enable = true; + # gnomeShellTheme = true; + # icon.enable = false; + # }; + + hyprland.enable = true; + kitty.enable = true; + + kvantum.enable = true; }; home.pointerCursor = { @@ -38,21 +41,12 @@ in }; programs.kitty = { - themeFile = "Catppuccin-Frappe"; + # themeFile = "Catppuccin-Frappe"; font.name = "DejaVuSansMono Nerd Font"; }; gtk = { enable = true; - # theme = { - # name = "Catppuccin-Frappe-Standard-Pink-Dark"; - # package = pkgs.catppuccin-gtk.override { - # accents = [ "pink" ]; - # variant = "frappe"; - # size = "standard"; - # }; - # }; - iconTheme = { name = "Papirus-Dark"; package = pkgs.papirus-icon-theme.override { color = "violet"; }; @@ -62,34 +56,12 @@ in }; }; - # qt = { - # enable = true; - # # platformTheme = "qtct"; - # style.name = "kvantum"; - # platformTheme.name = "kvantum"; - # }; - - # xdg.configFile = { - # "Kvantum/kvantum.kvconfig".text = '' - # [General] - # theme=Catppuccin-Frappe-Pink - # ''; - # }; - - home.packages = with pkgs; [ - # (catppuccin-kvantum.override { - # accent = "Pink"; - # variant = "Frappe"; - # }) - ]; - - services.mako.catppuccin.enable = true; - # programs.mako.extraConfig = readFile "${mako}/src/frappe"; - # - # programs.starship.settings = { - # palette = "catppuccin_frappe"; - # } //fromTOML (readFile "${starship}/palettes/frappe.toml"); - # + qt = { + enable = true; + # platformTheme = "qtct"; + style.name = "kvantum"; + platformTheme.name = "kvantum"; + }; programs.vscode = { userSettings."workbench.colorTheme" = "Catppuccin Frappé"; diff --git a/flake.lock b/flake.lock index af48e79d..27c76aa0 100644 --- a/flake.lock +++ b/flake.lock @@ -57,12 +57,21 @@ } }, "catppuccin": { + "inputs": { + "catppuccin-v1_1": "catppuccin-v1_1", + "catppuccin-v1_2": "catppuccin-v1_2", + "home-manager": "home-manager", + "home-manager-stable": "home-manager-stable", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable_2", + "nuscht-search": "nuscht-search" + }, "locked": { - "lastModified": 1734734291, - "narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=", + "lastModified": 1735263930, + "narHash": "sha256-vU7SkHINr+NqmZeFLA11plsaUfazKKpdEhI/oTJbK3Q=", "owner": "catppuccin", "repo": "nix", - "rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8", + "rev": "a2e641bc6b17129d81d54019e14c9956784c69c6", "type": "github" }, "original": { @@ -71,20 +80,48 @@ "type": "github" } }, + "catppuccin-v1_1": { + "locked": { + "lastModified": 1734055249, + "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=", + "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7", + "revCount": 326, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz" + } + }, + "catppuccin-v1_2": { + "locked": { + "lastModified": 1734728407, + "narHash": "sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA=", + "rev": "23ee86dbf4ed347878115a78971d43025362fab1", + "revCount": 341, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" + } + }, "colmena": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "stable": "stable" }, "locked": { - "lastModified": 1731527002, - "narHash": "sha256-dI9I6suECoIAmbS4xcrqF8r2pbmed8WWm5LIF1yWPw8=", + "lastModified": 1734897875, + "narHash": "sha256-LLpiqfOGBippRax9F33kSJ/Imt8gJXb6o0JwSBiNHCk=", "owner": "zhaofengli", "repo": "colmena", - "rev": "e3ad42138015fcdf2524518dd564a13145c72ea1", + "rev": "a6b51f5feae9bfb145daa37fd0220595acb7871e", "type": "github" }, "original": { @@ -116,11 +153,11 @@ }, "crane_2": { "locked": { - "lastModified": 1730652660, - "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -132,7 +169,7 @@ "deploy": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "utils": "utils" }, "locked": { @@ -172,7 +209,7 @@ }, "essentials": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -386,12 +423,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -402,7 +442,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_3" + "flake-utils": "flake-utils_4" }, "locked": { "lastModified": 1722363685, @@ -419,8 +459,23 @@ } }, "flake-utils_2": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1701680307, @@ -436,9 +491,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1694529238, @@ -454,24 +509,6 @@ "type": "github" } }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_5": { "inputs": { "systems": "systems_5" @@ -492,7 +529,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1731533236, @@ -510,7 +547,25 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { + "inputs": { + "systems": "systems_9" }, "locked": { "lastModified": 1710146030, @@ -526,9 +581,9 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_9": { "inputs": { - "systems": "systems_8" + "systems": "systems_10" }, "locked": { "lastModified": 1681202837, @@ -561,11 +616,11 @@ ] }, "locked": { - "lastModified": 1734425854, - "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -620,17 +675,15 @@ }, "gnome-autounlock-keyring": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "nixpkgs" - ] + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1711359349, - "narHash": "sha256-dSHWgOtipLWgSSZFq9tvlaQF9b8Jfk/2mYCX4QS4x50=", + "lastModified": 1734975080, + "narHash": "sha256-MkI4Ow73kPlPyYA0SZ1izaxhtGAiaVtRy8Yv1H7n9hI=", "ref": "refs/heads/main", - "rev": "06279869e7a26dc91ca3e3abb84a3508d7f977cb", - "revCount": 10, + "rev": "e0d291465b5993a9da6e22b96defd34621f99b0d", + "revCount": 11, "type": "git", "url": "https://git.0x76.dev/v/gnome-autounlock-keyring.git" }, @@ -642,6 +695,7 @@ "home-manager": { "inputs": { "nixpkgs": [ + "catppuccin", "nixpkgs" ] }, @@ -659,19 +713,40 @@ "type": "github" } }, + "home-manager-stable": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, "home-manager_2": { "inputs": { "nixpkgs": [ - "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1734344598, - "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", + "lastModified": 1735053786, + "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", "owner": "nix-community", "repo": "home-manager", - "rev": "83ecd50915a09dca928971139d3a102377a8d242", + "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", "type": "github" }, "original": { @@ -680,7 +755,101 @@ "type": "github" } }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734862405, + "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "hyprland-qtutils": { + "inputs": { + "hyprutils": "hyprutils", + "nixpkgs": "nixpkgs_5", + "systems": "systems_6" + }, + "locked": { + "lastModified": 1734906472, + "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1734796073, + "narHash": "sha256-TnuKsa8OHrSJEmHm3TLGOWbPNA1gRjmZLsRzKrCqOsg=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "c3331116ebd0b71df5ae8c6efe9a7f94148b03bf", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "ixx": { + "inputs": { + "flake-utils": [ + "catppuccin", + "nuscht-search", + "flake-utils" + ], + "nixpkgs": [ + "catppuccin", + "nuscht-search", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, + "ixx_2": { "inputs": { "flake-utils": [ "nixvim", @@ -720,11 +889,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731941836, - "narHash": "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=", + "lastModified": 1734994463, + "narHash": "sha256-S9MgfQjNt4J3I7obdLOVY23h+Yl/hnyibwGfOl+1uOE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2f48272f34174fd2a5ab3df4d8a46919247be879", + "rev": "93e6f0d77548be8757c11ebda5c4235ef4f3bc67", "type": "github" }, "original": { @@ -740,14 +909,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_05": "nixpkgs-24_05" + "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1734370678, - "narHash": "sha256-a8zkti1QM5Oxkdfnzr/NjrFlyqI36/kYV/X8G1jOmB4=", + "lastModified": 1734884447, + "narHash": "sha256-HA9fAmGNGf0cOYrhgoa+B6BxNVqGAYXfLyx8zIS0ZBY=", "ref": "refs/heads/master", - "rev": "c43d8c4a3ce84a7bebd110b06e69365484db6208", - "revCount": 601, + "rev": "63209b1def2c9fc891ad271f474a3464a5833294", + "revCount": 603, "type": "git", "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git" }, @@ -758,16 +927,16 @@ }, "microvm": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_3", + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_6", "spectrum": "spectrum" }, "locked": { - "lastModified": 1734041466, - "narHash": "sha256-51bhaMe8BZuNAStUHvo07nDO72wmw8PAqkSYH4U31Yo=", + "lastModified": 1735074045, + "narHash": "sha256-CeYsC8J2dNiV2FCQOxK1oZ/jNpOF2io7aCEFHmfi95U=", "owner": "astro", "repo": "microvm.nix", - "rev": "3910e65c3d92c82ea41ab295c66df4c0b4f9e7b3", + "rev": "2ae08de8e8068b00193b9cfbc0acc9dfdda03181", "type": "github" }, "original": { @@ -841,11 +1010,11 @@ }, "nixlib": { "locked": { - "lastModified": 1734224914, - "narHash": "sha256-hKWALzQ/RxxXdKWsLKXULru6XTag9Cc5exgVyS4a/AE=", + "lastModified": 1734829460, + "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "538697b664a64fade8ce628d01f35d1f1fd82d77", + "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", "type": "github" }, "original": { @@ -862,11 +1031,11 @@ ] }, "locked": { - "lastModified": 1734570415, - "narHash": "sha256-kcsDNcEr4hYuDc8l+ox41FvEPpmQTV3/3hgdx3tuxHw=", + "lastModified": 1734915500, + "narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "b8f266f26bb757e7aec18adeee6919db6666c4f6", + "rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4", "type": "github" }, "original": { @@ -877,11 +1046,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734352517, - "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", + "lastModified": 1734954597, + "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", + "rev": "def1d472c832d77885f174089b0d34854b007198", "type": "github" }, "original": { @@ -892,11 +1061,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -906,18 +1075,18 @@ "type": "github" } }, - "nixpkgs-24_05": { + "nixpkgs-24_11": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "type": "indirect" } }, @@ -939,11 +1108,27 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1734600368, + "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -953,86 +1138,7 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1702272962, - "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1734753021, - "narHash": "sha256-xtqjYzqqGb723XT+V63weQOqW0LHj1Hov28Co+BMhIw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3f0036916daca9836ba2c3f236b0ae051949a0a8", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable-small", - "type": "indirect" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { + "nixpkgs_10": { "locked": { "lastModified": 1714656196, "narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=", @@ -1048,24 +1154,150 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1702272962, + "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1734973338, + "narHash": "sha256-E9JOCwppN3WX9oh6kV9w4nkN+6UPGNdzljscdJy5kTs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2b37ecedbb948e7607307c56e35aea5155eb65a7", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", "flake-compat": "flake-compat_6", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_8", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734749627, - "narHash": "sha256-5HLarzO44i6tUBIr+DRMeAHJP3p84Z1b9wuElv85O1U=", + "lastModified": 1735254735, + "narHash": "sha256-byFeQzjeTLgWkk2xEhTYqYvUsID7H2QAkzuFKIL2Stc=", "owner": "pta2002", "repo": "nixvim", - "rev": "9f32e25f3f2b029b76e79ef7c1f48cd3596938d8", + "rev": "1671f8618fa347d8a0cd62506df386d58d7608f3", "type": "github" }, "original": { @@ -1077,15 +1309,15 @@ "nur": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_9", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1734771797, - "narHash": "sha256-lQTY9t/3PP7RCCsSbLAPjzd3RvSkhUwevHuMSB+OlCE=", + "lastModified": 1735295865, + "narHash": "sha256-dEcYpI/FieSggzFqw2nxo/jVoSazd3wHKgJThb2gB58=", "owner": "nix-community", "repo": "NUR", - "rev": "887090ab19e70bcb02c0091a017f777888b4932f", + "rev": "e94eb2922f546865019dcde638518d9e8ca17f57", "type": "github" }, "original": { @@ -1094,10 +1326,33 @@ "type": "github" } }, + "nuscht-search": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "owner": "NuschtOS", + "repo": "search", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_6", - "ixx": "ixx", + "flake-utils": "flake-utils_7", + "ixx": "ixx_2", "nixpkgs": [ "nixvim", "nixpkgs" @@ -1128,14 +1383,14 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -1154,13 +1409,14 @@ "essentials": "essentials", "flake-utils-plus": "flake-utils-plus", "gnome-autounlock-keyring": "gnome-autounlock-keyring", - "home-manager": "home-manager", + "home-manager": "home-manager_2", + "hyprland-qtutils": "hyprland-qtutils", "lanzaboote": "lanzaboote", "mailserver": "mailserver", "microvm": "microvm", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_7", "nixvim": "nixvim", "nur": "nur", "t": "t", @@ -1176,11 +1432,11 @@ ] }, "locked": { - "lastModified": 1730601085, - "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { @@ -1236,6 +1492,21 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1298,16 +1569,16 @@ }, "systems_6": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1341,9 +1612,24 @@ "type": "github" } }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "t": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_8", "nixpkgs": [ "nixpkgs" ] @@ -1370,11 +1656,11 @@ ] }, "locked": { - "lastModified": 1733761991, - "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { @@ -1406,7 +1692,7 @@ }, "utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1701680307, @@ -1425,7 +1711,7 @@ "vault-secrets": { "inputs": { "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1714988039, @@ -1443,7 +1729,7 @@ }, "vault-unseal": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_9", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 87e602f9..4c3913bb 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ # * https://github.com/Infinidoge/nix-minecraft inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable-small"; + nixpkgs.url = "nixpkgs/nixos-unstable"; flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus"; nur.url = "github:nix-community/NUR"; colmena.url = "github:zhaofengli/colmena"; @@ -34,7 +34,6 @@ vault-unseal.inputs.nixpkgs.follows = "nixpkgs"; gnome-autounlock-keyring.url = "git+https://git.0x76.dev/v/gnome-autounlock-keyring.git"; - gnome-autounlock-keyring.inputs.nixpkgs.follows = "nixpkgs"; t.url = "github:jdonszelmann/t-rs"; t.inputs.nixpkgs.follows = "nixpkgs"; @@ -48,6 +47,8 @@ essentials.inputs.nixpkgs.follows = "nixpkgs"; autostart.url = "github:Zocker1999NET/home-manager-xdg-autostart"; + + hyprland-qtutils.url = "github:hyprwm/hyprland-qtutils"; }; outputs = diff --git a/hosts/thalassa/aoife/default.nix b/hosts/thalassa/aoife/default.nix index 133ca25f..59dabf2c 100644 --- a/hosts/thalassa/aoife/default.nix +++ b/hosts/thalassa/aoife/default.nix @@ -29,10 +29,7 @@ # Bootloader. boot = { kernelParams = [ - # "amdgpu.sg_display=0" # did not fix the flickering - # "amdgpu.ppfeaturemask=0xffffffff" # did not fix flicker - # "amdgpu.graphics_sg=0" - "amdgpu.dcdebugmask=0x10" + "amdgpu.dcdebugmask=0x10" # Disables partial screen refresh, fixes flicker ]; bootspec.enable = true; initrd.kernelModules = [ "amdgpu" ]; @@ -59,7 +56,10 @@ # here, NOT in environment.systemPackages ]; - programs.hyprland.enable = true; + programs.hyprland = { + enable = true; + withUWSM = true; + }; services.gnome.gnome-keyring.enable = true; diff --git a/hosts/thalassa/aoife/home/default.nix b/hosts/thalassa/aoife/home/default.nix index bfbe13a8..f9a02f4b 100644 --- a/hosts/thalassa/aoife/home/default.nix +++ b/hosts/thalassa/aoife/home/default.nix @@ -15,13 +15,9 @@ ''; home.packages = with pkgs; [ - jetbrains.rust-rover - jetbrains.clion - # jetbrains.idea-ultimate eduvpn-client localsend typst - zed-editor ]; diff --git a/hosts/thalassa/aoife/home/hyprland.nix b/hosts/thalassa/aoife/home/hyprland.nix index f8242144..3797b4cf 100644 --- a/hosts/thalassa/aoife/home/hyprland.nix +++ b/hosts/thalassa/aoife/home/hyprland.nix @@ -2,110 +2,63 @@ pkgs, config, inputs, + lib, ... }: let terminal = "${config.programs.kitty.package}/bin/kitty -1"; in { + imports = [ + ./waybar.nix + ]; home.packages = with pkgs; [ - v.hyprland-workspaces + hyprland-workspaces + inputs.gnome-autounlock-keyring.packages.${pkgs.system}.default + inputs.hyprland-qtutils.packages.${pkgs.system}.default ]; services = { - mako.enable = true; + mako = { + enable = true; + defaultTimeout = 5000; + }; }; programs = { - wofi = { + rofi = { enable = true; + package = pkgs.rofi-wayland; }; # eww = { - # enable = true; - # configDir = ./eww; + # enable = true; + # configDir = ./eww; # }; + }; + # Hack to ensure graphical dependent services start _after_ hyprland starts + # Needed as these services normally start after graphical-session-pre + systemd.user.services.hyprpaper.Unit.After = lib.mkForce "graphical-session.target"; + systemd.user.services.waybar.Unit.After = lib.mkForce "graphical-session.target"; - waybar = { - enable = true; - style = ./waybar.css; - settings = { - mainBar = { - layer = "top"; - position = "top"; - height = 30; - modules-left = [ "hyprland/workspaces" ]; - modules-center = [ "clock" ]; - modules-right = [ - "wireplumber" - "power-profiles-daemon" - "network" - "battery" - ]; + services = { + gnome-keyring.enable = true; + hyprpaper = + let + wallpaper = ../../../../assets/wallpaper-nix-pink.png; + in + { + enable = true; + settings = { + preload = [ "${wallpaper}" ]; + wallpaper = [ "eDP-1,${wallpaper}" ]; - wireplumber = { - format = "󰕾 {volume}%"; - format-muted = "󰖁"; - on-click = "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_SINK@ toggle"; - }; - - network = - let - nmtui = pkgs.writeScriptBin "nmtui.sh" '' - #!${pkgs.stdenv.shell} - unset COLORTERM - TERM=xterm-old ${pkgs.networkmanager}/bin/nmtui - ''; - in - { - format-wifi = "󰖩 {essid} ({signalStrength}%)"; - format-ethernet = "󰈀 {ifname}: {ipaddr}/{cidr}"; - format-disconnected = "󰌙 "; - tooltip-format = "{ifname}: {ipaddr}"; - on-click = "touch ~/a && ${terminal} --execute ${nmtui}/bin/nmtui.sh"; - }; - - power-profiles-daemon = { - format = "{icon}"; - format-icons = { - performance = "󰓅"; - balanced = "󰾅"; - power-saver = "󰾆"; - }; - }; - - battery = { - states = { - warning = 30; - critical = 15; - }; - - format = "󱐋 {capacity}%"; - format-discharging = "{icon} {capacity}%"; - - format-icons = [ - "󰂎" - "󰁺" - "󰁻" - "󰁼" - "󰁽" - "󰁾" - "󰁿" - "󰂀" - "󰂁" - "󰂂" - "󰁹" - ]; - }; + splash = false; + ipc = "off"; }; }; - systemd = { - enable = true; - target = "hyprland-session.target"; - }; - }; }; wayland.windowManager.hyprland = @@ -118,44 +71,31 @@ in hyprctl keyword monitor ",preferred,auto,1,mirror,eDP-1" fi ''; + # Autostart now handled by xdg.autoStart startup = pkgs.writeScriptBin "startup.sh" '' #!${pkgs.stdenv.shell} - firefox & - discord & - - # start keyring, then unlock it, then start Element - gnome-keyring-daemon -r -d && ${ - inputs.gnome-autounlock-keyring.packages.${pkgs.system}.default - }/bin/gnome-autounlock-keyring unlock && element-desktop & + echo "Starting up" ''; - hyprpaper-conf = - let - wallpaper = ../../../../assets/wallpaper-nix-pink.png; - in - pkgs.writeText "hyprpaper.conf" '' - preload = ${wallpaper} - wallpaper = eDP-1,${wallpaper} - - splash = false - ipc = off - ''; in { enable = true; - systemd.enable = true; + systemd.enable = false; # using UWSM + + plugins = with pkgs.hyprlandPlugins; [ + hyprexpo + ]; settings = let inherit (builtins) genList concatLists toString; wpctl = "${pkgs.wireplumber}/bin/wpctl"; brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl"; - menu = "${config.programs.wofi.package}/bin/wofi --show run,drun"; + menu = "${config.programs.rofi.package}/bin/rofi -show combi -modes combi -combi-modes \"window,drun,run\""; fileManager = "${pkgs.nautilus}/bin/nautilus"; in { "$mod" = "SUPER"; exec-once = [ - "${pkgs.hyprpaper}/bin/hyprpaper -c ${hyprpaper-conf}" "${startup}/bin/startup.sh" ]; monitor = [ @@ -169,11 +109,11 @@ in gaps_in = 5; gaps_out = 10; border_size = 2; - "col.active_border" = "rgba(8caaeeee) rgba(a6d189ee) 45deg"; + "col.active_border" = "rgba(babbf1ee) rgba(f4b8e4ee) 45deg"; "col.inactive_border" = "rgba(303446aa)"; layout = "dwindle"; # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on - allow_tearing = false; + allow_tearing = true; }; group = { "col.border_active" = "rgba(babbf1ee) rgba(f4b8e4ee) 45deg"; @@ -187,6 +127,14 @@ in text_color = "rgba(ffffffee)"; }; }; + + plugin.hyprexpo = { + workspace_method = "first 1"; + enable_gesture = true; + gesture_positive = false; + gesture_fingers = 3; + }; + decoration = { rounding = 10; @@ -213,8 +161,8 @@ in "windowsOut, 1, 7, default, popin 80%" "border, 1, 10, default" "borderangle, 1, 8, default" - "fade, 1, 7, default" - "workspaces, 1, 6, default" + "fade, 1, 4, default" + "workspaces, 1, 4, default" ]; }; dwindle = { @@ -254,7 +202,7 @@ in [ "$mod, RETURN, exec, ${terminal}" "$mod, Q, killactive," - "$mod SHIFT, escape, exit," + "$mod SHIFT, Q, exec, uwsm stop," "$mod, E, exec, ${fileManager}" "$mod, V, togglefloating," "$mod, D, exec, ${menu}" @@ -262,6 +210,8 @@ in "$mod, J, togglesplit, # dwindle" "$mod,m,fullscreen" + "$mod, space, hyprexpo:expo, toggle" + # Move focus with arrow keys "$mod, left, movefocus, l" "$mod, right, movefocus, r" @@ -271,6 +221,7 @@ in # Scratch workspace "$mod, S, togglespecialworkspace, magic" "$mod SHIFT, S, movetoworkspace, special:magic" + # Groups aka Tabs "$mod,g,togglegroup" "$mod,tab,changegroupactive" diff --git a/hosts/thalassa/aoife/home/waybar.nix b/hosts/thalassa/aoife/home/waybar.nix new file mode 100644 index 00000000..2f07a5a0 --- /dev/null +++ b/hosts/thalassa/aoife/home/waybar.nix @@ -0,0 +1,84 @@ +{ pkgs, config, ... }: +let + terminal = "${config.programs.kitty.package}/bin/kitty -1"; +in +{ + programs.waybar = { + enable = true; + systemd = { + enable = true; + # target = "wayland-session@Hyprland.target"; + }; + style = ./waybar.css; + settings = { + mainBar = { + layer = "top"; + position = "top"; + height = 30; + modules-left = [ "hyprland/workspaces" ]; + modules-center = [ "clock" ]; + modules-right = [ + "wireplumber" + "power-profiles-daemon" + "network" + "battery" + ]; + + wireplumber = { + format = "󰕾 {volume}%"; + format-muted = "󰖁"; + on-click = "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_SINK@ toggle"; + }; + + network = + let + nmtui = pkgs.writeScriptBin "nmtui.sh" '' + #!${pkgs.stdenv.shell} + unset COLORTERM + TERM=xterm-old ${pkgs.networkmanager}/bin/nmtui + ''; + in + { + format-wifi = "󰖩 {essid} ({signalStrength}%)"; + format-ethernet = "󰈀 {ifname}: {ipaddr}/{cidr}"; + format-disconnected = "󰌙 "; + tooltip-format = "{ifname}: {ipaddr}"; + on-click = "touch ~/a && ${terminal} --execute ${nmtui}/bin/nmtui.sh"; + }; + + power-profiles-daemon = { + format = "{icon}"; + format-icons = { + performance = "󰓅"; + balanced = "󰾅"; + power-saver = "󰾆"; + }; + }; + + battery = { + states = { + warning = 30; + critical = 15; + }; + + format = "󱐋 {capacity}%"; + format-discharging = "{icon} {capacity}%"; + + format-icons = [ + "󰂎" + "󰁺" + "󰁻" + "󰁼" + "󰁽" + "󰁾" + "󰁿" + "󰂀" + "󰂁" + "󰂂" + "󰁹" + ]; + }; + }; + }; + }; +} diff --git a/pkgs/default.nix b/pkgs/default.nix index 53a34a43..9e172ca2 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -21,8 +21,6 @@ final: prev: { platformio.platformio-ide = prev.callPackage ./vscode-extensions/platformio.nix { }; }; - - hyprland-workspaces = prev.callPackage ./hyprland-workspaces { }; }; plex-plexpass = prev.callPackage ./plex-pass { }; diff --git a/pkgs/hyprland-workspaces/default.nix b/pkgs/hyprland-workspaces/default.nix deleted file mode 100644 index af9f9136..00000000 --- a/pkgs/hyprland-workspaces/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ rustPlatform, lib, fetchFromGitHub }: -rustPlatform.buildRustPackage rec { - pname = "hyprland-workspaces"; - version = "2.0.0"; - - src = fetchFromGitHub { - owner = "FieldofClay"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-4QGLTimIpx74gWUyHCheUZZT1WgVzBoJRY8OlUDdOh4="; - }; - - cargoHash = "sha256-9ndP0nyRBCdOGth4UWA263IvjbgnVW2x9PK8oTaMrxg="; - - meta = with lib; { - description = "A multi-monitor aware Hyprland workspace widget"; - license = licenses.mit; - platforms = platforms.linux; - }; -}