dadada/nix-config
dadada/nix-config
1
0
Fork 0
Code Issues 2 Pull requests 5 Projects Releases Packages Wiki Activity Actions

wip

Browse source
This commit is contained in:
Tim Schubert 2021-06-02 21:38:52 +02:00
parent 2dcf9e12a7
commit 9b8bb5e88d
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
10 changed files with 41 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hosts/gorgon/default.nix
View file

@ -26,10 +26,10 @@ in
dadada = {
admin.enable = false;
steam.enable = true;
fido2 = {
credential = "04ea2813a116f634e90f9728dbbb45f1c0f93b7811941a5a14fb75e711794df0c26552dae2262619c1da2be7562ec9dd94888c71a9326fea70dfe16214b5ea8ec01473070000";
enablePam = true;
};
#fido2 = {
# credential = "04ea2813a116f634e90f9728dbbb45f1c0f93b7811941a5a14fb75e711794df0c26552dae2262619c1da2be7562ec9dd94888c71a9326fea70dfe16214b5ea8ec01473070000";
# enablePam = true;
#};
luks.uuid = "3d0e5b93-90ca-412a-b4e0-3e6bfa47d3f4";
networking = {
enableBsShare = true;
@ -95,7 +95,7 @@ in
services.xserver.enable = true;
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome3.enable = true;
services.xserver.desktopManager.gnome.enable = true;
programs.sway = {
enable = true;

5
hosts/gorgon/home/default.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, unstable, lib, ... }:
{ config, pkgs, lib, ... }:
let
this = import ../../.. { inherit pkgs; };
useFeatures = [
@ -16,7 +16,6 @@ let
"xdg"
"zsh"
];
unstable = import <nixpkgs-unstable> {};
in
{
nixpkgs.overlays = [
@ -60,5 +59,5 @@ in
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
home.packages = import ./pkgs.nix { pkgs = pkgs; unstable = unstable; };
home.packages = import ./pkgs.nix { inherit pkgs; };
}

8
hosts/gorgon/home/pkgs.nix
View file

@ -1,4 +1,4 @@
{ pkgs, unstable }:
{ pkgs }:
with pkgs; [
anki
aspell
@ -24,10 +24,6 @@ with pkgs; [
fzf
gdb
gimp
gnome4.gnome-tweak-tool
gnome4.nautilus
gnome4.vinagre
gnomeExtensions.paperwm
gnucash
gnumake
gnupg
@ -69,7 +65,6 @@ with pkgs; [
python3
python38Packages.dateutil
python38Packages.managesieve
python38Packages.solo-python
recipemd
ripgrep
rustup
@ -92,5 +87,4 @@ with pkgs; [
git-lfs
gitAndTools.hub
gitAndTools.lab
unstable.android-studio
]

4
modules/home/gtk.nix
View file

@ -17,9 +17,5 @@ in
font.package = pkgs.cantarell-fonts;
font.name = "Cantarell";
};
qt = {
enable = true;
platformTheme = "gnome";
};
};
}

35
modules/networking.nix
View file

@ -23,21 +23,26 @@ in
networking.resolvconf.useLocalResolver = mkIf cfg.useLocalResolver true;
services.unbound = mkIf cfg.useLocalResolver {
enable = true;
allowedAccess = [
"127.0.0.1/8"
"::1"
];
extraConfig = ''
tls-upstream: yes
tls-cert-bundle: "/etc/ssl/certs/ca-bundle.crt"
forward-zone:
name: .
forward-tls-upstream: yes
forward-addr: 2606:4700:4700::1001@853#cloudflare-dns.com
forward-addr: 2606:4700:4700::1111@853#cloudflare-dns.com
forward-addr: 1.1.1.1@853#cloudflare-dns.com
forward-addr: 1.0.0.1@853#cloudflare-dns.com
'';
settings = {
server.interface = [
"127.0.0.1"
"::1"
];
tls-upstream = "yes";
tls-cert-bundle = "/etc/ssl/certs/ca-bundle.crt";
forward-zone = [
{
name = ".";
forward-tls-upstream = "yes";
forward-addr = [
"2606:4700:4700::1001@853#cloudflare-dns.com"
"2606:4700:4700::1111@853#cloudflare-dns.com"
"1.1.1.1@853#cloudflare-dns.com"
"1.0.0.1@853#cloudflare-dns.com"
];
}
];
};
};
networking.useDHCP = false;

3
modules/profiles/laptop/default.nix
View file

@ -3,6 +3,9 @@ with lib;
{
#nixpkgs.overlays = attrValues (import ../../../overlays);
# conflicts with power-management
services.tlp.enable = false;
boot.kernelPackages = pkgs.linuxPackages_latest;
networking.domain = mkDefault "dadada.li";

3
pkgs/deploy.nix
View file

@ -1,4 +1,5 @@
{ stdenv
, lib
, git
, openssh
, bash
@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
install $script $out/bin/
done
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "deploy scripts";
license = licenses.publicDomain;
platforms = platforms.linux;

4
pkgs/keys/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv }:
{ stdenv, lib }:
stdenv.mkDerivation rec {
name = "dadadaKeys";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
cp * $out
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Public keys for my infrastructure";
license = licenses.publicDomain;
platforms = platforms.all;

2
pkgs/python-pkgs/recipemd/default.nix
View file

@ -47,7 +47,7 @@ buildPythonPackage rec {
pythonPackages.pytestcov
];
#doCheck = true;
doCheck = false;
meta = with lib; {
description = "Markdown recipe manager, reference implementation of RecipeMD";

10
pkgs/scripts.nix
View file

@ -1,9 +1,9 @@
{ stdenv }:
{ pkgs, stdenv, lib }:
(import
(builtins.fetchGit {
(pkgs.fetchgit {
url = "https://git.dadada.li/dadada/scripts.git";
ref = "main";
rev = "3393073cd3511d43f622972b891a20ba069fa052";
sha256 = "0pspybphfqmccl9w97dr89g47dbxk8ly05x8x7c313a5i3pzd5lm";
rev = "e1a887a658da130c2a513d4c770d5026565c4e69";
})
{ inherit stdenv; })
{ stdenv = stdenv; lib = lib; })