summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/alnus/config.nix10
-rw-r--r--tv/1systems/mu/config.nix40
-rw-r--r--tv/1systems/querel/config.nix24
-rw-r--r--tv/1systems/xu/config.nix4
-rw-r--r--tv/2configs/default.nix3
-rw-r--r--tv/2configs/man.nix8
-rw-r--r--tv/2configs/networkd.nix4
-rw-r--r--tv/2configs/pulse.nix2
-rw-r--r--tv/2configs/xserver/default.nix4
-rw-r--r--tv/5pkgs/default.nix4
-rw-r--r--tv/5pkgs/haskell/xmonad-tv/src/main.hs8
-rw-r--r--tv/5pkgs/override/default.nix2
-rw-r--r--tv/5pkgs/override/dhcpcd.nix7
-rw-r--r--tv/5pkgs/simple/default.nix2
-rw-r--r--tv/5pkgs/simple/ff.nix2
-rw-r--r--tv/5pkgs/simple/fzmenu/default.nix47
16 files changed, 88 insertions, 83 deletions
diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index 54f845ec2..bddd69efa 100644
--- a/tv/1systems/alnus/config.nix
+++ b/tv/1systems/alnus/config.nix
@@ -15,11 +15,11 @@ with import <stockholm/lib>;
};
};
- environment.systemPackages = with pkgs; [
- firefoxWrapper
- networkmanagerapplet
- (pkgs.pidgin-with-plugins.override {
- plugins = [ pkgs.pidginotr ];
+ environment.systemPackages = [
+ pkgs.firefox
+ pkgs.networkmanagerapplet
+ (pkgs.pidgin.override {
+ plugins = [ pkgs.pidgin-otr ];
})
];
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 7c3f8cfdb..00bd5da15 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -56,26 +56,26 @@ with import <stockholm/lib>;
${pkgs.kmod}/bin/modprobe -v iwlwifi
'';
- environment.systemPackages = with pkgs; [
- chromium
- firefoxWrapper
- gimp
- iptables
- libreoffice
- plasma-pa
- (pkgs.pidgin-with-plugins.override {
- plugins = [ pkgs.pidginotr ];
+ environment.systemPackages = [
+ pkgs.chromium
+ pkgs.firefox
+ pkgs.gimp
+ pkgs.iptables
+ pkgs.libreoffice
+ pkgs.plasma-pa
+ (pkgs.pidgin.override {
+ plugins = [ pkgs.pidgin-otr ];
})
- skype
- slock
- tinc_pre
- vim
- xsane
-
- #foomatic_filters
- #gutenprint
- #cups_pdf_filter
- #ghostscript
+ pkgs.skypeforlinux
+ pkgs.slock
+ pkgs.tinc_pre
+ pkgs.vim
+ pkgs.xsane
+
+ #pkgs.foomatic_filters
+ #pkgs.gutenprint
+ #pkgs.cups_pdf_filter
+ #pkgs.ghostscript
];
@@ -97,7 +97,7 @@ with import <stockholm/lib>;
];
fonts.fonts = [
- pkgs.xlibs.fontschumachermisc
+ pkgs.xorg.fontschumachermisc
];
services.xserver.enable = true;
diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix
index 41253cfb3..44c7685e8 100644
--- a/tv/1systems/querel/config.nix
+++ b/tv/1systems/querel/config.nix
@@ -21,19 +21,19 @@ with import <stockholm/lib>;
systemd-boot.enable = true;
};
- environment.systemPackages = with pkgs; [
- firefoxWrapper
- gimp
- kate
- libreoffice
- (pkgs.pidgin-with-plugins.override {
- plugins = [ pkgs.pidginotr ];
+ environment.systemPackages = [
+ pkgs.firefox
+ pkgs.gimp
+ pkgs.kate
+ pkgs.libreoffice
+ (pkgs.pidgin.override {
+ plugins = [ pkgs.pidgin-otr ];
})
- sxiv
- texlive.combined.scheme-full
- vim
- xsane
- zathura
+ pkgs.sxiv
+ pkgs.texlive.combined.scheme-full
+ pkgs.vim
+ pkgs.xsane
+ pkgs.zathura
];
fileSystems = {
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index 05c5c11b0..8a86e209b 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -45,7 +45,9 @@ with import <stockholm/lib>;
netcup
nmap
p7zip
- pass-otp
+ (pkgs.pass.withExtensions (ext: [
+ ext.pass-otp
+ ]))
q
qrencode
texlive.combined.scheme-full
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 8add07ff6..f3ce2da40 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -15,6 +15,7 @@ with import <stockholm/lib>;
./bash
./htop.nix
./nets/hkw.nix
+ ./networkd.nix
./nginx
./pki
./ssh.nix
@@ -46,7 +47,7 @@ with import <stockholm/lib>;
{
# TODO check if both are required:
- nix.sandboxPaths = [ "/etc/protocols" pkgs.iana_etc.outPath ];
+ nix.sandboxPaths = [ "/etc/protocols" pkgs.iana-etc.outPath ];
nix.requireSignedBinaryCaches = true;
diff --git a/tv/2configs/man.nix b/tv/2configs/man.nix
index 0a72dce2a..c723138f1 100644
--- a/tv/2configs/man.nix
+++ b/tv/2configs/man.nix
@@ -5,9 +5,9 @@
# s:^NROFF\t.*:& -Wbreak:
# '
#'';
- environment.systemPackages = with pkgs; [
- manpages
- posix_man_pages
- xorg.xorgdocs
+ environment.systemPackages = [
+ pkgs.man-pages
+ pkgs.posix_man_pages
+ pkgs.xorg.xorgdocs
];
}
diff --git a/tv/2configs/networkd.nix b/tv/2configs/networkd.nix
new file mode 100644
index 000000000..da0d9ce43
--- /dev/null
+++ b/tv/2configs/networkd.nix
@@ -0,0 +1,4 @@
+{
+ # often hangs
+ systemd.services.systemd-networkd-wait-online.enable = false;
+}
diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix
index f720ad473..513a0eb17 100644
--- a/tv/2configs/pulse.nix
+++ b/tv/2configs/pulse.nix
@@ -2,7 +2,7 @@
with import <stockholm/lib>;
let
- pkg = pkgs.pulseaudioLight;
+ pkg = pkgs.pulseaudio;
runDir = "/run/pulse";
pkgs_i686 = pkgs.pkgsi686Linux;
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index be155af53..8bedb0e81 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -38,7 +38,7 @@ in {
];
fonts.fonts = [
- pkgs.xlibs.fontschumachermisc
+ pkgs.xorg.fontschumachermisc
];
services.xserver = {
@@ -128,7 +128,7 @@ in {
config.imgur.xdg-open.browser = "/etc/profiles/per-user/tv/bin/cr";
config.timeout = 200;
})
- pkgs.pulseaudioLight.out
+ pkgs.pulseaudio.out
pkgs.rxvt_unicode
pkgs.xcalib
"/run/wrappers" # for su
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 2b9bdeeba..5a018a166 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,10 +1,10 @@
-with import <stockholm/lib>;
+with import ../../lib;
let
pushBack = x: xs:
if elem x xs then
remove x xs ++ [ x ]
else
- names;
+ xs;
in
self: super:
diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
index cf0c0f538..81373f410 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/main.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
@@ -7,7 +7,7 @@ module Main (main) where
import System.Exit (exitFailure)
import Control.Exception
-import Control.Monad.Extra (ifM, whenJustM)
+import Control.Monad.Extra (whenJustM)
import qualified Data.List
import Graphics.X11.ExtraTypes.XF86
import Text.Read (readEither)
@@ -68,7 +68,9 @@ mainNoArgs :: IO ()
mainNoArgs = do
workspaces0 <- getWorkspaces0
handleShutdownEvent <- newShutdownEventHandler
- launch
+ let
+ config =
+ id
$ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ")
$ def
{ terminal = {-pkg:rxvt_unicode-}"urxvtc"
@@ -100,6 +102,8 @@ mainNoArgs = do
, focusedBorderColor = "#f000b0"
, handleEventHook = handleShutdownEvent
}
+ directories <- getDirectories
+ launch config directories
getWorkspaces0 :: IO [String]
diff --git a/tv/5pkgs/override/default.nix b/tv/5pkgs/override/default.nix
index 4cc4749d0..f719a9f69 100644
--- a/tv/5pkgs/override/default.nix
+++ b/tv/5pkgs/override/default.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ../../../lib;
self: super:
mapNixDir (path: import path self super) ./.
diff --git a/tv/5pkgs/override/dhcpcd.nix b/tv/5pkgs/override/dhcpcd.nix
deleted file mode 100644
index 202b8e5da..000000000
--- a/tv/5pkgs/override/dhcpcd.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-self: super:
-
-self.lib.overrideDerivation super.dhcpcd (old: {
- configureFlags = old.configureFlags ++ [
- "--dbdir=/var/lib/dhcpcd"
- ];
-})
diff --git a/tv/5pkgs/simple/default.nix b/tv/5pkgs/simple/default.nix
index 6ba4fec83..9fb45dd1a 100644
--- a/tv/5pkgs/simple/default.nix
+++ b/tv/5pkgs/simple/default.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ../../../lib;
self: super:
diff --git a/tv/5pkgs/simple/ff.nix b/tv/5pkgs/simple/ff.nix
index ec20c4a2f..4ce9c3c75 100644
--- a/tv/5pkgs/simple/ff.nix
+++ b/tv/5pkgs/simple/ff.nix
@@ -1,5 +1,5 @@
{ pkgs }:
pkgs.writeDashBin "ff" ''
- exec ${pkgs.firefoxWrapper}/bin/firefox "$@"
+ exec ${pkgs.firefox}/bin/firefox "$@"
''
diff --git a/tv/5pkgs/simple/fzmenu/default.nix b/tv/5pkgs/simple/fzmenu/default.nix
index 1f1b82848..634d8338b 100644
--- a/tv/5pkgs/simple/fzmenu/default.nix
+++ b/tv/5pkgs/simple/fzmenu/default.nix
@@ -1,37 +1,38 @@
-{ lib, stdenv
-, runCommand
-, coreutils, dash, gnused, fzf, pass-otp, rxvt_unicode, utillinux, xdotool
-}:
+{ lib, pkgs, stdenv }:
-runCommand "fzmenu" {
+pkgs.runCommand "fzmenu" {
} /* sh */ ''
mkdir $out
cp -r ${./bin} $out/bin
substituteInPlace $out/bin/otpmenu \
- --replace '#! /bin/sh' '#! ${dash}/bin/dash' \
+ --replace '#! /bin/sh' '#! ${pkgs.dash}/bin/dash' \
--replace '#PATH=' PATH=${lib.makeBinPath [
- coreutils
- dash
- fzf
- gnused
- pass-otp
- rxvt_unicode
- utillinux
- xdotool
+ pkgs.coreutils
+ pkgs.dash
+ pkgs.fzf
+ pkgs.gnused
+ (pkgs.pass.withExtensions (ext: [
+ ext.pass-otp
+ ]))
+ pkgs.rxvt_unicode
+ pkgs.utillinux
+ pkgs.xdotool
]}
substituteInPlace $out/bin/passmenu \
- --replace '#! /bin/sh' '#! ${dash}/bin/dash' \
+ --replace '#! /bin/sh' '#! ${pkgs.dash}/bin/dash' \
--replace '#PATH=' PATH=${lib.makeBinPath [
- coreutils
- dash
- fzf
- gnused
- pass-otp
- rxvt_unicode
- utillinux
- xdotool
+ pkgs.coreutils
+ pkgs.dash
+ pkgs.fzf
+ pkgs.gnused
+ (pkgs.pass.withExtensions (ext: [
+ ext.pass-otp
+ ]))
+ pkgs.rxvt_unicode
+ pkgs.utillinux
+ pkgs.xdotool
]}
''
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 21:05:36 +0000