From 45c7278dab44977bb9669902fe7130ca92b1626c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Fri, 15 Dec 2023 01:30:05 +0100 Subject: [PATCH] feat: migrate to anyrun --- desktops/hyprland/alacritty.nix | 17 -------- desktops/hyprland/fuzzel.nix | 25 ------------ desktops/hyprland/hyprland.nix | 72 +++++++++++++++++++++++++++++---- desktops/hyprland/wofi.nix | 41 ------------------- flake.lock | 49 ++++++++++++++++++++-- flake.nix | 12 +++++- packages.nix | 7 +++- programs/nixvim.nix | 13 +++--- 8 files changed, 135 insertions(+), 101 deletions(-) delete mode 100644 desktops/hyprland/alacritty.nix delete mode 100644 desktops/hyprland/fuzzel.nix delete mode 100644 desktops/hyprland/wofi.nix diff --git a/desktops/hyprland/alacritty.nix b/desktops/hyprland/alacritty.nix deleted file mode 100644 index f11a1e9..0000000 --- a/desktops/hyprland/alacritty.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - enable = true; - settings = { - shell = "fish"; - font = { - family = "JetBrainsMono NerdFont"; - size = 12; - }; - window = { - padding = { - x = 16; - y = 16; - }; - opacity = 0.8; - }; - }; -} diff --git a/desktops/hyprland/fuzzel.nix b/desktops/hyprland/fuzzel.nix deleted file mode 100644 index 0d5e854..0000000 --- a/desktops/hyprland/fuzzel.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - enable = true; - settings = { - main = { - font = "Lexend"; - terminal = "foot -e"; - prompt = ">> "; - layer = "overlay"; - }; - colors = { - background = "191c1ecc"; - text = "e1e2e5ff"; - selection = "41484dff"; - selection-text = "c0c7cdff"; - border = "41484dff"; - match = "79d0ffff"; - selection-match = "79d0ffff"; - }; - border = { - radius = 17; - width = 2; - }; - dmenu.exit-immediately-if-empty = "yes"; - }; -} diff --git a/desktops/hyprland/hyprland.nix b/desktops/hyprland/hyprland.nix index 1a9ffcc..8c4d470 100644 --- a/desktops/hyprland/hyprland.nix +++ b/desktops/hyprland/hyprland.nix @@ -51,8 +51,7 @@ bind = import ./keybinds.nix; bindm = import ./mousebinds.nix; bindr = [ - "SUPER,SUPER_L,exec,ags -t overview" - "SUPER,space,exec,(pkill fuzzel && hyprctl workspace previous) || (hyprctl workspace empty && fuzzel)" + "SUPER,SUPER_L,exec,pkill anyrun || anyrun" ]; monitor = import ./monitors.nix; workspace = [ @@ -93,9 +92,6 @@ "animation slide,class:^(gcr-prompter)$" ]; layerrule = [ - "noanim, .*" - "xray 1, .*" - "noanim, noanim" "blur, noanim" "blur, gtk-layer-shell" @@ -104,6 +100,8 @@ "ignorealpha 0.3, launcher" "blur, notifications" "ignorealpha 0.3, notifications" + "blur, anyrun" + "ignorealpha 0.3, anyrun" # ags "blur, bar" "ignorealpha 0.3, bar" @@ -151,9 +149,69 @@ enable = true; configDir = ./ags; }; - programs.fuzzel = import ./fuzzel.nix; programs.kitty = import ./kitty.nix {inherit pkgs;}; - programs.wofi = import ./wofi.nix; + programs.anyrun = { + enable = true; + config = { + plugins = with pkgs.anyrunPlugins; [ + applications + symbols + rink + dictionary + shell + ]; + y.fraction = 0.2; + showResultsImmediately = true; + closeOnClick = true; + }; + extraCss = + /* + css + */ + '' + * { + font-family: "Noto Sans NF"; + } + + window#window { + background: transparent; + } + + entry#entry, + list#main { + background: rgba(48, 52, 70, 0.4); + box-shadow: 0 0 15px rgba(0, 0, 0, 0.29); + } + + entry#entry, + list#main { + border-radius: 24px; + } + + row#match { + border-radius: 8px; + padding: 0 4px; + } + + row#plugin { + border-radius: 16px; + padding: 16px; + } + + entry#entry { + padding: 8px 24px; + margin-bottom: 16px; + } + + list#main { + padding: 8px; + } + + list#plugin { + background: transparent; + } + ''; + }; services.udiskie.enable = true; services.udiskie.tray = "never"; diff --git a/desktops/hyprland/wofi.nix b/desktops/hyprland/wofi.nix deleted file mode 100644 index b1f5768..0000000 --- a/desktops/hyprland/wofi.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - enable = true; - settings = {}; - style = '' - window { - margin: 5px; - border: 2px solid red; - background-color: red; - } - - #input { - margin: 5px; - border: 2px solid blue; - background-color: blue; - } - - #inner-box { - margin: 5px; - border: 2px solid yellow; - background-color: yellow; - } - - #outer-box { - margin: 5px; - border: 2px solid orange; - background-color: orange; - } - - #scroll { - margin: 5px; - border: 2px solid orange; - background-color: orange; - } - - #text { - margin: 5px; - border: 2px solid cyan; - background-color: cyan; - } - ''; -} diff --git a/flake.lock b/flake.lock index ebdf563..ff89a0d 100644 --- a/flake.lock +++ b/flake.lock @@ -18,6 +18,27 @@ "type": "github" } }, + "anyrun": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1701453400, + "narHash": "sha256-hI9+KBShsSfvWX7bmRa/1VI20WGat3lDXmbceMZzMS4=", + "owner": "Kirottu", + "repo": "anyrun", + "rev": "e14da6c37337ffa3ee1bc66965d58ef64c1590e5", + "type": "github" + }, + "original": { + "owner": "Kirottu", + "repo": "anyrun", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -34,6 +55,27 @@ "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" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -146,11 +188,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1701718080, - "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -210,6 +252,7 @@ "root": { "inputs": { "ags": "ags", + "anyrun": "anyrun", "home-manager": "home-manager", "nixpkgs": "nixpkgs_2", "nixvim": "nixvim" diff --git a/flake.nix b/flake.nix index 512264b..eea03de 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,11 @@ url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; + + anyrun = { + url = "github:Kirottu/anyrun"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { @@ -22,6 +27,7 @@ home-manager, ags, nixvim, + anyrun, ... }: let username = "theaninova"; @@ -31,6 +37,9 @@ pkgs = import nixpkgs { inherit system; config.allowUnfree = true; + overlays = [ + (final: prev: {anyrunPlugins = anyrun.packages.${prev.system};}) + ]; }; homeDirPrefix = @@ -48,8 +57,9 @@ modules = [ ags.homeManagerModules.default - home nixvim.homeManagerModules.nixvim + anyrun.homeManagerModules.default + home ]; }; }; diff --git a/packages.nix b/packages.nix index 2ef0ca8..db0d2de 100644 --- a/packages.nix +++ b/packages.nix @@ -14,7 +14,7 @@ with pkgs; [ # media jellyfin-media-player - youtube-music + # youtube-music.override {electron = pkgs.electron_28;}) vlc makemkv handbrake @@ -27,7 +27,8 @@ with pkgs; [ withOpenASAR = true; withVencord = false; }) - element-desktop + (vesktop.override {electron = pkgs.electron_28;}) + (element-desktop.override {electron = pkgs.electron_28;}) slack # office @@ -66,4 +67,6 @@ with pkgs; [ lazydocker libqalculate ripgrep + jq + httpie ] diff --git a/programs/nixvim.nix b/programs/nixvim.nix index 9fce88e..c173d49 100644 --- a/programs/nixvim.nix +++ b/programs/nixvim.nix @@ -5,7 +5,8 @@ nodejs = pkgs.nodejs_18; }) ."@angular/language-server"; - tree-sitter-angular = pkgs.tree-sitter.buildGrammar { + /* + *tree-sitter-angular = pkgs.tree-sitter.buildGrammar { language = "angular"; version = "624ff10"; src = pkgs.fetchFromGitHub { @@ -15,6 +16,7 @@ hash = "sha256-wAbkrJ0MmNhE3qb34DQiju/mFIb7YCTyBUgVmP+iWQs="; }; }; + */ darkman = pkgs.vimUtils.buildVimPlugin { name = "darkman"; src = pkgs.buildGoModule rec { @@ -164,6 +166,7 @@ in { extraConfigLua = '' require("darkman").setup() require("cmp-npm").setup({}) + require("rest-nvim").setup({}) local signs = { { name = "DiagnosticSignError", text = "" }, @@ -406,9 +409,7 @@ in { treesitter = { enable = true; indent = true; - grammarPackages = - pkgs.vimPlugins.nvim-treesitter.allGrammars - ++ [tree-sitter-angular]; + grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars; nixvimInjections = true; }; @@ -568,11 +569,13 @@ in { nix.enable = true; }; - extraPackages = [angular-ls pkgs.nodePackages.typescript-language-server pkgs.nodePackages.stylelint]; + extraPackages = [angular-ls pkgs.nodePackages.typescript-language-server pkgs.nodePackages.stylelint pkgs.jq pkgs.html-tidy]; extraPlugins = with pkgs.vimPlugins; [ vim-startuptime vim-mergetool lualine-so-fancy darkman + rest-nvim + plenary-nvim ]; }