Compare commits
2 Commits
ded47de7e6
...
5f4cfd4676
Author | SHA1 | Date |
---|---|---|
Abhinav Sarkar | 5f4cfd4676 | |
Abhinav Sarkar | 497b1a07e2 |
18
flake.lock
18
flake.lock
|
@ -71,11 +71,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710800522,
|
||||
"narHash": "sha256-RPcufupTkBtZzeyfE4kQLTnK4MObDiZbs1Xyp/AKpY0=",
|
||||
"lastModified": 1711625603,
|
||||
"narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "6665da45dd03857a4ae600cf246435e6ae57407e",
|
||||
"rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -108,11 +108,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710717205,
|
||||
"narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
|
||||
"lastModified": 1711763326,
|
||||
"narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
|
||||
"rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -123,11 +123,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1710765496,
|
||||
"narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=",
|
||||
"lastModified": 1711715736,
|
||||
"narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7",
|
||||
"rev": "807c549feabce7eddbf259dbdcec9e0600a0660d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
1
home.nix
1
home.nix
|
@ -24,7 +24,6 @@ in {
|
|||
|
||||
sessionVariables = {
|
||||
EDITOR = "micro";
|
||||
NIX_PATH = "/nix/var/nix/profiles/per-user/${username}/channels";
|
||||
};
|
||||
|
||||
file."Applications/Home Manager Apps".source = let
|
||||
|
|
2
nix.nix
2
nix.nix
|
@ -3,7 +3,7 @@
|
|||
nix = {
|
||||
package = pkgs.nixFlakes;
|
||||
registry.nixpkgs.flake = inputs.nixpkgs;
|
||||
nixPath = [{ nixpkgs = inputs.nixpkgs.outPath; }];
|
||||
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
|
||||
extraOptions = ''
|
||||
keep-outputs = 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 = ''
|
||||
fzf_configure_bindings --git_status=\cs --history=\cr --variables=\cv --directory=\cf --git_log=\cg
|
||||
neofetch
|
||||
|
||||
if test -d (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"
|
||||
set -p fish_complete_path (brew --prefix)/share/fish/vendor_completions.d
|
||||
end
|
||||
|
||||
neofetch
|
||||
'';
|
||||
|
||||
shellInit = ''
|
||||
# nix
|
||||
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
|
||||
fish_add_path -m ~/.local/bin ~/.cabal/bin /etc/profiles/per-user/${username}/bin
|
||||
eval "$(${osConfig.homebrew.brewPrefix}/brew shellenv)"
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ pkgs, inputs, ... }: {
|
||||
security.pam.enableSudoTouchIdAuth = true;
|
||||
system = {
|
||||
checks.verifyNixChannels = true;
|
||||
defaults = {
|
||||
dock = {
|
||||
appswitcher-all-displays = false;
|
||||
|
|
Loading…
Reference in New Issue