Nebucatnetzer
/
nixos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Provide unstable to home-manager 

There is probably a much better way than this.
This commit is contained in:
Andreas Zweili 2023-03-21 09:42:55 +01:00
parent 1d92a34714
commit c89e5b5290
8 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
home-manager/desktop.nix
View File

@ -1,4 +1,7 @@
{ custom }: { config, pkgs, ... }:
{ custom, system }: { config, pkgs, ... }:
let
unstable = import custom.inputs.nixpkgs-unstable { inherit system; };
in
{
imports = [
(import "${custom.inputs.self}/home-manager/common" { inherit custom; })
@ -6,7 +9,7 @@
"${custom.inputs.self}/home-manager/software/alacritty"
"${custom.inputs.self}/home-manager/software/calibre"
"${custom.inputs.self}/home-manager/software/czkawka"
"${custom.inputs.self}/home-manager/software/emacs"
(import "${custom.inputs.self}/home-manager/software/emacs" { inherit unstable; })
"${custom.inputs.self}/home-manager/software/espanso"
"${custom.inputs.self}/home-manager/software/evince"
"${custom.inputs.self}/home-manager/software/fzf"
@ -15,7 +18,7 @@
"${custom.inputs.self}/home-manager/software/mime-apps"
"${custom.inputs.self}/home-manager/software/mpv"
"${custom.inputs.self}/home-manager/software/obsidian"
(import "${custom.inputs.self}/home-manager/software/rapid-photo-downloader" { inherit custom; })
(import "${custom.inputs.self}/home-manager/software/rapid-photo-downloader" { inherit unstable; })
"${custom.inputs.self}/home-manager/software/signal"
"${custom.inputs.self}/home-manager/software/ssh"
"${custom.inputs.self}/home-manager/software/starship"

2
home-manager/headless.nix
View File

@ -1,4 +1,4 @@
{ custom }: { ... }:
{ custom, system }: { ... }:
{
imports = [
(import "${custom.inputs.self}/home-manager/common" { inherit custom; })

7
home-manager/management.nix
View File

@ -1,8 +1,11 @@
{ custom }: { pkgs, ... }:
{ custom, system }: { pkgs, ... }:
let
unstable = import custom.inputs.nixpkgs-unstable { inherit system; };
in
{
imports = [
(import "${custom.inputs.self}/home-manager/common" { inherit custom; })
"${custom.inputs.self}/home-manager/software/emacs"
(import "${custom.inputs.self}/home-manager/software/emacs" { inherit unstable; })
"${custom.inputs.self}/home-manager/software/fzf"
"${custom.inputs.self}/home-manager/software/git"
"${custom.inputs.self}/home-manager/software/ssh"

3
home-manager/software/emacs/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ... }:
{ unstable }: { pkgs, ... }:
{
home.packages = with pkgs; [
fd
@ -102,6 +102,7 @@
python310Packages.pip
python310Packages.yapf
rufo # formatter for Ruby
unstable.ansible-language-server
xclip # X11 clipboard from terminal
];
};

8
home-manager/software/rapid-photo-downloader/default.nix
View File

@ -1,10 +1,4 @@
{ custom }: { pkgs, ... }:
let
# TODO: switch back to stable on 23.05
unstable = import custom.inputs.nixpkgs-unstable {
system = "x86_64-linux";
};
in
{ unstable }: { ... }:
{
home.packages = [
unstable.rapid-photo-downloader

3
home-manager/work-wsl.nix
View File

@ -1,4 +1,7 @@
{ custom, pkgs, ... }:
let
unstable = import custom.inputs.nixpkgs-unstable { inherit system; };
in
{
imports = [
(import "${custom.inputs.self}/home-manager/common" {

2
lib/mk_computer.nix
View File

@ -50,7 +50,7 @@ custom.inputs.nixpkgs.lib.nixosSystem
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${custom.username}.imports = [
(import "${custom.inputs.self}/home-manager/${home-module}.nix" { inherit custom; })
(import "${custom.inputs.self}/home-manager/${home-module}.nix" { inherit custom system; })
];
}
]);

2
lib/mk_raspi.nix
View File

@ -45,7 +45,7 @@ custom.inputs.nixpkgs.lib.nixosSystem {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${custom.username}.imports = [
(import "${custom.inputs.self}/home-manager/${home-module}.nix" { inherit custom; })
(import "${custom.inputs.self}/home-manager/${home-module}.nix" { inherit custom system; })
];
}
]);