Remove anyrun, back to rofi

stylix theme back to using base16 tokyo-night-dark instead of custom
defined version
This commit is contained in:
Evie Litherland-Smith 2023-11-21 17:01:21 +00:00
parent f5d128ab05
commit 9c535a4a7e
10 changed files with 13 additions and 238 deletions

View file

@ -1,26 +1,5 @@
{ {
"nodes": { "nodes": {
"anyrun": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1696926085,
"narHash": "sha256-PuaKdM4Nems/wQ2B+K7hI2UJYld/+64NdkcsYD1YJwM=",
"owner": "Kirottu",
"repo": "anyrun",
"rev": "f9073a6184f61a07bb584ecc47fbb8eb997e9216",
"type": "github"
},
"original": {
"owner": "Kirottu",
"repo": "anyrun",
"type": "github"
}
},
"base16": { "base16": {
"inputs": { "inputs": {
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
@ -167,27 +146,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"anyrun",
"nixpkgs"
]
},
"locked": {
"lastModified": 1696343447,
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -263,7 +221,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"anyrun": "anyrun",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"stylix": "stylix" "stylix": "stylix"

View file

@ -11,13 +11,9 @@
url = "github:danth/stylix"; url = "github:danth/stylix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
anyrun = {
url = "github:Kirottu/anyrun";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { nixpkgs, home-manager, stylix, anyrun, ... }: outputs = { nixpkgs, home-manager, stylix, ... }:
let let
default = { default = {
hostName = "Atlas"; hostName = "Atlas";
@ -44,9 +40,7 @@
, systemModules ? default.systemModules, serviceModules ? [ ] , systemModules ? default.systemModules, serviceModules ? [ ]
, homeModules ? default.homeModules, stateVersion ? default.stateVersion , homeModules ? default.homeModules, stateVersion ? default.stateVersion
}: }:
let let specialArgs = { inherit hostName user; };
specialArgs = { inherit hostName user; };
extraSpecialArgs = specialArgs // { inherit anyrun; };
in nixpkgs.lib.nixosSystem { in nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system specialArgs;
modules = [ modules = [
@ -118,31 +112,11 @@
lightdm.enable = true; lightdm.enable = true;
}; };
image = ./wallpapers/tokyo-space.png; image = ./wallpapers/tokyo-space.png;
base16Scheme = { base16Scheme =
slug = "tokyonight"; "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
scheme =
"My implementation of TokyoNight theme for Sublime, by Enkia";
author = "xenia";
base00 = "15161e";
base01 = "f7768e";
base02 = "9ece6a";
base03 = "e0af68";
base04 = "7aa2f7";
base05 = "bb9af7";
base06 = "7dcfff";
base07 = "a9b1d6";
base08 = "414868";
base09 = "f7768e";
base0A = "9ece6a";
base0B = "e0af68";
base0C = "7aa2f7";
base0D = "bb9af7";
base0E = "7dcfff";
base0F = "c0caf5";
};
polarity = "dark"; polarity = "dark";
opacity = { opacity = {
popups = 0.8; popups = 0.5;
terminal = 0.8; terminal = 0.8;
}; };
fonts = rec { fonts = rec {
@ -201,7 +175,6 @@
}; };
}; };
home-manager = { home-manager = {
inherit extraSpecialArgs;
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users = { users = {

View file

@ -5,6 +5,7 @@
avizo.enable = true; avizo.enable = true;
fzf.enable = true; fzf.enable = true;
mako.enable = true; mako.enable = true;
rofi.enable = true;
tmux.enable = true; tmux.enable = true;
xresources.enable = true; xresources.enable = true;
}; };

View file

@ -1,66 +0,0 @@
{ config, pkgs, anyrun, ... }: {
imports = [ anyrun.homeManagerModules.default ];
home.packages = with pkgs; [
rink
(pkgs.callPackage ./pkgs/kidex/default.nix { })
];
programs.anyrun = {
enable = true;
config = {
plugins = with anyrun.packages.${pkgs.system}; [
applications
dictionary
kidex
randr
rink
shell
symbols
translate
websearch
];
width.fraction = 0.3;
y.absolute = 15;
hidePluginInfo = true;
closeOnClick = true;
};
extraCss = builtins.readFile ./style.css;
extraConfigFiles."websearch.ron".source = ./websearch.ron;
};
xdg.configFile."kidex.ron".text = with config.home; ''
Config(
ignored: [".git*"], // A list of patterns to be ignored in all directories
directories: [
WatchDir(
path: "${homeDirectory}/Documents", // The root folder to be indexed
recurse: true, // Recursively index and watch all subfolders
ignored: [], // Ignore patterns specifically for this directory
),
WatchDir(
path: "${homeDirectory}/Desktop", // The root folder to be indexed
recurse: true, // Recursively index and watch all subfolders
ignored: [], // Ignore patterns specifically for this directory
),
WatchDir(
path: "${homeDirectory}/Downloads", // The root folder to be indexed
recurse: true, // Recursively index and watch all subfolders
ignored: [], // Ignore patterns specifically for this directory
),
WatchDir(
path: "${homeDirectory}/Projects", // The root folder to be indexed
recurse: true, // Recursively index and watch all subfolders
ignored: [], // Ignore patterns specifically for this directory
),
WatchDir(
path: "${homeDirectory}/Org", // The root folder to be indexed
recurse: true, // Recursively index and watch all subfolders
ignored: [], // Ignore patterns specifically for this directory
),
WatchDir(
path: "${homeDirectory}/References", // The root folder to be indexed
recurse: true, // Recursively index and watch all subfolders
ignored: [], // Ignore patterns specifically for this directory
),
],
)
'';
}

View file

@ -1,20 +0,0 @@
{ lib, fetchFromGitHub, rustPlatform, ... }:
rustPlatform.buildRustPackage rec {
pname = "kidex";
version = "0.1.1";
src = fetchFromGitHub {
owner = "Kirottu";
repo = pname;
rev = "d1aad240eb0bac7f017183fc80b0dc41f49a98d3";
sha256 = "LgY4hYJOzGSNZxOK1O4L6A+4/qgv4dhouKo0nLKK25A=";
};
cargoSha256 = "BkpiJZZ83RrSSmbxM/TBl8rx5wIxLwYDZvFWdTwlUSI=";
meta = {
description = "A simple file indexing service";
homepage = "https://github.com/Kirottu/kidex";
};
}

View file

@ -1,57 +0,0 @@
* {
all: unset;
font-family: "Fira Sans";
font-size: 14px;
}
#window,
#match,
#entry,
#plugin,
#main {
background: transparent;
border: 1px solid transparent;
color: #c0caf5;
}
#match.activatable {
border-radius: 10px;
padding: .3rem .9rem;
margin-top: .01rem;
}
#match.activatable:first-child { margin-top: .7rem; }
#match.activatable:last-child { margin-bottom: .6rem; }
#plugin:hover #match.activatable {
border-radius: 10px;
padding: .3rem;
margin-top: .01rem;
margin-bottom: 0;
}
#match:hover, #plugin:hover { border: 1px solid #414868; }
#match:selected { border: 1px solid #bb9af7; }
#entry {
background: alpha(#1a1b26, .05);
border: 1px solid #414868;
border-radius: 10px;
margin: .3rem;
padding: .3rem 1rem;
}
list > #plugin {
border-radius: 10px;
margin: 0 .3rem;
}
list > #plugin:first-child { margin-top: .3rem; }
list > #plugin:last-child { margin-bottom: .3rem; }
list > #plugin:hover { padding: .6rem; }
box#main {
background: alpha(#1a1b26, .5);
box-shadow: inset 0 0 0 1px alpha(#bb9af7, .1), 0 0 0 1px alpha(#1a1b26, .5);
border-radius: 10px;
padding: .3rem;
}

View file

@ -1,4 +0,0 @@
Config(
prefix: "!",
engines: [DuckDuckGo]
)

View file

@ -89,11 +89,11 @@ in ''
bind = SUPER SHIFT, X, exec, ${pkgs.mako}/bin/makoctl dismiss -a bind = SUPER SHIFT, X, exec, ${pkgs.mako}/bin/makoctl dismiss -a
# Common program shortcuts # Common program shortcuts
bind = SUPER, Space, exec, anyrun bind = SUPER, Space, exec, rofi -replace -show combi
bind = SUPER, Return, exec, alacritty bind = SUPER, Return, exec, alacritty
# Misc useful binds # Misc useful binds
bind=,XF86Calculator,exec,anyrun bind=,XF86Calculator,exec,rofi -replace -show calc
# Sound # Sound
bindl=,XF86AudioMute,exec,${pkgs.avizo}/bin/volumectl % bindl=,XF86AudioMute,exec,${pkgs.avizo}/bin/volumectl %
@ -121,7 +121,7 @@ in ''
bind = SUPER SHIFT, J, movewindow, d bind = SUPER SHIFT, J, movewindow, d
# Layer rules # Layer rules
$layers = ^(waybar|system-menu|rofi|anyrun|gtk-layer-shell|notifications)$ $layers = ^(waybar|system-menu|rofi|gtk-layer-shell|notifications)$
layerrule = blur, $layers layerrule = blur, $layers
layerrule = ignorealpha 0.3, $layers layerrule = ignorealpha 0.3, $layers

View file

@ -2,13 +2,7 @@
{ {
home.packages = with pkgs; [ discord teams-for-linux ]; home.packages = with pkgs; [ discord teams-for-linux ];
imports = [ imports = [ ./waybar/default.nix ./rofi/default.nix ./gtk.nix ./mako.nix ];
./waybar/default.nix
./anyrun/default.nix
./rofi/default.nix
./gtk.nix
./mako.nix
];
services = { services = {
avizo.enable = true; avizo.enable = true;
syncthing.enable = true; syncthing.enable = true;

View file

@ -2,7 +2,6 @@
let let
icon-theme = config.gtk.iconTheme.name; icon-theme = config.gtk.iconTheme.name;
power-menu = "power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu"; power-menu = "power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu";
in { in {
programs.rofi = { programs.rofi = {
enable = true; enable = true;
@ -18,15 +17,15 @@ in {
}; };
plugins = with pkgs; [ rofi-calc ]; plugins = with pkgs; [ rofi-calc ];
extraConfig = { extraConfig = {
modi = "window,run,drun,ssh,filebrowser,calc,${power-menu},combi"; modi = "window,run,drun,ssh,calc,${power-menu},combi";
combi-modi = "window,drun,filebrowser,calc"; combi-modi = "window,drun,ssh,calc";
sidebar-mode = true; sidebar-mode = true;
sort = true; sort = true;
sorting-method = "fzf"; sorting-method = "fzf";
matching = "fuzzy"; matching = "fuzzy";
icon-theme = icon-theme; icon-theme = icon-theme;
show-icons = true; show-icons = true;
application-fallback-icon = "󰣆"; application-fallback-icon = "󰋙";
drun-display-format = "{icon} {name} ({categories})"; drun-display-format = "{icon} {name} ({categories})";
disable-history = false; disable-history = false;
hide-scrollbar = true; hide-scrollbar = true;
@ -34,10 +33,8 @@ in {
display-run = " 󰅴 Run "; display-run = " 󰅴 Run ";
display-drun = " 󱓞 Launch "; display-drun = " 󱓞 Launch ";
display-ssh = " 󰢹 SSH "; display-ssh = " 󰢹 SSH ";
display-filebrowser = " 󰝰 Files ";
display-calc = " 󰪚 Calculator "; display-calc = " 󰪚 Calculator ";
display-combi = " 󰛡 Combi "; display-combi = " 󰛡 Combi ";
}; };
theme = ./theme.rasi;
}; };
} }