rofi: switch to home-manager options with catppuccin macchiato theme
Replace manual xdg.configFile symlinks and fetchFromGitHub theme fetching with programs.rofi options and the catppuccin/nix flake module. Also removes unused pywal module from magicman. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
53
flake.lock
generated
53
flake.lock
generated
@@ -1,5 +1,23 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"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": {
|
"ghettoptt": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -28,11 +46,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772569491,
|
"lastModified": 1772516620,
|
||||||
"narHash": "sha256-bdr6ueeXO1Xg91sFkuvaysYF0mVdwHBpdyhTjBEWv+s=",
|
"narHash": "sha256-2r4cKdqCVlQkvcTcLUMxmsmAYZZxCMd//w/PnDnukTE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "924e61f5c2aeab38504028078d7091077744ab17",
|
"rev": "2b9504d5a0169d4940a312abe2df2c5658db8de9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -109,15 +127,15 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772542754,
|
"lastModified": 1771848320,
|
||||||
"narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=",
|
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
|
||||||
"owner": "nixos",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4",
|
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
@@ -139,6 +157,22 @@
|
|||||||
"type": "github"
|
"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": {
|
"nixprstatus": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -265,12 +299,13 @@
|
|||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"catppuccin": "catppuccin",
|
||||||
"ghettoptt": "ghettoptt",
|
"ghettoptt": "ghettoptt",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"huecli": "huecli",
|
"huecli": "huecli",
|
||||||
"natstonotify": "natstonotify",
|
"natstonotify": "natstonotify",
|
||||||
"nix-packages": "nix-packages",
|
"nix-packages": "nix-packages",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"nixprstatus": "nixprstatus",
|
"nixprstatus": "nixprstatus",
|
||||||
"sops-nix": "sops-nix"
|
"sops-nix": "sops-nix"
|
||||||
|
|||||||
@@ -32,6 +32,9 @@
|
|||||||
url = "git+https://git.t-juice.club/torjus/natstonotify?ref=master";
|
url = "git+https://git.t-juice.club/torjus/natstonotify?ref=master";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
catppuccin = {
|
||||||
|
url = "github:catppuccin/nix";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
@@ -45,6 +48,7 @@
|
|||||||
huecli,
|
huecli,
|
||||||
natstonotify,
|
natstonotify,
|
||||||
nix-packages,
|
nix-packages,
|
||||||
|
catppuccin,
|
||||||
...
|
...
|
||||||
}@inputs:
|
}@inputs:
|
||||||
let
|
let
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
inputs.sops-nix.homeManagerModules.sops
|
inputs.sops-nix.homeManagerModules.sops
|
||||||
|
inputs.catppuccin.homeModules.catppuccin
|
||||||
../../editor/neovim
|
../../editor/neovim
|
||||||
../../hyprland
|
../../hyprland
|
||||||
../../packages
|
../../packages
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
inputs.sops-nix.homeManagerModules.sops
|
inputs.sops-nix.homeManagerModules.sops
|
||||||
|
inputs.catppuccin.homeModules.catppuccin
|
||||||
../../sops
|
../../sops
|
||||||
../../services/labmcp.nix
|
../../services/labmcp.nix
|
||||||
../../editor/neovim
|
../../editor/neovim
|
||||||
@@ -28,7 +29,6 @@
|
|||||||
../../programs/rofi
|
../../programs/rofi
|
||||||
../../programs/obs-studio
|
../../programs/obs-studio
|
||||||
../../programs/vscode
|
../../programs/vscode
|
||||||
../../programs/pywal
|
|
||||||
../../scripts
|
../../scripts
|
||||||
../../scripts/batlvl.nix
|
../../scripts/batlvl.nix
|
||||||
../../zsh
|
../../zsh
|
||||||
|
|||||||
@@ -73,7 +73,6 @@ in
|
|||||||
[
|
[
|
||||||
dunst
|
dunst
|
||||||
hyprpaper
|
hyprpaper
|
||||||
rofi
|
|
||||||
slurp
|
slurp
|
||||||
swww
|
swww
|
||||||
waybar
|
waybar
|
||||||
@@ -261,8 +260,9 @@ in
|
|||||||
# term
|
# term
|
||||||
"$mainMod,Return,exec,$term"
|
"$mainMod,Return,exec,$term"
|
||||||
# rofi
|
# rofi
|
||||||
"$mainMod,D,exec,rofi-launcher"
|
"$mainMod,D,exec,rofi -show drun"
|
||||||
"$mainMod,P,exec,rofi-rbw"
|
"$mainMod,P,exec,rofi-rbw"
|
||||||
|
"$mainMod,E,exec,rofi -show emoji"
|
||||||
# hyprlock
|
# hyprlock
|
||||||
"$shiftMainMod,l,exec,${pkgs.hyprlock}/bin/hyprlock"
|
"$shiftMainMod,l,exec,${pkgs.hyprlock}/bin/hyprlock"
|
||||||
# hyprland
|
# hyprland
|
||||||
|
|||||||
@@ -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"
|
|
||||||
@@ -1,27 +1,33 @@
|
|||||||
{ config, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
xdg.configFile."rofi/config.rasi" = {
|
catppuccin.rofi = {
|
||||||
source = ./config.rasi;
|
enable = true;
|
||||||
|
flavor = "macchiato";
|
||||||
};
|
};
|
||||||
|
|
||||||
xdg.configFile."rofi/macchiato.rasi" = {
|
programs.rofi = {
|
||||||
source =
|
enable = true;
|
||||||
pkgs.fetchFromGitHub {
|
terminal = "kitty";
|
||||||
owner = "catppuccin";
|
location = "center";
|
||||||
repo = "rofi";
|
font = "JetBrains Mono Nerd Font 12";
|
||||||
rev = "5350da41a11814f950c3354f090b90d4674a95ce";
|
plugins = [
|
||||||
sha256 = "DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY=";
|
pkgs.rofi-emoji
|
||||||
}
|
pkgs.rofi-calc
|
||||||
+ "/basic/.local/share/rofi/themes/catppuccin-macchiato.rasi";
|
];
|
||||||
|
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;
|
||||||
};
|
};
|
||||||
xdg.configFile."rofi/latte.rasi" = {
|
|
||||||
source =
|
|
||||||
pkgs.fetchFromGitHub {
|
|
||||||
owner = "catppuccin";
|
|
||||||
repo = "rofi";
|
|
||||||
rev = "5350da41a11814f950c3354f090b90d4674a95ce";
|
|
||||||
sha256 = "DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY=";
|
|
||||||
}
|
|
||||||
+ "/basic/.local/share/rofi/themes/catppuccin-latte.rasi";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,10 +7,6 @@
|
|||||||
source = ./hl-no-opacity.sh;
|
source = ./hl-no-opacity.sh;
|
||||||
executable = true;
|
executable = true;
|
||||||
};
|
};
|
||||||
home.file.".local/bin/rofi-launcher" = {
|
|
||||||
source = ./rofi-launcher.sh;
|
|
||||||
executable = true;
|
|
||||||
};
|
|
||||||
home.file.".local/bin/randomwp" = {
|
home.file.".local/bin/randomwp" = {
|
||||||
source = ./randomwp.sh;
|
source = ./randomwp.sh;
|
||||||
executable = true;
|
executable = true;
|
||||||
|
|||||||
@@ -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
|
|
||||||
Reference in New Issue
Block a user