Fixes NIX_PATH
This commit is contained in:
parent
497b1a07e2
commit
5f4cfd4676
1
home.nix
1
home.nix
@ -24,7 +24,6 @@ in {
|
|||||||
|
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
EDITOR = "micro";
|
EDITOR = "micro";
|
||||||
NIX_PATH = "/nix/var/nix/profiles/per-user/${username}/channels";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
file."Applications/Home Manager Apps".source = let
|
file."Applications/Home Manager Apps".source = let
|
||||||
|
2
nix.nix
2
nix.nix
@ -3,7 +3,7 @@
|
|||||||
nix = {
|
nix = {
|
||||||
package = pkgs.nixFlakes;
|
package = pkgs.nixFlakes;
|
||||||
registry.nixpkgs.flake = inputs.nixpkgs;
|
registry.nixpkgs.flake = inputs.nixpkgs;
|
||||||
nixPath = [{ nixpkgs = inputs.nixpkgs.outPath; }];
|
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
|
||||||
extraOptions = ''
|
extraOptions = ''
|
||||||
keep-outputs = true
|
keep-outputs = true
|
||||||
keep-derivations = true
|
keep-derivations = true
|
||||||
|
@ -1,43 +0,0 @@
|
|||||||
From 81bc5f7e4f9d0386d2be6773336b43c54098854e Mon Sep 17 00:00:00 2001
|
|
||||||
From: loli <loli@headpats.uk>
|
|
||||||
Date: Mon, 31 Oct 2022 01:51:36 +0100
|
|
||||||
Subject: [PATCH] cloudflare-dyndns: use toPythonApplication fixes #198736
|
|
||||||
|
|
||||||
---
|
|
||||||
pkgs/applications/networking/cloudflare-dyndns/default.nix | 4 ++--
|
|
||||||
pkgs/top-level/all-packages.nix | 2 +-
|
|
||||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pkgs/applications/networking/cloudflare-dyndns/default.nix b/pkgs/applications/networking/cloudflare-dyndns/default.nix
|
|
||||||
index 9b5abcbcbf397..b0cbab4adeeff 100644
|
|
||||||
--- a/pkgs/applications/networking/cloudflare-dyndns/default.nix
|
|
||||||
+++ b/pkgs/applications/networking/cloudflare-dyndns/default.nix
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
{ lib
|
|
||||||
-, buildPythonApplication
|
|
||||||
+, buildPythonPackage
|
|
||||||
, attrs
|
|
||||||
, click
|
|
||||||
, cloudflare
|
|
||||||
@@ -11,7 +11,7 @@
|
|
||||||
, requests
|
|
||||||
}:
|
|
||||||
|
|
||||||
-buildPythonApplication rec {
|
|
||||||
+buildPythonPackage rec {
|
|
||||||
pname = "cloudflare-dyndns";
|
|
||||||
version = "4.1";
|
|
||||||
format = "pyproject";
|
|
||||||
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
|
|
||||||
index dc860b31194c6..0d60542528aa8 100644
|
|
||||||
--- a/pkgs/top-level/all-packages.nix
|
|
||||||
+++ b/pkgs/top-level/all-packages.nix
|
|
||||||
@@ -3429,7 +3429,7 @@ with pkgs;
|
|
||||||
|
|
||||||
cloudflared = callPackage ../applications/networking/cloudflared { };
|
|
||||||
|
|
||||||
- cloudflare-dyndns = python3Packages.cloudflare-dyndns;
|
|
||||||
+ cloudflare-dyndns = with python3Packages; toPythonApplication cloudflare-dyndns;
|
|
||||||
|
|
||||||
cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { };
|
|
||||||
|
|
@ -24,7 +24,6 @@ in {
|
|||||||
|
|
||||||
interactiveShellInit = ''
|
interactiveShellInit = ''
|
||||||
fzf_configure_bindings --git_status=\cs --history=\cr --variables=\cv --directory=\cf --git_log=\cg
|
fzf_configure_bindings --git_status=\cs --history=\cr --variables=\cv --directory=\cf --git_log=\cg
|
||||||
neofetch
|
|
||||||
|
|
||||||
if test -d (brew --prefix)"/share/fish/completions"
|
if test -d (brew --prefix)"/share/fish/completions"
|
||||||
set -p fish_complete_path (brew --prefix)/share/fish/completions
|
set -p fish_complete_path (brew --prefix)/share/fish/completions
|
||||||
@ -33,11 +32,14 @@ in {
|
|||||||
if test -d (brew --prefix)"/share/fish/vendor_completions.d"
|
if test -d (brew --prefix)"/share/fish/vendor_completions.d"
|
||||||
set -p fish_complete_path (brew --prefix)/share/fish/vendor_completions.d
|
set -p fish_complete_path (brew --prefix)/share/fish/vendor_completions.d
|
||||||
end
|
end
|
||||||
|
|
||||||
|
neofetch
|
||||||
'';
|
'';
|
||||||
|
|
||||||
shellInit = ''
|
shellInit = ''
|
||||||
# nix
|
# nix
|
||||||
fenv source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
|
fenv source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
|
||||||
|
fenv source /run/current-system/etc/bashrc
|
||||||
fenv source /etc/profiles/per-user/${username}/etc/profile.d/hm-session-vars.sh
|
fenv source /etc/profiles/per-user/${username}/etc/profile.d/hm-session-vars.sh
|
||||||
fish_add_path -m ~/.local/bin ~/.cabal/bin /etc/profiles/per-user/${username}/bin
|
fish_add_path -m ~/.local/bin ~/.cabal/bin /etc/profiles/per-user/${username}/bin
|
||||||
eval "$(${osConfig.homebrew.brewPrefix}/brew shellenv)"
|
eval "$(${osConfig.homebrew.brewPrefix}/brew shellenv)"
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{ pkgs, inputs, ... }: {
|
{ pkgs, inputs, ... }: {
|
||||||
security.pam.enableSudoTouchIdAuth = true;
|
security.pam.enableSudoTouchIdAuth = true;
|
||||||
system = {
|
system = {
|
||||||
|
checks.verifyNixChannels = true;
|
||||||
defaults = {
|
defaults = {
|
||||||
dock = {
|
dock = {
|
||||||
appswitcher-all-displays = false;
|
appswitcher-all-displays = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user