wgester/dotfiles
1
0
Fork 0
forked from colonelpanic/dotfiles
Code Pull Requests Activity

[NixOS] Fix git-sync issues

Browse Source
This commit is contained in:
Ivan Malison 2021-07-17 23:00:46 -06:00
parent ad5c70c957
commit bab2280546
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
10 changed files with 13 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/base.nix
View File

@ -7,7 +7,6 @@
];
nixpkgs.overlays = [
(import ./overlays.nix)
(import ../dotfiles/config/xmonad/overlay.nix)
(import ../dotfiles/config/taffybar/overlay.nix)
];

1
nixos/essential.nix
View File

@ -74,6 +74,7 @@ in
binutils
gawk
gitFull
git-sync
htop
ncdu
lsof

2
nixos/extra.nix
View File

@ -1,11 +1,9 @@
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
# (import ../../Projects/waymonad/default.nix)
asciidoctor
gource
gimp
android-studio
texlive.combined.scheme-full
tor
];

16
nixos/flake.lock
View File

@ -127,7 +127,7 @@
},
"nixpkgs": {
"locked": {
"narHash": "sha256-ejJE3m7ymOKpPE6NBDlWla1FitMw04hB8JAUeW9WIn8=",
"narHash": "sha256-vBvIKuTZfH6H62RTomwSLCg0HwTsTzGsd0WCfxsuB7U=",
"path": "./nixpkgs",
"type": "path"
},
@ -138,8 +138,8 @@
},
"nixpkgs_2": {
"locked": {
"narHash": "sha256-ejJE3m7ymOKpPE6NBDlWla1FitMw04hB8JAUeW9WIn8=",
"path": "/nix/store/z30j15qd7l90y8c9fb3nd2703g65dskp-source",
"narHash": "sha256-eRDWIO61MIEZs/ftS1dp5fqdJQr3yTcfzBrYcC3k31M=",
"path": "/nix/store/cbpvh4ldqsjfvvlmxcq81kn3y2dnvwkw-source",
"type": "path"
},
"original": {
@ -149,8 +149,8 @@
},
"nixpkgs_3": {
"locked": {
"narHash": "sha256-ejJE3m7ymOKpPE6NBDlWla1FitMw04hB8JAUeW9WIn8=",
"path": "/nix/store/z30j15qd7l90y8c9fb3nd2703g65dskp-source",
"narHash": "sha256-eRDWIO61MIEZs/ftS1dp5fqdJQr3yTcfzBrYcC3k31M=",
"path": "/nix/store/cbpvh4ldqsjfvvlmxcq81kn3y2dnvwkw-source",
"type": "path"
},
"original": {
@ -160,8 +160,8 @@
},
"nixpkgs_4": {
"locked": {
"narHash": "sha256-ejJE3m7ymOKpPE6NBDlWla1FitMw04hB8JAUeW9WIn8=",
"path": "/nix/store/z30j15qd7l90y8c9fb3nd2703g65dskp-source",
"narHash": "sha256-eRDWIO61MIEZs/ftS1dp5fqdJQr3yTcfzBrYcC3k31M=",
"path": "/nix/store/cbpvh4ldqsjfvvlmxcq81kn3y2dnvwkw-source",
"type": "path"
},
"original": {
@ -188,7 +188,7 @@
]
},
"locked": {
"narHash": "sha256-U7h6ZMV1jhGFdVNOFPz3RhHYHE5quT0ksi8b8pW0rYY=",
"narHash": "sha256-6YDz7kCm5jMrSqWMNw9OS3N66v84ZOe5LCl1iFLoPtE=",
"path": "../dotfiles/config/taffybar/taffybar",
"type": "path"
},

2
nixos/flake.nix
View File

@ -32,7 +32,7 @@
let forAll = ({ ... }: {
nix = {
extraOptions = ''
experimental-features = nix-command flakes
experimental-features = nix-command flakes ca-references
'';
registry.nixpkgs.flake = nixpkgs;
};

1
nixos/machines/ivanm-dfinity-razer.nix
View File

@ -63,6 +63,7 @@
networking.hostName = "ivanm-dfinity-razer";
nix.maxJobs = lib.mkDefault 12;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
system.stateVersion = "18.03";
}

5
nixos/machines/ryzen-shine.nix
View File

@ -1,6 +1,3 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, ... }:
{
@ -51,5 +48,5 @@
# High-DPI console
console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
system.stateVersion = "20.03"; # Did you read the comment?
system.stateVersion = "20.03";
}

2
nixos/nixpkgs

@ -1 +1 @@
Subproject commit 71e3cbe2e975752eae72a1023f705bb5ad7dbb54
Subproject commit ec11db896633f328e978622c4d2e6474e31d304f

3
nixos/overlays.nix
View File

@ -1,3 +0,0 @@
self: super:
{
}

33
nixos/patch-strongswan.patch
View File

@ -1,33 +0,0 @@
From 71c28adfc1da51bb112ba1c83909d4292f2353cf Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Fri, 14 Jun 2019 16:03:58 -0700
Subject: [PATCH] Remove dumbass restriction on length of used PSK
---
src/charon-nm/nm/nm_service.c | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c
index fb9044d29..ccad2f635 100644
--- a/src/charon-nm/nm/nm_service.c
+++ b/src/charon-nm/nm/nm_service.c
@@ -409,16 +409,6 @@ static gboolean connect_(NMVpnServicePlugin *plugin, NMConnection *connection,
{
user = identification_create_from_string((char*)str);
str = nm_setting_vpn_get_secret(vpn, "password");
- if (auth_class == AUTH_CLASS_PSK &&
- strlen(str) < 20)
- {
- g_set_error(err, NM_VPN_PLUGIN_ERROR,
- NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- "pre-shared key is too short.");
- gateway->destroy(gateway);
- user->destroy(user);
- return FALSE;
- }
priv->creds->set_username_password(priv->creds, user, (char*)str);
}
}
--
2.21.0