Skip to content

Commit

Permalink
deleted pkgs and made a repository with my pkgs
Browse files Browse the repository at this point in the history
  • Loading branch information
yunfachi committed Oct 27, 2023
1 parent be3b86c commit 0c56511
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 96 deletions.
95 changes: 58 additions & 37 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 20 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
self,
nixpkgs,
nixpkgs-unstable,
nixpkgs-yunfachi,
home-manager,
...
} @ inputs: let
Expand Down Expand Up @@ -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;

Expand All @@ -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;
};
Expand All @@ -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://[email protected]/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";
Expand All @@ -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 #
Expand Down
4 changes: 0 additions & 4 deletions home/core/tools.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,4 @@

programs = {
};

services = {
udiskie.enable = true;
};
}
5 changes: 2 additions & 3 deletions home/desktop/tools/yunfaavatar.nix
Original file line number Diff line number Diff line change
@@ -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
];
}
2 changes: 2 additions & 0 deletions modules/desktop.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
lib,
pkgs,
pkgs-unstable,
pkgs-yunfachi,
...
}: {
imports = [
Expand All @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions pkgs/default.nix

This file was deleted.

40 changes: 0 additions & 40 deletions pkgs/yunfaavatar.nix

This file was deleted.

0 comments on commit 0c56511

Please sign in to comment.