mirror of
https://github.com/kmein/niveum
synced 2026-03-20 12:01:06 +01:00
Compare commits
5 Commits
111d9aa8de
...
cb0307e8bf
| Author | SHA1 | Date | |
|---|---|---|---|
| cb0307e8bf | |||
| bafb872730 | |||
| b82636ff12 | |||
| 624df65fee | |||
| 7b96a2a326 |
@@ -1,29 +1,38 @@
|
||||
{pkgs, ...}:
|
||||
# https://paste.sr.ht/~erictapen/11716989e489b600f237041b6d657fdf0ee17b34
|
||||
let
|
||||
name = "dst-root-ca-x3.pem";
|
||||
certificate = pkgs.stdenv.mkDerivation {
|
||||
inherit name;
|
||||
src = builtins.toFile "${name}.sed" ''
|
||||
1,/DST Root CA X3/d
|
||||
1,/-----END CERTIFICATE-----/p
|
||||
'';
|
||||
nativeBuildInputs = with pkgs; [cacert gnused];
|
||||
phases = "installPhase";
|
||||
installPhase = ''
|
||||
${pkgs.gnused}/bin/sed -n -f $src ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt > $out
|
||||
'';
|
||||
};
|
||||
in {
|
||||
networking.wireless.networks."36C3" = {
|
||||
auth = ''
|
||||
key_mgmt=WPA-EAP
|
||||
eap=TTLS
|
||||
identity="kmein"
|
||||
password=" "
|
||||
ca_cert="${certificate}"
|
||||
altsubject_match="DNS:radius.c3noc.net"
|
||||
phase2="auth=PAP"
|
||||
'';
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
networking.networkmanager.ensureProfiles.profiles = {
|
||||
"39C3" = {
|
||||
connection = {
|
||||
id = "39C3";
|
||||
type = "wifi";
|
||||
};
|
||||
wifi = {
|
||||
mode = "infrastructure";
|
||||
ssid = "39C3";
|
||||
};
|
||||
wifi-security = {
|
||||
auth-alg = "open";
|
||||
key-mgmt = "wpa-eap";
|
||||
};
|
||||
"802-1x" = {
|
||||
anonymous-identity = "39C3";
|
||||
eap = "ttls;";
|
||||
identity = "39C3";
|
||||
password = "39C3";
|
||||
phase2-auth = "pap";
|
||||
altsubject-matches = "DNS:radius.c3noc.net";
|
||||
ca-cert = "${builtins.fetchurl {
|
||||
url = "https://letsencrypt.org/certs/isrgrootx1.pem";
|
||||
sha256 = "sha256:1la36n2f31j9s03v847ig6ny9lr875q3g7smnq33dcsmf2i5gd92";
|
||||
}}";
|
||||
};
|
||||
ipv4 = {
|
||||
method = "auto";
|
||||
};
|
||||
ipv6 = {
|
||||
addr-gen-mode = "default";
|
||||
method = "auto";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -199,7 +199,6 @@ in
|
||||
./bash.nix
|
||||
./bluetooth.nix
|
||||
./aerc.nix
|
||||
./ccc.nix
|
||||
./khal.nix
|
||||
./browser.nix
|
||||
./clipboard.nix
|
||||
|
||||
@@ -10,6 +10,10 @@
|
||||
# pkgs.freeciv
|
||||
# pkgs.lincity-ng
|
||||
# pkgs.superTuxKart
|
||||
|
||||
pkgs.morris
|
||||
pkgs.gnome-chess
|
||||
pkgs.gnuchess
|
||||
];
|
||||
networking.firewall = {
|
||||
# for 0ad multiplayer
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
});
|
||||
in {
|
||||
environment.variables.EDITOR = lib.getExe vim-kmein;
|
||||
environment.shellAliases.vi = "nvim";
|
||||
environment.shellAliases.vim = "nvim";
|
||||
environment.shellAliases.view = "nvim -R";
|
||||
|
||||
home-manager.users.me = {
|
||||
|
||||
86
flake.nix
86
flake.nix
@@ -206,6 +206,7 @@
|
||||
final.mpvScripts.mpris
|
||||
];
|
||||
};
|
||||
morris = prev.callPackage packages/morris.nix { };
|
||||
cro = prev.callPackage packages/cro.nix { };
|
||||
dmenu = prev.writers.writeDashBin "dmenu" ''exec ${final.rofi}/bin/rofi -dmenu "$@"'';
|
||||
weechatScripts = prev.weechatScripts // {
|
||||
@@ -219,8 +220,7 @@
|
||||
mdwa-nvim = prev.callPackage packages/vimPlugins/mdwa-nvim.nix { }; # TODO upstream
|
||||
vim-ernest = prev.callPackage packages/vimPlugins/vim-ernest.nix { }; # TODO upstream
|
||||
vim-256noir = prev.callPackage packages/vimPlugins/vim-256noir.nix { }; # TODO upstream
|
||||
vim-colors-paramount =
|
||||
prev.callPackage packages/vimPlugins/vim-colors-paramount.nix { }; # TODO upstream
|
||||
vim-colors-paramount = prev.callPackage packages/vimPlugins/vim-colors-paramount.nix { }; # TODO upstream
|
||||
vim-fetch = prev.callPackage packages/vimPlugins/vim-fetch.nix { }; # TODO upstream
|
||||
vim-fsharp = prev.callPackage packages/vimPlugins/vim-fsharp.nix { }; # TODO upstream
|
||||
vim-mail = prev.callPackage packages/vimPlugins/vim-mail.nix { }; # TODO upstream
|
||||
@@ -234,7 +234,7 @@
|
||||
pls = prev.callPackage packages/pls.nix { };
|
||||
radio-news = prev.callPackage packages/radio-news { };
|
||||
untilport = prev.callPackage packages/untilport.nix { };
|
||||
weechat-declarative = prev.callPackage packages/weechat-declarative.nix {};
|
||||
weechat-declarative = prev.callPackage packages/weechat-declarative.nix { };
|
||||
|
||||
# my packages
|
||||
betacode = prev.callPackage packages/betacode.nix { };
|
||||
@@ -242,7 +242,7 @@
|
||||
default-gateway = prev.callPackage packages/default-gateway.nix { };
|
||||
depp = prev.callPackage packages/depp.nix { };
|
||||
devanagari = prev.callPackage packages/devanagari { };
|
||||
radioStreams = prev.callPackage packages/streams {};
|
||||
radioStreams = prev.callPackage packages/streams { };
|
||||
devour = prev.callPackage packages/devour.nix { };
|
||||
dmenu-randr = prev.callPackage packages/dmenu-randr.nix { };
|
||||
emailmenu = prev.callPackage packages/emailmenu.nix { };
|
||||
@@ -280,7 +280,7 @@
|
||||
ttspaste = prev.callPackage packages/ttspaste.nix { };
|
||||
unicodmenu = prev.callPackage packages/unicodmenu.nix { };
|
||||
vg = prev.callPackage packages/vg.nix { };
|
||||
vim-kmein = prev.callPackage packages/vim-kmein {};
|
||||
vim-kmein = prev.callPackage packages/vim-kmein { };
|
||||
vimv = prev.callPackage packages/vimv.nix { };
|
||||
klem = prev.callPackage packages/klem.nix { };
|
||||
|
||||
@@ -294,14 +294,14 @@
|
||||
pkgs = final;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
nixosConfigurations =
|
||||
let
|
||||
niveumSpecialArgs = system: {
|
||||
unstablePackages = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
overlays = [];
|
||||
overlays = [ ];
|
||||
config.allowUnfreePredicate =
|
||||
pkg:
|
||||
builtins.elem (nixpkgs-unstable.lib.getName pkg) [
|
||||
@@ -465,7 +465,77 @@
|
||||
};
|
||||
in
|
||||
{
|
||||
inherit (pkgs) auc swallow cheat-sh hc kpaste noise-waves trans stag qrpaste new-mac scanned default-gateway kirciuoklis tocharian-font image-convert-favicon image-convert-tolino heuretes mpv-tv mpv-iptv devanagari literature-quote booksplit manual-sort wttr emailmenu closest mpv-radio mpv-tuner cro nix-git text2pdf betacode brassica ipa polyglot jsesh gfs-fonts vim-kmein vimv brainmelter cyberlocker-tools pls untilport radio-news vg ttspaste depp fkill fzfmenu unicodmenu dmenu-randr notemenu man-pdf mansplain opustags q timer rfc gimp obsidian-vim devour go-webring random-zeno stardict-tools weechat-declarative klem radioStreams vim-typewriter ;
|
||||
inherit (pkgs)
|
||||
auc
|
||||
betacode
|
||||
booksplit
|
||||
brainmelter
|
||||
brassica
|
||||
cheat-sh
|
||||
closest
|
||||
cro
|
||||
cyberlocker-tools
|
||||
default-gateway
|
||||
depp
|
||||
devanagari
|
||||
devour
|
||||
dmenu-randr
|
||||
emailmenu
|
||||
fkill
|
||||
fzfmenu
|
||||
gfs-fonts
|
||||
gimp
|
||||
go-webring
|
||||
hc
|
||||
heuretes
|
||||
image-convert-favicon
|
||||
image-convert-tolino
|
||||
ipa
|
||||
jsesh
|
||||
kirciuoklis
|
||||
klem
|
||||
kpaste
|
||||
literature-quote
|
||||
man-pdf
|
||||
mansplain
|
||||
manual-sort
|
||||
morris
|
||||
mpv-iptv
|
||||
mpv-radio
|
||||
mpv-tuner
|
||||
mpv-tv
|
||||
new-mac
|
||||
nix-git
|
||||
noise-waves
|
||||
notemenu
|
||||
obsidian-vim
|
||||
opustags
|
||||
pls
|
||||
polyglot
|
||||
q
|
||||
qrpaste
|
||||
radio-news
|
||||
radioStreams
|
||||
random-zeno
|
||||
rfc
|
||||
scanned
|
||||
stag
|
||||
stardict-tools
|
||||
swallow
|
||||
text2pdf
|
||||
timer
|
||||
tocharian-font
|
||||
trans
|
||||
ttspaste
|
||||
unicodmenu
|
||||
untilport
|
||||
vg
|
||||
vim-kmein
|
||||
vim-typewriter
|
||||
vimv
|
||||
weechat-declarative
|
||||
wttr
|
||||
;
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
44
packages/morris.nix
Normal file
44
packages/morris.nix
Normal file
@@ -0,0 +1,44 @@
|
||||
{
|
||||
stdenv,
|
||||
boost,
|
||||
gtk2,
|
||||
gettext,
|
||||
intltool,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
lib,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "morris";
|
||||
version = "0.3";
|
||||
src = fetchurl {
|
||||
url = "https://nine-mens-morris.net/data/morris-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-f1kOpYB1oXOAKqwb1ya0jfJA5vqxA+v8MjEZ1zPPutM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
intltool
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
gtk2
|
||||
];
|
||||
|
||||
# Help configure find Boost headers
|
||||
configureFlags = [
|
||||
"--with-boost=${boost.dev}"
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nine Men's Morris game";
|
||||
homepage = "https://github.com/farindk/morris";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -8,7 +8,7 @@
|
||||
colorscheme ? null,
|
||||
lib,
|
||||
...
|
||||
}: (neovim.override {
|
||||
}: neovim.override {
|
||||
configure = {
|
||||
vimAlias = true;
|
||||
viAlias = true;
|
||||
@@ -93,4 +93,4 @@
|
||||
];
|
||||
};
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
./hardware-configuration.nix
|
||||
../../configs/networkmanager.nix
|
||||
../../configs/default.nix
|
||||
../../configs/ccc.nix
|
||||
../../configs/gaming.nix
|
||||
# ../../configs/gnome.nix
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user