1
Fork 0

feat: trying to add the discord overlay

This commit is contained in:
Matei Adriel 2022-01-25 12:00:09 +02:00
parent 214cc2dcbe
commit c079ae71ca
7 changed files with 58 additions and 31 deletions

View file

@ -1,3 +1,6 @@
# Nixos-config # Nixos-config
My flake based nixos configuration. To use this, just rebuild your system using `sudo nixos-rebuild switch --flake .` while in the project directory. My flake based nixos configuration. To use this, just rebuild your system using `sudo nixos-rebuild switch --flake .` while in the project directory.
## TODO:
- make special separate dir for dotfiles. Would makes it easier to share them specifically

View file

@ -100,6 +100,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1643087856,
"narHash": "sha256-EreC7gP/T566PDRZjqNoTvByTyvABEpJpWFtyNUDS0Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8bd55a6a5ab05942af769c2aa2494044bff7f625",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agnoster": "agnoster", "agnoster": "agnoster",
@ -108,6 +124,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-unstable": "nixos-unstable", "nixos-unstable": "nixos-unstable",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"z": "z" "z": "z"
} }
}, },

View file

@ -4,6 +4,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/release-21.11"; nixpkgs.url = "github:nixos/nixpkgs/release-21.11";
nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
@ -21,35 +22,16 @@
agnoster.flake = false; agnoster.flake = false;
}; };
outputs = { self, nixpkgs, home-manager, nixos-unstable, easy-purescript-nix outputs = inputs@{ self, nixpkgs, home-manager, ... }:
, easy-dhall-nix, z, agnoster, ... }: { let provideInputs = import ./modules/overlays/flakes.nix inputs;
in {
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
provideInputs
./hardware/laptop.nix ./hardware/laptop.nix
./configuration.nix ./configuration.nix
# Make inputs available inside the config
({ pkgs, ... }: {
nixpkgs.overlays = [
(self: super: {
easy-purescript-nix =
import easy-purescript-nix { inherit pkgs; };
easy-dhall-nix = import easy-dhall-nix { inherit pkgs; };
z = {
src = z;
name = "z";
};
agnoster = {
src = agnoster;
name = "agnoster";
};
})
];
})
]; ];
}; };
}; };

View file

@ -24,7 +24,7 @@
gnumake gnumake
# unison-ucm # unison-ucm
xorg.libX11 xorg.libX11
texlive.combined.scheme-full texlive.combined.scheme-full # latex stuff
okular okular
zathura zathura
cmake cmake
@ -51,6 +51,7 @@
firefox firefox
# other stuff # other stuff
obsidian # knowedge base
# milkytracker # music tracker thingy # milkytracker # music tracker thingy
spectacle # take screenshots spectacle # take screenshots
vlc # video player vlc # video player
@ -70,6 +71,7 @@
# fceux # fceux
# games # games
tetrio-desktop
# mindustry # mindustry
]; ];
} }

View file

@ -1,12 +1,10 @@
{ pkgs, ... }: { pkgs, ... }:
let let
node = pkgs.nodejs-12_x; node = pkgs.nodejs-17_x;
yarn = pkgs.yarn.override { nodejs = node; }; yarn = pkgs.yarn.override { nodejs = node; };
in { in {
home-manager.users.adrielus.home.packages = with pkgs; home-manager.users.adrielus.home.packages = with pkgs;
with nodePackages; with nodePackages; [
# with fromNpm;
[
node node
deno deno
node2nix node2nix

View file

@ -1,5 +1,4 @@
{ ... }: { ... }: {
{ nixpkgs.overlays = [ import ./discord ];
# nixpkgs.overlays = [ import ./discord ];
# imports = [ ./legacy.nix ]; # imports = [ ./legacy.nix ];
} }

View file

@ -0,0 +1,26 @@
{ home-manager, nixpkgs-unstable, nixos-unstable, easy-purescript-nix
, easy-dhall-nix, z, agnoster, ... }:
({ pkgs, ... }: {
nixpkgs.overlays = [
(self: super: {
# inherit nixos-unstable;
unstable = import nixpkgs-unstable {
config.allowUnfree = true;
config.allowBroken = true;
};
easy-purescript-nix = import easy-purescript-nix { inherit pkgs; };
easy-dhall-nix = import easy-dhall-nix { inherit pkgs; };
z = {
src = z;
name = "z";
};
agnoster = {
src = agnoster;
name = "agnoster";
};
})
];
})