summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/base.nix8
-rw-r--r--lass/2configs/browsers.nix2
-rw-r--r--lass/2configs/desktop-base.nix4
-rw-r--r--lass/2configs/firefoxPatched.nix58
-rw-r--r--lass/2configs/programs.nix1
-rw-r--r--lass/2configs/retiolum.nix1
-rw-r--r--lass/2configs/texlive.nix7
-rw-r--r--lass/2configs/zsh.nix10
8 files changed, 79 insertions, 12 deletions
diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 7c4835461..46435649b 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -42,9 +42,11 @@ with lib;
enable = true;
search-domain = "retiolum";
exim-retiolum.enable = true;
- build.deps.nixpkgs = {
- url = https://github.com/Lassulus/nixpkgs;
- rev = "e74d0e7ff83c16846a81e1173543f180ad565076";
+ build.source = {
+ git.nixpkgs = {
+ url = https://github.com/Lassulus/nixpkgs;
+ rev = "68bd8e4a9dc247726ae89cc8739574261718e328";
+ };
};
};
diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix
index 4fe06b729..f37dace2c 100644
--- a/lass/2configs/browsers.nix
+++ b/lass/2configs/browsers.nix
@@ -62,7 +62,7 @@ in {
imports = [
../3modules/per-user.nix
] ++ [
- ( createFirefoxUser "ff" [ "audio" ] [ pkgs.firefox ] )
+ ( createFirefoxUser "ff" [ "audio" ] [ ] )
( createChromiumUser "cr" [ "audio" ] [ pkgs.chromium ] )
( createChromiumUser "fb" [ ] [ pkgs.chromium ] )
( createChromiumUser "gm" [ ] [ pkgs.chromium ] )
diff --git a/lass/2configs/desktop-base.nix b/lass/2configs/desktop-base.nix
index 52c29d7e8..8ae768ca9 100644
--- a/lass/2configs/desktop-base.nix
+++ b/lass/2configs/desktop-base.nix
@@ -61,4 +61,8 @@ in {
xkbOptions = "caps:backspace";
};
+ services.logind.extraConfig = ''
+ HandleLidSwitch=ignore
+ '';
+
}
diff --git a/lass/2configs/firefoxPatched.nix b/lass/2configs/firefoxPatched.nix
new file mode 100644
index 000000000..daf8a28be
--- /dev/null
+++ b/lass/2configs/firefoxPatched.nix
@@ -0,0 +1,58 @@
+{ config, lib, pkgs, ... }:
+
+let
+ lpkgs = import ../5pkgs { inherit pkgs; };
+
+ inherit (lib)
+ concatMapStrings
+ ;
+
+ plugins = with lpkgs.firefoxPlugins; [
+ noscript
+ ublock
+ vimperator
+ ];
+
+ copyXpi = plugin:
+ "cp ${plugin}/*.xpi $out/usr/lib/firefox-*/browser/extensions/";
+
+ preferences = pkgs.writeText "autoload.js" ''
+ pref('general.config.filename', 'firefox.cfg');
+ pref('general.config.obscure_value', 0);
+ '';
+
+ config = pkgs.writeText "firefox.cfg" ''
+ //
+ lockPref("app.update.enabled", false);
+ lockPref("extensions.update.enabled", false);
+ lockPref("autoadmin.global_config_url", "");
+ lockPref("extensions.checkUpdateSecurity", false);
+ lockPref("services.sync.enabled", false);
+ lockPref("browser.shell.checkDefaultBrowser", false);
+ lockPref("layout.spellcheckDefault", 0);
+ lockPref("app.update.auto", false);
+ lockPref("browser.newtabpage.enabled", false);
+ lockPref("noscript.firstRunRedirection", false);
+ lockPref("noscript.hoverUI", false);
+ lockPref("noscript.notify", false);
+ defaultPref("extensions.newAddons", false);
+ defaultPref("extensions.autoDisableScopes", 0);
+ defaultPref("plugin.scan.plid.all", false);
+ '';
+
+in {
+ environment.systemPackages = [
+ (pkgs.lib.overrideDerivation pkgs.firefox-bin (original : {
+ installPhase = ''
+ ${original.installPhase}
+ find $out/usr/lib
+ ${concatMapStrings copyXpi plugins}
+ cd $out/usr/lib/firefox-*/
+ mkdir -p browser/defaults/preferences
+ cp ${preferences} browser/defaults/preferences/autoload.js
+ cp ${config} ./firefox.cfg
+ '';
+ }))
+ ];
+}
+
diff --git a/lass/2configs/programs.nix b/lass/2configs/programs.nix
index 41d241bac..e4840383f 100644
--- a/lass/2configs/programs.nix
+++ b/lass/2configs/programs.nix
@@ -7,7 +7,6 @@
gnupg1compat
htop
i3lock
- mc
mosh
mpv
pass
diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix
index 17cd1d822..d7df15027 100644
--- a/lass/2configs/retiolum.nix
+++ b/lass/2configs/retiolum.nix
@@ -21,6 +21,7 @@
connectTo = [
"fastpoke"
"cloudkrebs"
+ "echelon"
"pigstarter"
"gum"
"flap"
diff --git a/lass/2configs/texlive.nix b/lass/2configs/texlive.nix
index 18d72297d..fa20ef81f 100644
--- a/lass/2configs/texlive.nix
+++ b/lass/2configs/texlive.nix
@@ -2,6 +2,11 @@
{
environment.systemPackages = with pkgs; [
- texLive
+ (texLiveAggregationFun { paths = [
+ texLive
+ texLiveExtra
+ texLiveCMSuper
+ texLiveModerncv
+ ];})
];
}
diff --git a/lass/2configs/zsh.nix b/lass/2configs/zsh.nix
index 646e816fd..64aa45823 100644
--- a/lass/2configs/zsh.nix
+++ b/lass/2configs/zsh.nix
@@ -57,7 +57,7 @@
#exports
export EDITOR='vim'
export MANPAGER='most'
- export PAGER='vim -'
+ export PAGER='vim -R -'
# export MANPAGER='sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | vim -R -c "set ft=man nonu nomod nolist" -'
#beautiful colors
@@ -103,23 +103,21 @@
case $UID in
0)
- username='%F{red}root%f'
+ username='%F{red}root%f '
;;
1337)
username=""
;;
*)
- username='%F{blue}%n%f'
+ username='%F{blue}%n%f '
;;
esac
if test -n "$SSH_CLIENT"; then
PROMPT="$error$username@%F{magenta}%M%f %~ "
else
- PROMPT="$error$username %~ "
+ PROMPT="$error$username%~ "
fi
-
-
'';
};
users.defaultUserShell = "/run/current-system/sw/bin/zsh";