diff --git a/flake.lock b/flake.lock index 841b871..15a3ca2 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "catppuccin": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1772153824, + "narHash": "sha256-T65qXmlcD9qFpPTi+mOXsn4dIkO2N8Ls67nqmuzepv0=", + "owner": "catppuccin", + "repo": "nix", + "rev": "4b0f5b7bf7b3eeb484d49524f3c9791864ab9362", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "type": "github" + } + }, "ghettoptt": { "inputs": { "nixpkgs": [ @@ -28,11 +46,11 @@ ] }, "locked": { - "lastModified": 1772569491, - "narHash": "sha256-bdr6ueeXO1Xg91sFkuvaysYF0mVdwHBpdyhTjBEWv+s=", + "lastModified": 1772516620, + "narHash": "sha256-2r4cKdqCVlQkvcTcLUMxmsmAYZZxCMd//w/PnDnukTE=", "owner": "nix-community", "repo": "home-manager", - "rev": "924e61f5c2aeab38504028078d7091077744ab17", + "rev": "2b9504d5a0169d4940a312abe2df2c5658db8de9", "type": "github" }, "original": { @@ -109,15 +127,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772542754, - "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", - "owner": "nixos", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -139,6 +157,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1772433332, + "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixprstatus": { "inputs": { "nixpkgs": [ @@ -265,12 +299,13 @@ }, "root": { "inputs": { + "catppuccin": "catppuccin", "ghettoptt": "ghettoptt", "home-manager": "home-manager", "huecli": "huecli", "natstonotify": "natstonotify", "nix-packages": "nix-packages", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", "nixprstatus": "nixprstatus", "sops-nix": "sops-nix" diff --git a/flake.nix b/flake.nix index e0ee926..50f80e9 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,9 @@ url = "git+https://git.t-juice.club/torjus/natstonotify?ref=master"; inputs.nixpkgs.follows = "nixpkgs"; }; + catppuccin = { + url = "github:catppuccin/nix"; + }; }; outputs = @@ -45,6 +48,7 @@ huecli, natstonotify, nix-packages, + catppuccin, ... }@inputs: let diff --git a/home/hosts/gunter/default.nix b/home/hosts/gunter/default.nix index bf3ffb2..ea28305 100644 --- a/home/hosts/gunter/default.nix +++ b/home/hosts/gunter/default.nix @@ -17,6 +17,7 @@ { imports = [ inputs.sops-nix.homeManagerModules.sops + inputs.catppuccin.homeModules.catppuccin ../../editor/neovim ../../hyprland ../../packages diff --git a/home/hosts/magicman/default.nix b/home/hosts/magicman/default.nix index f2fa6b4..8ead350 100644 --- a/home/hosts/magicman/default.nix +++ b/home/hosts/magicman/default.nix @@ -17,6 +17,7 @@ { imports = [ inputs.sops-nix.homeManagerModules.sops + inputs.catppuccin.homeModules.catppuccin ../../sops ../../services/labmcp.nix ../../editor/neovim @@ -28,7 +29,6 @@ ../../programs/rofi ../../programs/obs-studio ../../programs/vscode - ../../programs/pywal ../../scripts ../../scripts/batlvl.nix ../../zsh diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 872867f..708900b 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -73,7 +73,6 @@ in [ dunst hyprpaper - rofi slurp swww waybar @@ -261,8 +260,9 @@ in # term "$mainMod,Return,exec,$term" # rofi - "$mainMod,D,exec,rofi-launcher" + "$mainMod,D,exec,rofi -show drun" "$mainMod,P,exec,rofi-rbw" + "$mainMod,E,exec,rofi -show emoji" # hyprlock "$shiftMainMod,l,exec,${pkgs.hyprlock}/bin/hyprlock" # hyprland diff --git a/home/programs/rofi/config.rasi b/home/programs/rofi/config.rasi deleted file mode 100644 index f4c53ed..0000000 --- a/home/programs/rofi/config.rasi +++ /dev/null @@ -1,17 +0,0 @@ -configuration{ - modi: "run,drun,window"; - icon-theme: "Oranchelo"; - show-icons: true; - terminal: "alacritty"; - drun-display-format: "{icon} {name}"; - location: 0; - disable-history: false; - hide-scrollbar: true; - display-drun: "  Apps "; - display-run: "  Run "; - display-window: " 﩯 Window"; - display-Network: " 󰤨 Network"; - sidebar-mode: true; -} - -@theme "latte" diff --git a/home/programs/rofi/default.nix b/home/programs/rofi/default.nix index b463f3c..20f07c5 100644 --- a/home/programs/rofi/default.nix +++ b/home/programs/rofi/default.nix @@ -1,27 +1,33 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { - xdg.configFile."rofi/config.rasi" = { - source = ./config.rasi; + catppuccin.rofi = { + enable = true; + flavor = "macchiato"; }; - xdg.configFile."rofi/macchiato.rasi" = { - source = - pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "rofi"; - rev = "5350da41a11814f950c3354f090b90d4674a95ce"; - sha256 = "DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY="; - } - + "/basic/.local/share/rofi/themes/catppuccin-macchiato.rasi"; - }; - xdg.configFile."rofi/latte.rasi" = { - source = - pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "rofi"; - rev = "5350da41a11814f950c3354f090b90d4674a95ce"; - sha256 = "DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY="; - } - + "/basic/.local/share/rofi/themes/catppuccin-latte.rasi"; + programs.rofi = { + enable = true; + terminal = "kitty"; + location = "center"; + font = "JetBrains Mono Nerd Font 12"; + plugins = [ + pkgs.rofi-emoji + pkgs.rofi-calc + ]; + extraConfig = { + modi = "drun,ssh,window,calc,emoji"; + matching = "fuzzy"; + show-icons = true; + icon-theme = "Oranchelo"; + drun-display-format = "{icon} {name}"; + hide-scrollbar = true; + disable-history = false; + display-drun = "Apps"; + display-ssh = "SSH"; + display-window = "Window"; + display-calc = "Calc"; + display-emoji = "Emoji"; + sidebar-mode = true; + }; }; } diff --git a/home/scripts/default.nix b/home/scripts/default.nix index 89d8ca8..149544c 100644 --- a/home/scripts/default.nix +++ b/home/scripts/default.nix @@ -7,10 +7,6 @@ source = ./hl-no-opacity.sh; executable = true; }; - home.file.".local/bin/rofi-launcher" = { - source = ./rofi-launcher.sh; - executable = true; - }; home.file.".local/bin/randomwp" = { source = ./randomwp.sh; executable = true; diff --git a/home/scripts/rofi-launcher.sh b/home/scripts/rofi-launcher.sh deleted file mode 100644 index 2fd2466..0000000 --- a/home/scripts/rofi-launcher.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -rofi \ - -show drun \ - -modi run,drun,ssh \ - -scroll-method 0 \ - -drun-match-fields all \ - -drun-display-format "{name}" \ - -terminal kitty