From b4c1b4836ee0d58f6ea420bdcfd19ca349d7501b Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 13 Feb 2023 00:54:29 +0100 Subject: [PATCH] feat: switch to private NUR repo, fix minor annoyances --- flake.lock | 132 +++++++++++++++--- flake.nix | 22 ++- home.nix | 24 +--- modules/firefox.nix | 3 +- modules/i3.nix | 7 - modules/music.nix | 4 +- modules/neovim.nix | 4 +- modules/rice.nix | 9 +- modules/vscode.nix | 2 +- modules/wezterm.nix | 2 + modules/zsh.nix | 11 +- packages/cura/default.nix | 13 -- packages/default.nix | 22 --- .../default.nix | 27 ---- packages/emmet-ls/default.nix | 24 ---- packages/helm-ls/default.nix | 26 ---- packages/jq-lsp/default.nix | 26 ---- packages/librewolf/default.nix | 32 ----- packages/mopidy-podcast-itunes/default.nix | 35 ----- packages/org-stats/default.nix | 26 ---- .../papirus-folders-catppuccin/default.nix | 54 ------- .../catppuccin-catwalk/default.nix | 26 ---- .../discover-overlay/default.nix | 28 ---- .../default.nix | 19 --- 24 files changed, 156 insertions(+), 422 deletions(-) delete mode 100644 packages/cura/default.nix delete mode 100644 packages/default.nix delete mode 100644 packages/discord-applemusic-rich-presence/default.nix delete mode 100644 packages/emmet-ls/default.nix delete mode 100644 packages/helm-ls/default.nix delete mode 100644 packages/jq-lsp/default.nix delete mode 100644 packages/librewolf/default.nix delete mode 100644 packages/mopidy-podcast-itunes/default.nix delete mode 100644 packages/org-stats/default.nix delete mode 100644 packages/papirus-folders-catppuccin/default.nix delete mode 100644 packages/python3Packages/catppuccin-catwalk/default.nix delete mode 100644 packages/python3Packages/discover-overlay/default.nix delete mode 100644 packages/vscode-extensions.ms-kubernetes-tools.vscode-kubernetes-tools/default.nix diff --git a/flake.lock b/flake.lock index af13aee..df03202 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,24 @@ { "nodes": { + "catppuccin-toolbox": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1674285238, + "narHash": "sha256-Rpop0YFk7fpsTL8QdCMq7EB8uc5eRTdHGH8yo0sAvFU=", + "owner": "catppuccin", + "repo": "toolbox", + "rev": "bbd81b470c28defdddd958dd3860b59ae7d81739", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "toolbox", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -66,6 +85,21 @@ "type": "github" } }, + "flake-utils_3": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -111,16 +145,16 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1676198317, - "narHash": "sha256-i5Er/KA5E9CNxs4XFdwJEOsiCyXS3X3KKuu04gRSJD4=", + "lastModified": 1676240687, + "narHash": "sha256-Qzgd87UF64k4Es8SFY/IOKDGKD1DlFT60+TAke8qV7Q=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "7d914cd427b36d5ec8acb06e415cdf2b846f1648", + "rev": "6b7e409f05536e45baa3dabeab0df77d05c9a96f", "type": "github" }, "original": { @@ -150,13 +184,31 @@ "type": "github" } }, + "nekowinston-nur": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1676244754, + "narHash": "sha256-yKvki56vvWhECehFPMCiJ3o7S+NIRD2Iw83kdR2ncRM=", + "owner": "nekowinston", + "repo": "nur", + "rev": "a006d09d76648eaf708751ccf255fd7702e94916", + "type": "github" + }, + "original": { + "owner": "nekowinston", + "repo": "nur", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1675273418, - "narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=", + "lastModified": 1673631141, + "narHash": "sha256-AprpYQ5JvLS4wQG/ghm2UriZ9QZXvAwh1HlgA/6ZEVQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db", + "rev": "befc83905c965adfd33e5cae49acb0351f6e0404", "type": "github" }, "original": { @@ -216,11 +268,43 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1676094287, - "narHash": "sha256-z2gc84Hs9JmzmSmQ/n3Ano/uhYPS4uF8jZPcgKDTfb8=", + "lastModified": 1675273418, + "narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1675940568, + "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1676177817, + "narHash": "sha256-OQnBnuKkpwkfNY31xQyfU5hNpLs1ilWt+hVY6ztEEOM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "103fe0800b9d739c279997561c9da9d242d5b6b8", + "rev": "1b82144edfcd0c86486d2e07c7298f85510e7fb8", "type": "github" }, "original": { @@ -230,7 +314,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_5": { "locked": { "lastModified": 1671271357, "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", @@ -246,7 +330,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1675940568, "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", @@ -264,11 +348,11 @@ }, "nur": { "locked": { - "lastModified": 1676202295, - "narHash": "sha256-pK1zMjK4ZjIIeJxAety+WqTBHQd7GGLpQcIq892W2H8=", + "lastModified": 1676231165, + "narHash": "sha256-hlQS8XRucFsOAvBTotYn9a74hGka8ai6B/atARmcVoE=", "owner": "nix-community", "repo": "NUR", - "rev": "56b003d44a26603aedcaa3c28b0da17797d0df1c", + "rev": "cf674ae770218559b0ed9a98e36663b0858fb02f", "type": "github" }, "original": { @@ -280,17 +364,17 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1675688762, - "narHash": "sha256-oit/SxMk0B380ASuztBGQLe8TttO1GJiXF8aZY9AYEc=", + "lastModified": 1676233402, + "narHash": "sha256-43JNeMD1g4skb5xhq4w6atlIHe7Fb0UOgVNSsif1RVU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ab608394886fb04b8a5df3cb0bab2598400e3634", + "rev": "15f2da96967d4c828ae678af50f75214372fd3ce", "type": "github" }, "original": { @@ -301,11 +385,13 @@ }, "root": { "inputs": { + "catppuccin-toolbox": "catppuccin-toolbox", "darwin": "darwin", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_2", + "nekowinston-nur": "nekowinston-nur", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "pre-commit-hooks": "pre-commit-hooks", @@ -314,7 +400,7 @@ }, "sops": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { diff --git a/flake.nix b/flake.nix index 005a177..aba22d5 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nur.url = "github:nix-community/NUR"; + nekowinston-nur.url = "github:nekowinston/nur"; + catppuccin-toolbox.url = "github:catppuccin/toolbox"; sops.url = "github:Mic92/sops-nix"; # dev @@ -26,10 +28,12 @@ outputs = { self, + catppuccin-toolbox, darwin, flake-utils, home-manager, hyprland, + nekowinston-nur, nixpkgs, nixpkgs-unstable, nur, @@ -42,6 +46,11 @@ system = prev.system; config.allowUnfree = true; }; + nur = import nur { + nurpkgs = prev; + pkgs = prev; + repoOverrides = {nekowinston = import nekowinston-nur {pkgs = prev;};}; + }; }; in { @@ -56,14 +65,19 @@ config = { nixpkgs.overlays = [ overlay-unstable - (import ./packages/default.nix) ]; nixpkgs.config.allowUnfree = true; home-manager = { useGlobalPkgs = true; - users.winston.imports = [./home.nix]; + users.winston.imports = [ + ./home.nix + { + home.packages = [ + catppuccin-toolbox.packages.${system}.catwalk + ]; + } + ]; extraSpecialArgs = { - nur = nur.nixosModules.nur; sops = sops.homeManagerModules.sops; hyprland = hyprland.homeManagerModules.default; flakePath = "/home/winston/.config/nixpkgs"; @@ -88,14 +102,12 @@ config = { nixpkgs.overlays = [ overlay-unstable - (import ./packages/default.nix) ]; nixpkgs.config.allowUnfree = true; home-manager = { useGlobalPkgs = true; users.winston.imports = [./home.nix]; extraSpecialArgs = { - nur = nur.nixosModules.nur; sops = sops.homeManagerModules.sops; flakePath = "/Users/winston/.config/nixpkgs"; machine.personal = true; diff --git a/home.nix b/home.nix index 84bb246..a4973fe 100644 --- a/home.nix +++ b/home.nix @@ -1,7 +1,6 @@ { config, lib, - nur, pkgs, sops, machine, @@ -14,7 +13,6 @@ in { imports = [ hyprland - nur sops ./catppuccin ./modules/firefox.nix @@ -61,8 +59,7 @@ in { rustc gh - org-stats - catppuccin-catwalk + nur.repos.nekowinston.org-stats (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) unstable.wezterm ] @@ -75,30 +72,23 @@ in { mattermost-desktop ] ++ lib.optionals (isLinux && machine.personal) [ - discover-overlay + nur.repos.nekowinston.discover-overlay (unstable.discord.override {withOpenASAR = true;}) lutris ]); sessionVariables = { - TERMINAL = "wezterm"; - LESSHISTFILE = "-"; - CARGO_HOME = "${config.xdg.dataHome}/cargo"; NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc"; RUSTUP_HOME = "${config.xdg.dataHome}/rustup"; PATH = "$PATH:${config.xdg.dataHome}/krew/bin:$GOPATH/bin"; } - // ( - if isDarwin - then { - # https://github.com/NixOS/nix/issues/2033 - NIX_PATH = "$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/root/channels\${NIX_PATH:+:$NIX_PATH}"; - SSH_AUTH_SOCK = "${config.xdg.configHome}/gnupg/S.gpg-agent.ssh"; - } - else {} - ); + // lib.mkIf isDarwin { + # https://github.com/NixOS/nix/issues/2033 + NIX_PATH = "$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/root/channels\${NIX_PATH:+:$NIX_PATH}"; + SSH_AUTH_SOCK = "${config.xdg.configHome}/gnupg/S.gpg-agent.ssh"; + }; stateVersion = "22.11"; }; diff --git a/modules/firefox.nix b/modules/firefox.nix index 541894e..da7b62a 100644 --- a/modules/firefox.nix +++ b/modules/firefox.nix @@ -17,7 +17,7 @@ in { profiles.default = { search.default = "DuckDuckGo"; search.force = true; - extensions = with config.nur.repos.rycee.firefox-addons; [ + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ clearurls darkreader decentraleyes @@ -76,7 +76,6 @@ in { "device.sensors.orientation.enabled" = false; "device.sensors.proximity.enabled" = false; "dom.battery.enabled" = false; - "dom.event.clipboardevents.enabled" = false; "dom.security.https_only_mode" = true; "dom.security.https_only_mode_ever_enabled" = true; "dom.webaudio.enabled" = false; diff --git a/modules/i3.nix b/modules/i3.nix index 836b0db..10b8848 100644 --- a/modules/i3.nix +++ b/modules/i3.nix @@ -382,11 +382,4 @@ in { ''; }; }; - - # xdg = lib.mkIf isLinux { - # configFile."i3" = { - # source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/i3"; - # recursive = true; - # }; - # }; } diff --git a/modules/music.nix b/modules/music.nix index d5c25f8..aa55a74 100644 --- a/modules/music.nix +++ b/modules/music.nix @@ -85,12 +85,12 @@ in { }; }; - home.packages = lib.mkIf isDarwin [pkgs.discord-applemusic-rich-presence]; + home.packages = lib.mkIf isDarwin [pkgs.nur.repos.nekowinston.discord-applemusic-rich-presence]; launchd.agents.discord-applemusic-rich-presence = { enable = true; config = { - ProgramArguments = ["${lib.getExe pkgs.discord-applemusic-rich-presence}"]; + ProgramArguments = ["${lib.getExe pkgs.nur.repos.nekowinston.discord-applemusic-rich-presence}"]; KeepAlive = true; RunAtLoad = true; StandardErrorPath = "${config.home.homeDirectory}/.cache/discord-applemusic-rich-presence.log"; diff --git a/modules/neovim.nix b/modules/neovim.nix index a66c300..2f68865 100644 --- a/modules/neovim.nix +++ b/modules/neovim.nix @@ -63,8 +63,8 @@ tree-sitter alejandra deadnix - jq-lsp - helm-ls + nur.repos.nekowinston.jq-lsp + nur.repos.nekowinston.helm-ls # needed for some plugin build steps cargo diff --git a/modules/rice.nix b/modules/rice.nix index f8f35e5..7aefcbf 100644 --- a/modules/rice.nix +++ b/modules/rice.nix @@ -10,10 +10,10 @@ in { cursorTheme = { name = "Catppuccin-Mocha-Cursors"; - package = pkgs.catppuccin-cursors.mochaPink; + package = pkgs.unstable.catppuccin-cursors.mochaPink; }; iconTheme = { - package = pkgs.papirus-folders-catppuccin.override { + package = pkgs.nur.repos.nekowinston.papirus-folders-catppuccin.override { flavour = "mocha"; accent = "pink"; }; @@ -21,7 +21,10 @@ in { }; theme = { name = "Catppuccin-Mocha-Standard-Pink-Dark"; - package = pkgs.unstable.catppuccin-gtk; + package = pkgs.unstable.catppuccin-gtk.override { + accents = ["pink"]; + variant = "mocha"; + }; }; gtk2.extraConfig = '' diff --git a/modules/vscode.nix b/modules/vscode.nix index f3ef334..d844eba 100644 --- a/modules/vscode.nix +++ b/modules/vscode.nix @@ -11,7 +11,7 @@ in { programs.vscode = { enable = true; extensions = with pkgs.vscode-extensions; [ - (pkgs.callPackage ../packages/vscode-extensions.ms-kubernetes-tools.vscode-kubernetes-tools {}) + pkgs.nur.repos.nekowinston.vscode-extensions.ms-kubernetes-tools.vscode-kubernetes-tools pkief.material-icon-theme redhat.vscode-yaml valentjn.vscode-ltex diff --git a/modules/wezterm.nix b/modules/wezterm.nix index efcea87..cb87801 100644 --- a/modules/wezterm.nix +++ b/modules/wezterm.nix @@ -3,6 +3,8 @@ flakePath, ... }: { + home.sessionVariables = {TERMINAL = "wezterm";}; + xdg.configFile."wezterm" = { source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/wezterm"; recursive = true; diff --git a/modules/zsh.nix b/modules/zsh.nix index 5f9d093..41a908a 100644 --- a/modules/zsh.nix +++ b/modules/zsh.nix @@ -4,7 +4,11 @@ lib, pkgs, ... -}: { +}: let + inherit (pkgs.stdenv.hostPlatform) isDarwin; +in { + home.sessionVariables = {LESSHISTFILE = "-";}; + programs = { direnv.enable = true; direnv.nix-direnv.enable = true; @@ -79,7 +83,10 @@ ]; shellAliases = { # switch between yubikeys for the same GPG key - cat = "bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo default || echo GitHub)"; + cat = + if isDarwin + then "bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo default || echo GitHub)" + else "bat"; switch_yubikeys = "gpg-connect-agent \"scd serialno\" \"learn --force\" /bye"; }; history = { diff --git a/packages/cura/default.nix b/packages/cura/default.nix deleted file mode 100644 index 5053ecc..0000000 --- a/packages/cura/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - appimageTools, - fetchurl, -}: -appimageTools.wrapType1 rec { - name = "cura"; - version = "5.2.1"; - - src = fetchurl { - url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-modern.AppImage"; - sha256 = "sha256-0RDKjmLv1efGR6/VN0Enx7jiuA9DCKboNoaVdHZGXTg="; - }; -} diff --git a/packages/default.nix b/packages/default.nix deleted file mode 100644 index 427a445..0000000 --- a/packages/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -final: prev: { - cura = prev.callPackage ./cura {}; - discord-applemusic-rich-presence = prev.callPackage ./discord-applemusic-rich-presence {}; - emmet-ls = prev.callPackage ./emmet-ls {}; - helm-ls = prev.callPackage ./helm-ls {}; - jq-lsp = prev.callPackage ./jq-lsp {}; - mopidy-podcast-itunes = prev.callPackage ./mopidy-podcast-itunes {}; - org-stats = prev.callPackage ./org-stats {}; - papirus-folders-catppuccin = prev.callPackage ./papirus-folders-catppuccin {}; - catppuccin-catwalk = prev.callPackage ./python3Packages/catppuccin-catwalk {}; - discover-overlay = prev.callPackage ./python3Packages/discover-overlay {}; - picom = prev.picom.overrideAttrs (old: { - version = "unstable-2022-02-06"; - src = prev.fetchFromGitHub { - owner = "FT-Labs"; - repo = "picom"; - sha256 = "sha256-uH0OuM36xnvGC6TMJ7r7nlx8ZUGgL8N6ia/6KzFksVY="; - rev = "bb2b4801f7aef81f0739a50bf272431f7d7d9549"; - }; - nativeBuildInputs = old.nativeBuildInputs ++ [prev.pcre2]; - }); -} diff --git a/packages/discord-applemusic-rich-presence/default.nix b/packages/discord-applemusic-rich-presence/default.nix deleted file mode 100644 index ad7ca89..0000000 --- a/packages/discord-applemusic-rich-presence/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - buildGoModule, - fetchFromGitHub, - lib, - ... -}: -buildGoModule rec { - pname = "discord-applemusic-rich-presence"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "caarlos0"; - repo = "discord-applemusic-rich-presence"; - rev = "v${version}"; - sha256 = "sha256-PCA0Thzng1C08NwBTh3Hl4yW2qvYXra6EZHrJxoCgIU="; - }; - - vendorSha256 = "sha256-RFJTBfsfEyKn9OSvE2HLgjKiJC3Hs90+P9rm5GlIseo="; - - meta = with lib; { - description = "Discord's Rich Presence from Apple Music"; - homepage = "https://github.com/caarlos0/discord-applemusic-rich-presence"; - license = licenses.mit; - maintainers = [maintainers.nekowinston]; - platforms = platforms.darwin; - }; -} diff --git a/packages/emmet-ls/default.nix b/packages/emmet-ls/default.nix deleted file mode 100644 index b7c3cc2..0000000 --- a/packages/emmet-ls/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - buildNpmPackage, - lib, - pkgs, - ... -}: -buildNpmPackage { - pname = "nodePackages.emmet-ls"; - version = "0.3.1"; - - src = pkgs.fetchurl { - url = "https://registry.npmjs.org/emmet-ls/-/emmet-ls-0.3.1.tgz"; - sha512 = "sha512-SbNxxpLHnkaT/lA8CpOnnu1fH+VMzEAniAoyqQV+CGVJ9BYwHbaDlOPRckoJFK/6czWCQqDWax1Gk5Pa+HrNmA=="; - }; - - npmDepsHash = "sha256-Qxt/9v5gL237q5QmCXCstXlLKO2dGb9PAHWN2Bh4pEI="; - - meta = with lib; { - description = "Emmet language server"; - homepage = "https://github.com/aca/emmet-ls"; - license = licenses.mit; - maintainers = [maintainers.nekowinston]; - }; -} diff --git a/packages/helm-ls/default.nix b/packages/helm-ls/default.nix deleted file mode 100644 index ca4e79c..0000000 --- a/packages/helm-ls/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - buildGoModule, - fetchFromGitHub, - lib, - ... -}: -buildGoModule rec { - pname = "helm-ls"; - version = "20220912"; - - src = fetchFromGitHub { - owner = "mrjosh"; - repo = "helm-ls"; - rev = "1552f4be6b43eb3fc6c61ce056f1d28f36650c62"; - sha256 = "sha256-YSK7PBsk/NXsM7bFg6ebqiYDH94vsK45vMpZtDJqLnk="; - }; - - vendorSha256 = "sha256-EqZlmOoQtC3Iuf0LG2PL0K2pluGqbyA6132lzgF4+ic="; - - meta = with lib; { - description = "helm language server"; - homepage = "https://github.com/mrjosh/helm-ls"; - license = licenses.mit; - maintainers = [maintainers.nekowinston]; - }; -} diff --git a/packages/jq-lsp/default.nix b/packages/jq-lsp/default.nix deleted file mode 100644 index 354540b..0000000 --- a/packages/jq-lsp/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - buildGoModule, - fetchFromGitHub, - lib, - ... -}: -buildGoModule rec { - pname = "jq-lsp"; - version = "20221220"; - - src = fetchFromGitHub { - owner = "wader"; - repo = "jq-lsp"; - rev = "4aadc9e4bf54eb3c4e24ac9f780d23bd0a04d76a"; - sha256 = "sha256-Xq0y685omljMOlxxqD1Q193G+UF0Y3ot5SXAzCma3S0="; - }; - - vendorSha256 = "sha256-ppQ81uERHBgOr/bm/CoDSWcK+IqHwvcL6RFi0DgoLuw="; - - meta = with lib; { - description = "jq language server"; - homepage = "https://github.com/wader/jq-lsp"; - license = licenses.mit; - maintainers = [maintainers.nekowinston]; - }; -} diff --git a/packages/librewolf/default.nix b/packages/librewolf/default.nix deleted file mode 100644 index d45355a..0000000 --- a/packages/librewolf/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - stdenv, - fetchurl, - lib, - undmg, -}: -stdenv.mkDerivation rec { - name = "librewolf"; - version = "109.0-1"; - - url = "e0b46cbfb55504d33fd75b328ef3f5c7"; - - src = fetchurl { - url = "https://gitlab.com/librewolf-community/browser/macos/uploads/${url}/librewolf-${version}.en-US.mac.aarch64.dmg"; - sha256 = "5a60bc2b2d6fc6cbdfae8797178695b7139a0006869e5dbe214078a4d058f1f0"; - }; - - buildInputs = [undmg]; - sourceRoot = "."; - phases = ["unpackPhase" "installPhase"]; - installPhase = '' - mkdir -p "$out/Applications" - cp -r Librewolf.app "$out/Applications/Librewolf.app" - ''; - - meta = with lib; { - description = "A custom version of Firefox, focused on privacy, security and freedom."; - homepage = "https://librewolf.net/"; - maintainers = [maintainers.nekowinston]; - platforms = platforms.darwin; - }; -} diff --git a/packages/mopidy-podcast-itunes/default.nix b/packages/mopidy-podcast-itunes/default.nix deleted file mode 100644 index 724d4ce..0000000 --- a/packages/mopidy-podcast-itunes/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - python3Packages, - mopidy, - mopidy-podcast, -}: -python3Packages.buildPythonApplication rec { - pname = "mopidy-podcast-itunes"; - version = "3.0.1"; - - src = python3Packages.fetchPypi { - inherit version; - pname = "Mopidy-Podcast-iTunes"; - sha256 = "sha256-sxowRHUGiUr7dKoNKs4htFJccEaBqvyvzINmrZIZIds="; - }; - - propagatedBuildInputs = with python3Packages; [ - mopidy - mopidy-podcast - cachetools - responses - uritools - ]; - - checkInputs = with python3Packages; [ - pytestCheckHook - ]; - - meta = with lib; { - homepage = "https://github.com/tkem/mopidy-podcast-itunes"; - description = "Mopidy extension for searching and browsing podcasts on the Apple iTunes Store."; - license = licenses.asl20; - maintainers = [maintainers.nekowinston]; - }; -} diff --git a/packages/org-stats/default.nix b/packages/org-stats/default.nix deleted file mode 100644 index a3779ce..0000000 --- a/packages/org-stats/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - buildGoModule, - fetchFromGitHub, - lib, - ... -}: -buildGoModule rec { - pname = "discord-applemusic-rich-presence"; - version = "1.11.2"; - - src = fetchFromGitHub { - owner = "caarlos0"; - repo = "org-stats"; - rev = "v${version}"; - sha256 = "sha256-b0Cfs4EqQOft/HNAoJvRriCMzNiOgYagBLiPYgsDgJM="; - }; - - vendorSha256 = "sha256-LKpnEXVfxBR3cebv46QontDVeA64MJe0vNiKSnTjLtQ="; - - meta = with lib; { - description = "Get the contributor stats summary from all repos of any given organization"; - homepage = "https://github.com/caarlos0/org-stats"; - license = licenses.mit; - maintainers = [maintainers.nekowinston]; - }; -} diff --git a/packages/papirus-folders-catppuccin/default.nix b/packages/papirus-folders-catppuccin/default.nix deleted file mode 100644 index 1e91e67..0000000 --- a/packages/papirus-folders-catppuccin/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchFromGitHub, - papirus-icon-theme, - gtk3, - bash, - getent, - flavor ? "mocha", - accent ? "blue", - ... -}: let - validAccents = ["blue" "flamingo" "green" "lavender" "maroon" "mauve" "peach" "pink" "red" "rosewater" "sapphire" "sky" "teal" "yellow"]; - validFlavors = ["latte" "frappe" "macchiato" "mocha"]; - pname = "catppuccin-papirus-folders"; -in - lib.checkListOfEnum "${pname}: accent color" validAccents [accent] - lib.checkListOfEnum "${pname}: flavor" - validFlavors [flavor] - stdenvNoCC.mkDerivation rec { - inherit pname; - version = "unstable-2022-12-04"; - - src = fetchFromGitHub { - owner = "catppuccin"; - repo = "papirus-folders"; - rev = "1a367642df9cf340770bd7097fbe85b9cea65bcb"; - sha256 = "sha256-mFDfRVDA9WyriyFVzsI7iqmPopN56z54FvLkZDS2Dv8="; - }; - - buildInputs = [bash getent gtk3 papirus-icon-theme]; - - patchPhase = '' - substituteInPlace ./papirus-folders --replace "getent" "${getent}/bin/getent" - ''; - - installPhase = '' - mkdir -p $out/share/icons - cp -r ${papirus-icon-theme}/share/icons/Papirus* $out/share/icons - chmod -R u+rw $out - cp -r src/* $out/share/icons/Papirus - for theme in $out/share/icons/*; do - ${bash}/bin/bash ./papirus-folders -t $theme -o -C cat-${flavor}-${accent} - gtk-update-icon-cache --force $theme - done - ''; - - meta = with lib; { - description = "Soothing pastel theme for Papirus Icon Theme folders"; - homepage = "https://github.com/catppuccin/papirus-folders"; - license = licenses.mit; - maintainers = [maintainers.nekowinston]; - }; - } diff --git a/packages/python3Packages/catppuccin-catwalk/default.nix b/packages/python3Packages/catppuccin-catwalk/default.nix deleted file mode 100644 index 5cc21ae..0000000 --- a/packages/python3Packages/catppuccin-catwalk/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - python3Packages, -}: -python3Packages.buildPythonApplication rec { - pname = "catppuccin_catwalk"; - version = "0.4.0"; - - src = python3Packages.fetchPypi { - inherit version pname; - sha256 = "sha256-5TAw5H3soxe9vLhfj1qs8uMr4ybrHlCj4zdsMzvPo6s="; - }; - - propagatedBuildInputs = with python3Packages; [ - pillow - ]; - - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/catppuccin/toolbox"; - description = "Part of catppuccin/toolbox, to generate preview a single composite screenshot for the four flavours"; - license = licenses.mit; - maintainers = [maintainers.nekowinston]; - }; -} diff --git a/packages/python3Packages/discover-overlay/default.nix b/packages/python3Packages/discover-overlay/default.nix deleted file mode 100644 index 1461eb4..0000000 --- a/packages/python3Packages/discover-overlay/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - gobject-introspection, - gtk3, - lib, - python3Packages, - wrapGAppsHook, -}: -python3Packages.buildPythonApplication rec { - pname = "discover-overlay"; - version = "0.6.3"; - - src = python3Packages.fetchPypi { - inherit version pname; - sha256 = "sha256-77oCS/MEPiHSVmoSNk1rFu0XLQLqLRSqJlj7ijQMC4A="; - }; - - nativeBuildInputs = [wrapGAppsHook gobject-introspection]; - propagatedBuildInputs = with python3Packages; [gobject-introspection gtk3 pillow pygobject3 pyxdg requests setuptools websocket-client xlib]; - - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/trigg/Discover"; - description = "Yet another discord overlay for linux"; - license = licenses.gpl3; - maintainers = [maintainers.nekowinston]; - }; -} diff --git a/packages/vscode-extensions.ms-kubernetes-tools.vscode-kubernetes-tools/default.nix b/packages/vscode-extensions.ms-kubernetes-tools.vscode-kubernetes-tools/default.nix deleted file mode 100644 index bde30d7..0000000 --- a/packages/vscode-extensions.ms-kubernetes-tools.vscode-kubernetes-tools/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - lib, - vscode-utils, - ... -}: -vscode-utils.buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-kubernetes-tools"; - publisher = "ms-kubernetes-tools"; - version = "1.3.11"; - sha256 = "sha256-I2ud9d4VtgiiIT0MeoaMThgjLYtSuftFVZHVJTMlJ8s="; - }; - meta = with lib; { - description = "Develop, deploy and debug Kubernetes applications"; - license = licenses.asl20; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools"; - maintainers = with maintainers; [nekowinston]; - }; -}