Merge remote-tracking branch 'ni/master'
This commit is contained in:
commit
15f39ef2e9
21
krebs/5pkgs/simple/python-dnsstamps.nix
Normal file
21
krebs/5pkgs/simple/python-dnsstamps.nix
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
{ python3Packages, lib }:
|
||||||
|
|
||||||
|
python3Packages.buildPythonPackage rec {
|
||||||
|
pname = "dnsstamps";
|
||||||
|
version = "1.3.0";
|
||||||
|
|
||||||
|
src = python3Packages.fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
hash = "sha256:1v334glljw60h9v739jgl8hmyldaawbpv55bbhwq1hcwm5lvdk13";
|
||||||
|
};
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
mv $out/bin/dnsstamp.py $out/bin/dnsstamp
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Create and parse DNS stamps with ease";
|
||||||
|
homepage = "https://github.com/chrisss404/python-dnsstamps";
|
||||||
|
license = lib.licenses.mit;
|
||||||
|
};
|
||||||
|
}
|
|
@ -11,10 +11,8 @@ with import <stockholm/lib>;
|
||||||
boot = {
|
boot = {
|
||||||
initrd = {
|
initrd = {
|
||||||
availableKernelModules = [ "ahci" ];
|
availableKernelModules = [ "ahci" ];
|
||||||
luks = {
|
luks.cryptoModules = [ "aes" "sha512" "xts" ];
|
||||||
cryptoModules = [ "aes" "sha512" "xts" ];
|
luks.devices.luksroot.devices = "/dev/sda2";
|
||||||
devices = [ { name = "luksroot"; device = "/dev/sda2"; } ];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -17,9 +17,7 @@ with import <stockholm/lib>;
|
||||||
|
|
||||||
boot.initrd.luks = {
|
boot.initrd.luks = {
|
||||||
cryptoModules = [ "aes" "sha512" "xts" ];
|
cryptoModules = [ "aes" "sha512" "xts" ];
|
||||||
devices = [
|
devices.luks1.device = "/dev/sda2";
|
||||||
{ name = "luks1"; device = "/dev/sda2"; }
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Don't use UEFI because current disk was partitioned/formatted for AO753.
|
# Don't use UEFI because current disk was partitioned/formatted for AO753.
|
||||||
|
@ -47,6 +45,8 @@ with import <stockholm/lib>;
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
environment.homeBinInPath = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
(writeDashBin "play" ''
|
(writeDashBin "play" ''
|
||||||
set -euf
|
set -euf
|
||||||
|
|
|
@ -75,10 +75,10 @@ with import <stockholm/lib>;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.xserver.desktopManager.plasma5.enable = true;
|
services.xserver.desktopManager.plasma5.enable = true;
|
||||||
services.xserver.displayManager.auto = {
|
|
||||||
enable = true;
|
services.xserver.displayManager.lightdm.autoLogin.enable = true;
|
||||||
user = "itak";
|
services.xserver.displayManager.lightdm.autoLogin.user = "itak";
|
||||||
};
|
services.xserver.displayManager.lightdm.enable = true;
|
||||||
|
|
||||||
users.users.itak = {
|
users.users.itak = {
|
||||||
inherit (config.krebs.users.itak) home uid;
|
inherit (config.krebs.users.itak) home uid;
|
||||||
|
|
|
@ -18,9 +18,7 @@ with import <stockholm/lib>;
|
||||||
|
|
||||||
boot.initrd.luks = {
|
boot.initrd.luks = {
|
||||||
cryptoModules = [ "aes" "sha512" "xts" ];
|
cryptoModules = [ "aes" "sha512" "xts" ];
|
||||||
devices = [
|
devices.wuca.device = "/dev/sda2";
|
||||||
{ name = "wuca"; device = "/dev/sda2"; }
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
|
|
|
@ -113,9 +113,7 @@ with import <stockholm/lib>;
|
||||||
|
|
||||||
boot.initrd.luks = {
|
boot.initrd.luks = {
|
||||||
cryptoModules = [ "aes" "sha512" "xts" ];
|
cryptoModules = [ "aes" "sha512" "xts" ];
|
||||||
devices = [
|
devices.xuca.device = "/dev/sda2";
|
||||||
{ name = "xuca"; device = "/dev/sda2"; }
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
|
|
|
@ -18,9 +18,7 @@ with import <stockholm/lib>;
|
||||||
|
|
||||||
boot.initrd.luks = {
|
boot.initrd.luks = {
|
||||||
cryptoModules = [ "aes" "sha512" "xts" ];
|
cryptoModules = [ "aes" "sha512" "xts" ];
|
||||||
devices = [
|
devices.zuca.device = "/dev/sda2";
|
||||||
{ name = "zuca"; device = "/dev/sda2"; }
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
|
|
|
@ -24,7 +24,13 @@ in {
|
||||||
http://www.exim.org/
|
http://www.exim.org/
|
||||||
|
|
||||||
# ref src/nixpkgs/pkgs/tools/networking/urlwatch/default.nix
|
# ref src/nixpkgs/pkgs/tools/networking/urlwatch/default.nix
|
||||||
https://thp.io/2008/urlwatch/
|
{
|
||||||
|
url = https://thp.io/2008/urlwatch/;
|
||||||
|
# workaround: ('Received response with content-encoding: gzip, but
|
||||||
|
# failed to decode it.', error('Error -3 while decompressing data:
|
||||||
|
# incorrect header check',))
|
||||||
|
ignore_cached = true;
|
||||||
|
}
|
||||||
|
|
||||||
# 2015-02-18
|
# 2015-02-18
|
||||||
# ref ~/src/nixpkgs/pkgs/tools/text/qprint/default.nix
|
# ref ~/src/nixpkgs/pkgs/tools/text/qprint/default.nix
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
with import <stockholm/lib>;
|
with import <stockholm/lib>;
|
||||||
{ config, pkgs, ... }: let
|
{ config, pkgs, ... }: let
|
||||||
cfg = {
|
cfg = {
|
||||||
enable = config.tv.Xresources != {};
|
enable = config.services.xserver.enable && config.tv.Xresources != {};
|
||||||
user = config.krebs.build.user;
|
user = config.krebs.build.user;
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
|
|
|
@ -31,8 +31,9 @@ in {
|
||||||
};
|
};
|
||||||
services.dnsmasq.enable = true;
|
services.dnsmasq.enable = true;
|
||||||
services.dnsmasq.extraConfig = ''
|
services.dnsmasq.extraConfig = ''
|
||||||
|
bind-interfaces
|
||||||
dhcp-range=${cfg.dhcp-range}
|
dhcp-range=${cfg.dhcp-range}
|
||||||
interface=${cfg.interface}
|
listen-address=${cfg.address}
|
||||||
'';
|
'';
|
||||||
tv.iptables.extra.filter.INPUT = [
|
tv.iptables.extra.filter.INPUT = [
|
||||||
"-i ${cfg.interface} -p tcp -m tcp --dport bootps -j ACCEPT"
|
"-i ${cfg.interface} -p tcp -m tcp --dport bootps -j ACCEPT"
|
||||||
|
|
|
@ -18,6 +18,7 @@ import XMonad.Actions.CycleWS (toggleWS)
|
||||||
import XMonad.Layout.NoBorders ( smartBorders )
|
import XMonad.Layout.NoBorders ( smartBorders )
|
||||||
import XMonad.Layout.ResizableTile (ResizableTall(ResizableTall))
|
import XMonad.Layout.ResizableTile (ResizableTall(ResizableTall))
|
||||||
import XMonad.Layout.ResizableTile (MirrorResize(MirrorExpand,MirrorShrink))
|
import XMonad.Layout.ResizableTile (MirrorResize(MirrorExpand,MirrorShrink))
|
||||||
|
import qualified XMonad.Prompt
|
||||||
import qualified XMonad.StackSet as W
|
import qualified XMonad.StackSet as W
|
||||||
import Data.Map (Map)
|
import Data.Map (Map)
|
||||||
import qualified Data.Map as Map
|
import qualified Data.Map as Map
|
||||||
|
@ -154,8 +155,8 @@ myKeys conf = Map.fromList $
|
||||||
, ((_4 , xK_comma ), sendMessage $ IncMasterN 1)
|
, ((_4 , xK_comma ), sendMessage $ IncMasterN 1)
|
||||||
, ((_4 , xK_period ), sendMessage $ IncMasterN (-1))
|
, ((_4 , xK_period ), sendMessage $ IncMasterN (-1))
|
||||||
|
|
||||||
, ((_4 , xK_a ), addWorkspacePrompt def)
|
, ((_4 , xK_a ), addWorkspacePrompt promptXPConfig)
|
||||||
, ((_4 , xK_r ), renameWorkspace def)
|
, ((_4 , xK_r ), renameWorkspace promptXPConfig)
|
||||||
, ((_4 , xK_Delete ), removeEmptyWorkspace)
|
, ((_4 , xK_Delete ), removeEmptyWorkspace)
|
||||||
|
|
||||||
, ((_4 , xK_Return ), toggleWS)
|
, ((_4 , xK_Return ), toggleWS)
|
||||||
|
@ -189,6 +190,9 @@ myKeys conf = Map.fromList $
|
||||||
|
|
||||||
resetLayout = setLayout $ XMonad.layoutHook conf
|
resetLayout = setLayout $ XMonad.layoutHook conf
|
||||||
|
|
||||||
|
promptXPConfig =
|
||||||
|
def { XMonad.Prompt.font = myFont }
|
||||||
|
|
||||||
|
|
||||||
pagerConfig :: PagerConfig
|
pagerConfig :: PagerConfig
|
||||||
pagerConfig = def
|
pagerConfig = def
|
||||||
|
|
Loading…
Reference in New Issue
Block a user