From 9c535a4a7e1af3d9d37a518de97c4b6eeb841abb Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Tue, 21 Nov 2023 17:01:21 +0000 Subject: [PATCH] Remove anyrun, back to rofi stylix theme back to using base16 tokyo-night-dark instead of custom defined version --- flake.lock | 43 -------------- flake.nix | 37 ++---------- home/default.nix | 1 + home/hyprland/anyrun/default.nix | 66 --------------------- home/hyprland/anyrun/pkgs/kidex/default.nix | 20 ------- home/hyprland/anyrun/style.css | 57 ------------------ home/hyprland/anyrun/websearch.ron | 4 -- home/hyprland/config.nix | 6 +- home/hyprland/default.nix | 8 +-- home/hyprland/rofi/default.nix | 9 +-- 10 files changed, 13 insertions(+), 238 deletions(-) delete mode 100644 home/hyprland/anyrun/default.nix delete mode 100644 home/hyprland/anyrun/pkgs/kidex/default.nix delete mode 100644 home/hyprland/anyrun/style.css delete mode 100644 home/hyprland/anyrun/websearch.ron diff --git a/flake.lock b/flake.lock index a901ce2d..25350c7e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "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": { "inputs": { "fromYaml": "fromYaml" @@ -167,27 +146,6 @@ "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": { "flake": false, "locked": { @@ -263,7 +221,6 @@ }, "root": { "inputs": { - "anyrun": "anyrun", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "stylix": "stylix" diff --git a/flake.nix b/flake.nix index 9771439c..ca14c44e 100644 --- a/flake.nix +++ b/flake.nix @@ -11,13 +11,9 @@ url = "github:danth/stylix"; 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 default = { hostName = "Atlas"; @@ -44,9 +40,7 @@ , systemModules ? default.systemModules, serviceModules ? [ ] , homeModules ? default.homeModules, stateVersion ? default.stateVersion }: - let - specialArgs = { inherit hostName user; }; - extraSpecialArgs = specialArgs // { inherit anyrun; }; + let specialArgs = { inherit hostName user; }; in nixpkgs.lib.nixosSystem { inherit system specialArgs; modules = [ @@ -118,31 +112,11 @@ lightdm.enable = true; }; image = ./wallpapers/tokyo-space.png; - base16Scheme = { - slug = "tokyonight"; - 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"; - }; + base16Scheme = + "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml"; polarity = "dark"; opacity = { - popups = 0.8; + popups = 0.5; terminal = 0.8; }; fonts = rec { @@ -201,7 +175,6 @@ }; }; home-manager = { - inherit extraSpecialArgs; useGlobalPkgs = true; useUserPackages = true; users = { diff --git a/home/default.nix b/home/default.nix index 2a354d08..1f3b3b5a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -5,6 +5,7 @@ avizo.enable = true; fzf.enable = true; mako.enable = true; + rofi.enable = true; tmux.enable = true; xresources.enable = true; }; diff --git a/home/hyprland/anyrun/default.nix b/home/hyprland/anyrun/default.nix deleted file mode 100644 index 20b83cb7..00000000 --- a/home/hyprland/anyrun/default.nix +++ /dev/null @@ -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 - ), - ], - ) - ''; -} diff --git a/home/hyprland/anyrun/pkgs/kidex/default.nix b/home/hyprland/anyrun/pkgs/kidex/default.nix deleted file mode 100644 index 70cfd4dc..00000000 --- a/home/hyprland/anyrun/pkgs/kidex/default.nix +++ /dev/null @@ -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"; - }; -} diff --git a/home/hyprland/anyrun/style.css b/home/hyprland/anyrun/style.css deleted file mode 100644 index 3e1c6a6f..00000000 --- a/home/hyprland/anyrun/style.css +++ /dev/null @@ -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; -} diff --git a/home/hyprland/anyrun/websearch.ron b/home/hyprland/anyrun/websearch.ron deleted file mode 100644 index 528b7b7b..00000000 --- a/home/hyprland/anyrun/websearch.ron +++ /dev/null @@ -1,4 +0,0 @@ -Config( - prefix: "!", - engines: [DuckDuckGo] -) diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix index e2df1f36..497975ad 100644 --- a/home/hyprland/config.nix +++ b/home/hyprland/config.nix @@ -89,11 +89,11 @@ in '' bind = SUPER SHIFT, X, exec, ${pkgs.mako}/bin/makoctl dismiss -a # Common program shortcuts - bind = SUPER, Space, exec, anyrun + bind = SUPER, Space, exec, rofi -replace -show combi bind = SUPER, Return, exec, alacritty # Misc useful binds - bind=,XF86Calculator,exec,anyrun + bind=,XF86Calculator,exec,rofi -replace -show calc # Sound bindl=,XF86AudioMute,exec,${pkgs.avizo}/bin/volumectl % @@ -121,7 +121,7 @@ in '' bind = SUPER SHIFT, J, movewindow, d # 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 = ignorealpha 0.3, $layers diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 2a804889..e1688286 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -2,13 +2,7 @@ { home.packages = with pkgs; [ discord teams-for-linux ]; - imports = [ - ./waybar/default.nix - ./anyrun/default.nix - ./rofi/default.nix - ./gtk.nix - ./mako.nix - ]; + imports = [ ./waybar/default.nix ./rofi/default.nix ./gtk.nix ./mako.nix ]; services = { avizo.enable = true; syncthing.enable = true; diff --git a/home/hyprland/rofi/default.nix b/home/hyprland/rofi/default.nix index 3d9e583f..e93c1b09 100644 --- a/home/hyprland/rofi/default.nix +++ b/home/hyprland/rofi/default.nix @@ -2,7 +2,6 @@ let icon-theme = config.gtk.iconTheme.name; power-menu = "power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu"; - in { programs.rofi = { enable = true; @@ -18,15 +17,15 @@ in { }; plugins = with pkgs; [ rofi-calc ]; extraConfig = { - modi = "window,run,drun,ssh,filebrowser,calc,${power-menu},combi"; - combi-modi = "window,drun,filebrowser,calc"; + modi = "window,run,drun,ssh,calc,${power-menu},combi"; + combi-modi = "window,drun,ssh,calc"; sidebar-mode = true; sort = true; sorting-method = "fzf"; matching = "fuzzy"; icon-theme = icon-theme; show-icons = true; - application-fallback-icon = "󰣆"; + application-fallback-icon = "󰋙"; drun-display-format = "{icon} {name} ({categories})"; disable-history = false; hide-scrollbar = true; @@ -34,10 +33,8 @@ in { display-run = " 󰅴 Run "; display-drun = " 󱓞 Launch "; display-ssh = " 󰢹 SSH "; - display-filebrowser = " 󰝰 Files "; display-calc = " 󰪚 Calculator "; display-combi = " 󰛡 Combi "; }; - theme = ./theme.rasi; }; }