From d192efdf0f09cb208cfc7097a5d6b618e565f61d Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Sat, 11 Jan 2025 12:15:19 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=B1=20Added=20Catppuccin=20flake,=20Ad?= =?UTF-8?q?ded=20Cava,=20removed=20wlogout=20and=20replace=20bind=20with?= =?UTF-8?q?=20Hyprpanel=20Dash?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 214 +++++++++++++++++++++++++++++-- flake.nix | 5 + home-manager/cava.nix | 12 ++ home-manager/default.nix | 2 + home-manager/hyprland/binds.nix | 2 +- home-manager/wlogout/default.nix | 2 +- 6 files changed, 227 insertions(+), 10 deletions(-) create mode 100644 home-manager/cava.nix diff --git a/flake.lock b/flake.lock index 352297c..b5cd6cb 100644 --- a/flake.lock +++ b/flake.lock @@ -110,6 +110,60 @@ "type": "github" } }, + "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", + "nuscht-search": "nuscht-search" + }, + "locked": { + "lastModified": 1736069220, + "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=", + "owner": "catppuccin", + "repo": "nix", + "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "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" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -233,6 +287,24 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "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_3": { "inputs": { "systems": [ "stylix", @@ -388,6 +460,49 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "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": [ "nixpkgs" @@ -408,7 +523,7 @@ "type": "github" } }, - "home-manager_2": { + "home-manager_3": { "inputs": { "nixpkgs": [ "nixvim", @@ -429,7 +544,7 @@ "type": "github" } }, - "home-manager_3": { + "home-manager_4": { "inputs": { "nixpkgs": [ "stylix", @@ -473,6 +588,34 @@ } }, "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", @@ -537,6 +680,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1734600368, + "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1736344531, @@ -559,7 +718,7 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "git-hooks": "git-hooks", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs-unstable" @@ -581,10 +740,33 @@ "type": "github" } }, - "nuschtosSearch": { + "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_2", + "ixx": "ixx_2", "nixpkgs": [ "nixvim", "nixpkgs" @@ -606,7 +788,8 @@ }, "root": { "inputs": { - "home-manager": "home-manager", + "catppuccin": "catppuccin", + "home-manager": "home-manager_2", "hyprpanel": "hyprpanel", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", @@ -644,14 +827,14 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_3", + "home-manager": "home-manager_4", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2", + "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" @@ -701,6 +884,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index a66b40c..dacb12e 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,10 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + catppuccin = { + url = "github:catppuccin/nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; @@ -30,6 +34,7 @@ outputs = inputs@{ self, # Get a ref to outputs + catppuccin, nixpkgs, nixpkgs-unstable, home-manager, diff --git a/home-manager/cava.nix b/home-manager/cava.nix new file mode 100644 index 0000000..72bc0ce --- /dev/null +++ b/home-manager/cava.nix @@ -0,0 +1,12 @@ +## Audio visualizer +let + theme = import ../theme.nix; +in +{ + catppuccin.cava = { + enable = true; + flavor = theme.flavor; + }; + + programs.cava.enable = true; +} diff --git a/home-manager/default.nix b/home-manager/default.nix index 02d439e..2182bb2 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -10,7 +10,9 @@ let in { imports = [ + inputs.catppuccin.homeManagerModules.catppuccin inputs.nixvim.homeManagerModules.nixvim + ./cava.nix ./default-applications.nix ./fish.nix ./git.nix diff --git a/home-manager/hyprland/binds.nix b/home-manager/hyprland/binds.nix index d36e769..205263c 100644 --- a/home-manager/hyprland/binds.nix +++ b/home-manager/hyprland/binds.nix @@ -21,7 +21,7 @@ in "$mainMod, B, exec, ${app.browser}" "$mainMod, L, exec, ${app.lockScreen}" "$mainMod, K, exec, [float] ${app.calculator}" - "$mainMod, ESCAPE, exec, wlogout" + "$mainMod, ESCAPE, exec, hyprpanel t dashboardmenu" # Move focus with mainMod + arrow keys "$mainMod, left, movefocus, l" diff --git a/home-manager/wlogout/default.nix b/home-manager/wlogout/default.nix index 08474d0..de89d02 100644 --- a/home-manager/wlogout/default.nix +++ b/home-manager/wlogout/default.nix @@ -14,7 +14,7 @@ }; programs.wlogout = { - enable = true; + enable = false; layout = [ { label = "lock";