Compare commits
2 Commits
01e082062d
...
17d33ad93e
Author | SHA1 | Date |
---|---|---|
Peder Bergebakken Sundt | 17d33ad93e | |
Peder Bergebakken Sundt | fd547a8e57 |
2
base.nix
2
base.nix
|
@ -37,7 +37,7 @@
|
||||||
|
|
||||||
# TODO: selectively whitelist
|
# TODO: selectively whitelist
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
nixpkgs.config.allowUnfreePredicate = (pkg: true);
|
nixpkgs.config.allowUnfreePredicate = pkg: true;
|
||||||
nixpkgs.config.nonfreeLicensing = true; # used by ffmpeg
|
nixpkgs.config.nonfreeLicensing = true; # used by ffmpeg
|
||||||
|
|
||||||
hardware.enableRedistributableFirmware = true;
|
hardware.enableRedistributableFirmware = true;
|
||||||
|
|
|
@ -76,7 +76,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
# nvidia bad
|
# nvidia bad
|
||||||
nixpkgs.config.packageOverrides = (pkgs: {
|
nixpkgs.config.packageOverrides = pkgs: {
|
||||||
/** /
|
/** /
|
||||||
teams = pkgs.teams.overrideAttrs (old: rec {
|
teams = pkgs.teams.overrideAttrs (old: rec {
|
||||||
postInstall = (old.postInstall or "") + ''
|
postInstall = (old.postInstall or "") + ''
|
||||||
|
@ -111,5 +111,5 @@
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
/**/
|
/**/
|
||||||
});
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
services.matrix-synapse = {
|
services.matrix-synapse = {
|
||||||
#enable = true;
|
#enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
server_name = "${config.networking.domain}"
|
server_name = "${config.networking.domain}";
|
||||||
public_baseurl = mkDomain "matrix";
|
public_baseurl = mkDomain "matrix";
|
||||||
url_preview_enabled = false;
|
url_preview_enabled = false;
|
||||||
max_upload_size = "100M";
|
max_upload_size = "100M";
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
preferences.replaceTwitter = mkDomain "nitter"; # Replace Twitter links with links to this instance (blank to disable). default is ""
|
preferences.replaceTwitter = mkDomain "nitter"; # Replace Twitter links with links to this instance (blank to disable). default is ""
|
||||||
preferences.replaceYouTube = lib.mkIf config.services.invidious.enable (mkDomain "invidious"); # Replace YouTube links with links to this instance (blank to disable). default is ""
|
preferences.replaceYouTube = lib.mkIf config.services.invidious.enable (mkDomain "invidious"); # Replace YouTube links with links to this instance (blank to disable). default is ""
|
||||||
settings = lib.mkIf config.services.libreddit.enable {
|
settings = lib.mkIf config.services.libreddit.enable {
|
||||||
Preferences.replaceReddit = (mkDomain "libreddit"); # Replace Reddit links with links to this instance (blank to disable). default is ""
|
Preferences.replaceReddit = mkDomain "libreddit"; # Replace Reddit links with links to this instance (blank to disable). default is ""
|
||||||
};
|
};
|
||||||
#preferences.stickyProfile = ; # Make profile sidebar stick to top. default is true
|
#preferences.stickyProfile = ; # Make profile sidebar stick to top. default is true
|
||||||
preferences.theme = "Twitter Dark"; # Instance theme. default is "Nitter"
|
preferences.theme = "Twitter Dark"; # Instance theme. default is "Nitter"
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
statdPort = 4000;
|
statdPort = 4000;
|
||||||
extraNfsdConfig = '''';
|
extraNfsdConfig = '''';
|
||||||
};
|
};
|
||||||
networking.firewall = lib.mkIf (config.services.nfs.server.enable) {
|
networking.firewall = lib.mkIf config.services.nfs.server.enable {
|
||||||
# for NFSv3; view with `rpcinfo -p`
|
# for NFSv3; view with `rpcinfo -p`
|
||||||
allowedTCPPorts = [ 111 2049 4000 4001 4002 ]; # 20048
|
allowedTCPPorts = [ 111 2049 4000 4001 4002 ]; # 20048
|
||||||
allowedUDPPorts = [ 111 2049 4000 4001 4002 ]; # 20048
|
allowedUDPPorts = [ 111 2049 4000 4001 4002 ]; # 20048
|
||||||
|
|
|
@ -13,15 +13,13 @@
|
||||||
};
|
};
|
||||||
# TODO: combine nameValuePair and listToAttrs
|
# TODO: combine nameValuePair and listToAttrs
|
||||||
joinSets = sets: builtins.foldl' (l: r: l // r) {} sets;
|
joinSets = sets: builtins.foldl' (l: r: l // r) {} sets;
|
||||||
in joinSets (
|
# TODO: space in dirname is not supported
|
||||||
# TODO: space in dirname is not supported
|
in joinSets (map (mkMount "/mnt/freon" "192.168.1.3:/Freon") [
|
||||||
(map (mkMount "/mnt/freon" "192.168.1.3:/Freon") [
|
|
||||||
""
|
""
|
||||||
"/Backups"
|
"/Backups"
|
||||||
"/ISO"
|
"/ISO"
|
||||||
"/Games"
|
"/Games"
|
||||||
"/Images"
|
"/Images"
|
||||||
])
|
]);
|
||||||
);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,9 +47,8 @@
|
||||||
};
|
};
|
||||||
# TODO: combine nameValuePair and listToAttrs
|
# TODO: combine nameValuePair and listToAttrs
|
||||||
joinSets = sets: builtins.foldl' (l: r: l // r) {} sets;
|
joinSets = sets: builtins.foldl' (l: r: l // r) {} sets;
|
||||||
in joinSets (
|
# TODO: space in dirname is not supported
|
||||||
# TODO: space in dirname is not supported
|
in joinSets (map (mkMount "/mnt/fridgepool" "10.48.101.252:/pub") [
|
||||||
(map (mkMount "/mnt/fridgepool" "10.48.101.252:/pub") [
|
|
||||||
# zfs list -rHo mountpoint,sharenfs fridpool/pub | grep ro= | cut -f1
|
# zfs list -rHo mountpoint,sharenfs fridpool/pub | grep ro= | cut -f1
|
||||||
""
|
""
|
||||||
"/ebook"
|
"/ebook"
|
||||||
|
@ -114,7 +113,6 @@
|
||||||
"/software/win"
|
"/software/win"
|
||||||
"/wallpapers"
|
"/wallpapers"
|
||||||
"/webcomics"
|
"/webcomics"
|
||||||
])
|
]);
|
||||||
);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,16 +13,14 @@
|
||||||
};
|
};
|
||||||
# TODO: combine nameValuePair and listToAttrs
|
# TODO: combine nameValuePair and listToAttrs
|
||||||
joinSets = sets: builtins.foldl' (l: r: l // r) {} sets;
|
joinSets = sets: builtins.foldl' (l: r: l // r) {} sets;
|
||||||
in joinSets (
|
# TODO: space in dirname is not supported
|
||||||
# TODO: depend on nox.networking.interfaces.eno1.ipv4.addresses
|
in joinSets (map (mkMount "/mnt/meconium" "192.168.1.8:/Meconium" ) [
|
||||||
(map (mkMount "/mnt/meconium" "192.168.1.8:/Meconium" ) [
|
|
||||||
""
|
""
|
||||||
"/backups"
|
"/backups"
|
||||||
"/backups/rocm"
|
"/backups/rocm"
|
||||||
"/beets_music"
|
"/beets_music"
|
||||||
#"/garage"
|
#"/garage"
|
||||||
#"/garage/gunktrunk"
|
#"/garage/gunktrunk"
|
||||||
])
|
]);
|
||||||
);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,9 +13,8 @@
|
||||||
};
|
};
|
||||||
# TODO: combine nameValuePair and listToAttrs
|
# TODO: combine nameValuePair and listToAttrs
|
||||||
joinSets = sets: builtins.foldl' (l: r: l // r) {} sets;
|
joinSets = sets: builtins.foldl' (l: r: l // r) {} sets;
|
||||||
in joinSets (
|
# TODO: space in dirname is not supported
|
||||||
# TODO: space in dirname is not supported
|
in joinSets (map (mkMount "/mnt/reidun" "192.168.1.3:/Reidun/shared") [
|
||||||
(map (mkMount "/mnt/reidun" "192.168.1.3:/Reidun/shared") [
|
|
||||||
""
|
""
|
||||||
#"/Backups"
|
#"/Backups"
|
||||||
#"/Comics"
|
#"/Comics"
|
||||||
|
@ -54,7 +53,6 @@
|
||||||
"/Work/Programming"
|
"/Work/Programming"
|
||||||
"/Work/School"
|
"/Work/School"
|
||||||
"/pub"
|
"/pub"
|
||||||
])
|
]);
|
||||||
);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
ignore = ['.direnv']
|
||||||
|
nix_version = '2.18'
|
||||||
|
disabled = [
|
||||||
|
# "bool_comparison", # W01
|
||||||
|
# "empty_let_in", # W02
|
||||||
|
"manual_inherit", # W03
|
||||||
|
"manual_inherit_from", # W04
|
||||||
|
# "legacy_let_syntax", # W05
|
||||||
|
# "collapsible_let_in", # W06
|
||||||
|
# "eta_reduction", # W07
|
||||||
|
# "useless_parens", # W08
|
||||||
|
# "empty_pattern", # W10
|
||||||
|
# "redundant_pattern_bind", # W11
|
||||||
|
# "unquoted_uri", # W12
|
||||||
|
# "deprecated_is_null", # W13
|
||||||
|
# "empty_inherit", # W14
|
||||||
|
# "faster_groupby", # W15
|
||||||
|
# "faster_zipattrswith", # W16
|
||||||
|
# "deprecated_to_path", # W17
|
||||||
|
# "bool_simplification", # W18
|
||||||
|
# "useless_has_attr", # W19
|
||||||
|
"repeated_keys", # W20
|
||||||
|
# "empty_list_concat", # W23
|
||||||
|
]
|
|
@ -142,6 +142,8 @@
|
||||||
bin = "python -c 'import sys; sys.stdout.write(sys.stdin.read().strip())' | curl -is -X POST https://i.kuklef.se/upload -F content=@- -F expiration=10d | grep '^location:' | cut -d' ' -f2-";
|
bin = "python -c 'import sys; sys.stdout.write(sys.stdin.read().strip())' | curl -is -X POST https://i.kuklef.se/upload -F content=@- -F expiration=10d | grep '^location:' | cut -d' ' -f2-";
|
||||||
|
|
||||||
denix = "sed -E 's@/nix/store/[^ /]+@@g'";
|
denix = "sed -E 's@/nix/store/[^ /]+@@g'";
|
||||||
|
|
||||||
|
ns = "nix-shell -p";
|
||||||
};
|
};
|
||||||
|
|
||||||
home.enableNixpkgsReleaseCheck = true;
|
home.enableNixpkgsReleaseCheck = true;
|
||||||
|
|
|
@ -64,7 +64,7 @@ in {
|
||||||
_complete_jump_marks() {
|
_complete_jump_marks() {
|
||||||
local curw=''${COMP_WORDS[COMP_CWORD]}
|
local curw=''${COMP_WORDS[COMP_CWORD]}
|
||||||
local wordlist=$(find "$_JUMP_MARKPATH" -type l -printf "%f\n")
|
local wordlist=$(find "$_JUMP_MARKPATH" -type l -printf "%f\n")
|
||||||
COMPREPLY=($(compgen -W ''\'''${wordlist[@]}' -- "$curw"))
|
COMPREPLY=($(compgen -W ''\''${wordlist[@]}' -- "$curw"))
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
complete -F _complete_jump_marks jump unmark
|
complete -F _complete_jump_marks jump unmark
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
# found by running `nix run nixpkgs#xdg-ninja`
|
# found by running `nix run nixpkgs#xdg-ninja`
|
||||||
|
|
||||||
# TODO:
|
# TODO:
|
||||||
|
/** /
|
||||||
|
|
||||||
export ANDROID_HOME="$XDG_DATA_HOME"/android
|
export ANDROID_HOME="$XDG_DATA_HOME"/android
|
||||||
export HISTFILE="${XDG_STATE_HOME}"/bash/history
|
export HISTFILE="${XDG_STATE_HOME}"/bash/history
|
||||||
export CARGO_HOME="$XDG_DATA_HOME"/cargo
|
export CARGO_HOME="$XDG_DATA_HOME"/cargo
|
||||||
|
@ -18,5 +20,6 @@
|
||||||
export LESSHISTFILE="$XDG_CACHE_HOME"/less/history
|
export LESSHISTFILE="$XDG_CACHE_HOME"/less/history
|
||||||
export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
|
export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
|
||||||
export VAGRANT_HOME="$XDG_DATA_HOME"/vagrant
|
export VAGRANT_HOME="$XDG_DATA_HOME"/vagrant
|
||||||
|
/**/
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue