[NixOS] Tweaks to allow system configuration to work with unstable
This commit is contained in:
parent
ef895eba48
commit
64ca9fa3ae
@ -34,17 +34,23 @@ in
|
|||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
nixpkgs.config.android_sdk.accept_license = true;
|
nixpkgs.config.android_sdk.accept_license = true;
|
||||||
|
|
||||||
|
nixpkgs.config.permittedInsecurePackages = [
|
||||||
|
"openssl-1.0.2u"
|
||||||
|
];
|
||||||
|
|
||||||
|
|
||||||
# Security and networking
|
# Security and networking
|
||||||
security.sudo.wheelNeedsPassword = false;
|
security.sudo.wheelNeedsPassword = false;
|
||||||
networking.networkmanager = {
|
networking.networkmanager = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableStrongSwan = true;
|
|
||||||
packages = [ pkgs.networkmanager-l2tp ];
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
[main]
|
[main]
|
||||||
rc-manager=resolvconf
|
rc-manager=resolvconf
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
# Disabling these waits disables the stuck on boot up issue
|
||||||
|
systemd.services.systemd-udev-settle.enable = false;
|
||||||
|
systemd.services.NetworkManager-wait-online.enable = false;
|
||||||
networking.firewall.enable = false;
|
networking.firewall.enable = false;
|
||||||
|
|
||||||
# Audio
|
# Audio
|
||||||
@ -55,8 +61,9 @@ in
|
|||||||
|
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
|
|
||||||
|
console.keyMap = "us";
|
||||||
|
|
||||||
i18n = {
|
i18n = {
|
||||||
consoleKeyMap = "us";
|
|
||||||
defaultLocale = "en_US.UTF-8";
|
defaultLocale = "en_US.UTF-8";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -130,7 +137,7 @@ in
|
|||||||
# Haskell Desktop
|
# Haskell Desktop
|
||||||
(import ../dotfiles/config/taffybar/default.nix)
|
(import ../dotfiles/config/taffybar/default.nix)
|
||||||
(import ../dotfiles/config/xmonad/default.nix)
|
(import ../dotfiles/config/xmonad/default.nix)
|
||||||
notifications-tray-icon
|
# notifications-tray-icon
|
||||||
haskellPackages.status-notifier-item
|
haskellPackages.status-notifier-item
|
||||||
haskellPackages.xmonad
|
haskellPackages.xmonad
|
||||||
haskellPackages.dbus-hslogger
|
haskellPackages.dbus-hslogger
|
||||||
@ -178,7 +185,7 @@ in
|
|||||||
cabal-install
|
cabal-install
|
||||||
cabal2nix
|
cabal2nix
|
||||||
ghc
|
ghc
|
||||||
stack
|
# stack
|
||||||
haskellPackages.hpack
|
haskellPackages.hpack
|
||||||
haskellPackages.hasktags
|
haskellPackages.hasktags
|
||||||
haskellPackages.hoogle
|
haskellPackages.hoogle
|
||||||
@ -195,7 +202,6 @@ in
|
|||||||
# Rust
|
# Rust
|
||||||
cargo
|
cargo
|
||||||
carnix
|
carnix
|
||||||
racer
|
|
||||||
# rls
|
# rls
|
||||||
rustc
|
rustc
|
||||||
|
|
||||||
@ -234,6 +240,7 @@ in
|
|||||||
ispell
|
ispell
|
||||||
jq
|
jq
|
||||||
libtool
|
libtool
|
||||||
|
lorri
|
||||||
lsof
|
lsof
|
||||||
mercurial
|
mercurial
|
||||||
ncdu
|
ncdu
|
||||||
@ -302,7 +309,20 @@ in
|
|||||||
|
|
||||||
services.locate.enable = true;
|
services.locate.enable = true;
|
||||||
|
|
||||||
services.lorri.enable = true;
|
# services.lorri.enable = true;
|
||||||
|
systemd.user.services.lorri = {
|
||||||
|
description = "Lorri Daemon";
|
||||||
|
requires = [ "lorri.socket" ];
|
||||||
|
after = [ "lorri.socket" ];
|
||||||
|
path = with pkgs; [ config.nix.package gnutar gzip gitFull ];
|
||||||
|
serviceConfig = {
|
||||||
|
ExecStart = "${pkgs.lorri}/bin/lorri daemon";
|
||||||
|
PrivateTmp = true;
|
||||||
|
ProtectSystem = "strict";
|
||||||
|
ProtectHome = "read-only";
|
||||||
|
Restart = "on-failure";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
exportConfiguration = true;
|
exportConfiguration = true;
|
||||||
@ -310,10 +330,8 @@ in
|
|||||||
layout = "us";
|
layout = "us";
|
||||||
desktopManager = {
|
desktopManager = {
|
||||||
plasma5.enable = true;
|
plasma5.enable = true;
|
||||||
default = "none";
|
|
||||||
};
|
};
|
||||||
windowManager = {
|
windowManager = {
|
||||||
default = "xmonad";
|
|
||||||
session = [
|
session = [
|
||||||
{
|
{
|
||||||
name = "xmonad";
|
name = "xmonad";
|
||||||
@ -336,7 +354,7 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
sessionCommands = ''
|
sessionCommands = ''
|
||||||
systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS
|
systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user