From 0c5651145e3b43d22099a49f71159c4018120423 Mon Sep 17 00:00:00 2001 From: yunfachi Date: Fri, 27 Oct 2023 12:30:46 +0300 Subject: [PATCH] deleted pkgs and made a repository with my pkgs --- flake.lock | 95 ++++++++++++++++++------------ flake.nix | 29 ++++++--- home/core/tools.nix | 4 -- home/desktop/tools/yunfaavatar.nix | 5 +- modules/desktop.nix | 2 + pkgs/default.nix | 3 - pkgs/yunfaavatar.nix | 40 ------------- 7 files changed, 82 insertions(+), 96 deletions(-) delete mode 100644 pkgs/default.nix delete mode 100644 pkgs/yunfaavatar.nix diff --git a/flake.lock b/flake.lock index a534d79..46ed64b 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1695384796, + "lastModified": 1696775529, "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", "owner": "ryantm", "repo": "agenix", - "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4", + "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1692476235, - "narHash": "sha256-NGUDp/24HCIVWE0xZNHIdzz3q2WDk7MQz1wC7ub/e2U=", + "lastModified": 1696926085, + "narHash": "sha256-PuaKdM4Nems/wQ2B+K7hI2UJYld/+64NdkcsYD1YJwM=", "owner": "Kirottu", "repo": "anyrun", - "rev": "76af3eb198f376303194c31a83f2399a043acf1b", + "rev": "f9073a6184f61a07bb584ecc47fbb8eb997e9216", "type": "github" }, "original": { @@ -129,11 +129,11 @@ ] }, "locked": { - "lastModified": 1685662779, - "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, "original": { @@ -224,11 +224,11 @@ ] }, "locked": { - "lastModified": 1696635169, - "narHash": "sha256-gOjLe7maQ58erN/9ykb6d2ePAU7QAT1D8u7qin9gt+c=", + "lastModified": 1698250431, + "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", "owner": "nix-community", "repo": "home-manager", - "rev": "b2a2133c9a0b0aa4d06d72b5891275f263ee08df", + "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", "type": "github" }, "original": { @@ -246,11 +246,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1696642103, - "narHash": "sha256-cbqYTfPrinbMSaljex1TmPNtmRP6f4uQjHngzg+oGws=", + "lastModified": 1698342859, + "narHash": "sha256-tL0aE05aBQIPC/R8HpW+Fbpnej3KKiz2/qVzN1L1TXE=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "38e242953df06b7b90a09fd7a1480a9cfcdd6ba8", + "rev": "92cf1c23371e35fa352da13305d8489a9e08d540", "type": "github" }, "original": { @@ -307,11 +307,11 @@ "nix-secrets": { "flake": false, "locked": { - "lastModified": 1697052217, - "narHash": "sha256-7Avmnx4eJxWW2t6QG8Rlsrb9gwKkc7fYEAcbrjuP4Uc=", + "lastModified": 1698072348, + "narHash": "sha256-e4IRKzQ1OjqylhMX7IJuwF3ZlSX7ySaAEH3KxRDiWxw=", "ref": "refs/heads/master", - "rev": "5a581fcdc1ce65ece9b7339b1f0b8e3fef2f3861", - "revCount": 5, + "rev": "bad081d1791c9f4b6ab7f2213c513536f28e7875", + "revCount": 6, "type": "git", "url": "ssh://git@github.com/yunfachi/nix-secrets.git" }, @@ -329,11 +329,11 @@ ] }, "locked": { - "lastModified": 1696641650, - "narHash": "sha256-v6UIfyfArE3HMaLh7IvKQu4ZShjWQmsxzOuruTH9eLc=", + "lastModified": 1698283156, + "narHash": "sha256-VFM4IPR85hR1Ydd7ztmBjWm3CtleWG6cb6UouBFf1/U=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "d30338bfd8cf524361ac5cf104a491496bca65f4", + "rev": "8574289fa0fc4ce88e29b797cbf523b97dc8cf9d", "type": "github" }, "original": { @@ -344,11 +344,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694767346, - "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1696375444, - "narHash": "sha256-Sv0ICt/pXfpnFhTGYTsX6lUr1SljnuXWejYTI2ZqHa4=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "81e8f48ebdecf07aab321182011b067aafc78896", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { @@ -374,6 +374,26 @@ "type": "github" } }, + "nixpkgs-yunfachi": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698396091, + "narHash": "sha256-r0tCVX9Y07LESiJnqtBsG6Q32rEJICJvwZizqrszU8g=", + "ref": "refs/heads/master", + "rev": "e61748fab6e2990d3c3abc2a0ba2e6addcce0eea", + "revCount": 14, + "type": "git", + "url": "ssh://git@github.com/yunfachi/nixpkgs-yunfachi.git" + }, + "original": { + "type": "git", + "url": "ssh://git@github.com/yunfachi/nixpkgs-yunfachi.git" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1685498995, @@ -392,11 +412,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1696374741, - "narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=", + "lastModified": 1698160471, + "narHash": "sha256-lH7ZEItqQOWi21St9JyE6t3yyFNYGoQqSEcS90WMnBY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a4c17493e5c39769f79117937c79e1c88de6729", + "rev": "04f431fe64a5ba8ff129cbbbfec489cfe903982c", "type": "github" }, "original": { @@ -417,6 +437,7 @@ "nix-vscode-extensions": "nix-vscode-extensions", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-yunfachi": "nixpkgs-yunfachi", "wallpapers": "wallpapers" } }, @@ -527,18 +548,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1696410538, - "narHash": "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=", + "lastModified": 1697909146, + "narHash": "sha256-jU0I6FoCKnj4zIBL4daosFWh81U1fM719Z6cae8PxSY=", "owner": "wlroots", "repo": "wlroots", - "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", + "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", + "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2", "type": "gitlab" } }, @@ -558,11 +579,11 @@ ] }, "locked": { - "lastModified": 1694628480, - "narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=", + "lastModified": 1697981233, + "narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2", + "rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7f007d4..e0ae514 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ self, nixpkgs, nixpkgs-unstable, + nixpkgs-yunfachi, home-manager, ... } @ inputs: let @@ -34,7 +35,14 @@ # TODO: remove config.allowUnfree = true; }; - pkgs-local = import ./pkgs nixpkgs.legacyPackages.${x64_system}; + pkgs-yunfachi = import nixpkgs-unstable { + system = x64_system; + # TODO: remove + config.allowUnfree = true; + overlays = [ + inputs.nixpkgs-yunfachi.overlays.default + ]; + }; } // inputs; @@ -55,7 +63,8 @@ #-=-=-=-=-=-=-=-=-# nixosArgs = { inherit home-manager; - nixpkgs = nixpkgs-unstable; # pkgs branch [nixpkgs|nixpkgs-unstable] + # nixpkgs branch [nixpkgs|nixpkgs-unstable] + nixpkgs = nixpkgs-unstable; system = x64_system; specialArgs = x64_specialArgs; }; @@ -75,11 +84,17 @@ }; inputs = { - #=-=-=-=-=-=-=-=-=-=-=# - # System Repositories # - #-=-=-=-=-=-=-=-=-=-=-# + #=-=-=-=-=-# + # Packages # + #-=-=-=-=-=# nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-yunfachi.url = "git+ssh://git@github.com/yunfachi/nixpkgs-yunfachi.git"; + nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; + + nixpkgs-yunfachi.inputs.nixpkgs.follows = "nixpkgs"; + nix-vscode-extensions.inputs.nixpkgs.follows = "nixpkgs"; + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -102,10 +117,6 @@ url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-vscode-extensions = { - url = "github:nix-community/nix-vscode-extensions"; - inputs.nixpkgs.follows = "nixpkgs"; - }; #=-=-=-=-=-=-=-=-=-# # Own Repositories # diff --git a/home/core/tools.nix b/home/core/tools.nix index 6ce20e1..f67dc60 100644 --- a/home/core/tools.nix +++ b/home/core/tools.nix @@ -32,8 +32,4 @@ programs = { }; - - services = { - udiskie.enable = true; - }; } diff --git a/home/desktop/tools/yunfaavatar.nix b/home/desktop/tools/yunfaavatar.nix index 2a2c95a..d4ca023 100644 --- a/home/desktop/tools/yunfaavatar.nix +++ b/home/desktop/tools/yunfaavatar.nix @@ -1,14 +1,13 @@ { config, - pkgs-local, + pkgs-yunfachi, ... }: { #home.file.".config/yunfaAvatar/config.conf" = { # source = config.age.secrets.yunfaavatar.path; # recursive = true; #}; - - home.packages = with pkgs-local; [ + home.packages = with pkgs-yunfachi; [ yunfaavatar ]; } diff --git a/modules/desktop.nix b/modules/desktop.nix index 5ea7d7b..8a56b3b 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -2,6 +2,7 @@ lib, pkgs, pkgs-unstable, + pkgs-yunfachi, ... }: { imports = [ @@ -12,6 +13,7 @@ # Stuff # #-=-=-=-# nixpkgs.config.allowUnfree = lib.mkForce true; + nixpkgs.config.allowUnfreePredicate = lib.mkForce (pkg: true); security.polkit.enable = true; services.gnome.gnome-keyring.enable = true; security.pam.services.greetd.enableGnomeKeyring = true; diff --git a/pkgs/default.nix b/pkgs/default.nix deleted file mode 100644 index be75287..0000000 --- a/pkgs/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -pkgs: { - yunfaavatar = pkgs.callPackage ./yunfaavatar.nix {}; -} diff --git a/pkgs/yunfaavatar.nix b/pkgs/yunfaavatar.nix deleted file mode 100644 index bd7fab6..0000000 --- a/pkgs/yunfaavatar.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchFromGitHub, - bash, - imagemagick, - makeWrapper, -}: -stdenvNoCC.mkDerivation rec { - pname = "yunfaavatar"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "yunfachi"; - repo = "yunfaAvatar"; - rev = version; - hash = "sha256-4hjGwldpqkAPAy8IEbnP2zfVOugr+s+dslGktxMoV6A="; - }; - - strictDeps = true; - nativeBuildInputs = [makeWrapper]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - postInstall = '' - wrapProgram "$out/lib/yunfaavatar" \ - --prefix PATH : "${lib.makeBinPath [imagemagick]}" - ''; - - meta = with lib; { - description = "Utility for automatic centralized changing of avatar in Github, Discord, Steam, Shikimori, and many more"; - homepage = "https://github.com/yunfachi/yunfaAvatar"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [yunfachi]; - mainProgram = "yunfaavatar"; - }; -}