summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/baseX.nix8
-rw-r--r--lass/2configs/default.nix2
-rw-r--r--lass/2configs/dns-stuff.nix1
-rw-r--r--lass/2configs/screenlock.nix17
4 files changed, 6 insertions, 22 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 9d4ad8c6a..a8bb8693f 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -6,7 +6,6 @@ in {
imports = [
./mpv.nix
./power-action.nix
- ./screenlock.nix
./copyq.nix
./xresources.nix
./livestream.nix
@@ -31,15 +30,15 @@ in {
options.lass.fonts = {
regular = mkOption {
type = types.str;
- default = "xft:Hack-Regular:pixelsize=11,xft:Symbola";
+ default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
};
bold = mkOption {
type = types.str;
- default = "xft:Hack-Bold:pixelsize=11,xft:Symbola";
+ default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
};
italic = mkOption {
type = types.str;
- default = "xft:Hack-RegularOblique:pixelsize=11,xft:Symbol";
+ default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
};
};
}
@@ -136,4 +135,5 @@ in {
};
services.urxvtd.enable = true;
+ lass.screenlock.enable = true;
}
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index f745dc4a1..10d14e151 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -50,7 +50,7 @@ with import <stockholm/lib>;
NIX_PATH = mkForce "secrets=/var/src/stockholm/null:/var/src";
};
}
- (let ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; in {
+ (let ca-bundle = "/etc/ssl/certs/ca-bundle.crt"; in {
environment.variables = {
CURL_CA_BUNDLE = ca-bundle;
GIT_SSL_CAINFO = ca-bundle;
diff --git a/lass/2configs/dns-stuff.nix b/lass/2configs/dns-stuff.nix
index e305145f5..411b07503 100644
--- a/lass/2configs/dns-stuff.nix
+++ b/lass/2configs/dns-stuff.nix
@@ -13,6 +13,7 @@ with import <stockholm/lib>;
};
services.dnsmasq = {
enable = true;
+ resolveLocalQueries = false;
extraConfig = ''
server=127.1.0.1
#no-resolv
diff --git a/lass/2configs/screenlock.nix b/lass/2configs/screenlock.nix
deleted file mode 100644
index b5bc4ee2a..000000000
--- a/lass/2configs/screenlock.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ pkgs, config, ... }:
-
-{
- systemd.services.screenlock = {
- before = [ "sleep.target" ];
- wantedBy = [ "sleep.target" ];
- environment = {
- DISPLAY = ":0";
- };
- serviceConfig = {
- SyslogIdentifier = "screenlock";
- ExecStart = "${pkgs.i3lock}/bin/i3lock -i /var/lib/wallpaper/wallpaper -f";
- Type = "forking";
- User = "lass";
- };
- };
-}