diff --git a/.versions/home-manager.json b/.versions/home-manager.json index 03be4ac..3bebfe8 100644 --- a/.versions/home-manager.json +++ b/.versions/home-manager.json @@ -1,9 +1,9 @@ { "url": "https://github.com/nix-community/home-manager.git", - "rev": "49706878e1580d796cc99b63574310405935113f", - "date": "2021-05-29T20:24:38+02:00", - "path": "/nix/store/ylzkcgmc7237gd3kngyx3l7zzlcsys4x-home-manager", - "sha256": "07f903ij0czyhly8kvwjazvz3s6kflxzh5fs6j8781lkxsy47i9f", + "rev": "ab64dc32493996c24607eab2cae6663466ddfb8a", + "date": "2021-05-29T20:22:40+02:00", + "path": "/nix/store/y4fsirhpgf73ngglbskkbfk26hjjssw8-home-manager", + "sha256": "1w7qxjibrjlqi7l293pnxxww1wxsq46wf3xbcpibys6g165s05f4", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/.versions/nixpkgs-unstable.json b/.versions/nixpkgs-unstable.json index 265f868..8f7a3ba 100644 --- a/.versions/nixpkgs-unstable.json +++ b/.versions/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs.git", - "rev": "f35c86dc1d00187129937bbc28f88cee42aa8991", - "date": "2021-05-29T14:15:32-07:00", - "path": "/nix/store/869jh3548f6fka8gpg8fn3zpfkdyn3fp-nixpkgs", - "sha256": "11ci8ag4yb2l2vig16w26lnkcl8fk36ydx3lcdjgk1pcymm40avl", + "rev": "1508c220f98d3166c8b4fda94a409e1c3a11cf79", + "date": "2021-06-01T12:42:21-04:00", + "path": "/nix/store/3jkhbpszr4jcapqmhprdaxv11dcvix0n-nixpkgs", + "sha256": "1gl1gdsw0i24dpkddgwqjg0almrv9ynqwy26jdy5wbzz00gld4a1", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/.versions/nixpkgs.json b/.versions/nixpkgs.json index f7c16e8..66c6eef 100644 --- a/.versions/nixpkgs.json +++ b/.versions/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs.git", - "rev": "85960bea533dc2d89dff8836d8a0a1239ddd5c9c", - "date": "2021-05-28T12:26:32+02:00", - "path": "/nix/store/lhifphbq1hd4ny7qpg11qdyd9h0ckbrx-nixpkgs", - "sha256": "0r1h3mh1nrca7wldlx64bdcxdzxz6hw9w7rzg9p6xk83zbmsyb9i", + "rev": "d25ea6a0d2a847fb52131da546f2a866656fbafa", + "date": "2021-05-31T10:23:40+02:00", + "path": "/nix/store/36s35zrv4c51mzlizlnbfhlpw8n4qs0g-nixpkgs", + "sha256": "0y2h71pvzrhc2svib4lwjl04hrzy8901ravvlyxlqdbal8hy3838", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/configs/alacritty.nix b/configs/alacritty.nix index cb303e3..ba65eb9 100644 --- a/configs/alacritty.nix +++ b/configs/alacritty.nix @@ -25,7 +25,7 @@ }; key_bindings = [ { - key = "Add"; + key = "Plus"; mods = "Control"; action = "IncreaseFontSize"; } diff --git a/configs/bluetooth.nix b/configs/bluetooth.nix index 7ea90fe..fc8c81f 100644 --- a/configs/bluetooth.nix +++ b/configs/bluetooth.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: { hardware.bluetooth = { enable = true; - config.General.Enable = + settings.General.Enable = lib.concatStringsSep "," [ "Source" "Sink" "Media" "Socket" ]; }; diff --git a/configs/default.nix b/configs/default.nix index c0bb44d..d099b09 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -42,7 +42,6 @@ in { { boot.cleanTmpDir = true; boot.loader.timeout = 1; - boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ]; } { home-manager.users.me = { @@ -181,7 +180,7 @@ in { services.atd.enable = true; } { - services.mingetty = { + services.getty = { greetingLine = lib.mkForce ""; helpLine = lib.mkForce ""; }; @@ -224,7 +223,7 @@ in { ./neovim.nix ./nix.nix ./newsboat.nix - ./flameshot-once.nix + # ./flameshot-once.nix ./packages ./power-action.nix ./printing.nix @@ -242,7 +241,7 @@ in { ./theming.nix ./tmux.nix ./tor.nix - ./traadfri.nix + # ./traadfri.nix ./unclutter.nix ./version.nix ./vscode.nix diff --git a/configs/fonts.nix b/configs/fonts.nix index 912beda..975ba5a 100644 --- a/configs/fonts.nix +++ b/configs/fonts.nix @@ -1,7 +1,9 @@ { pkgs, ... }: { + nixpkgs.config.joypixels.acceptLicense = true; + fonts = { enableDefaultFonts = true; - enableFontDir = true; + fontDir.enable = true; fonts = with pkgs; [ corefonts eb-garamond diff --git a/configs/htop.nix b/configs/htop.nix index d46bd89..e9acb30 100644 --- a/configs/htop.nix +++ b/configs/htop.nix @@ -2,45 +2,28 @@ home-manager.users.me = { programs.htop = { enable = true; - colorScheme = 0; - accountGuestInCpuMeter = true; - cpuCountFromZero = false; - delay = 15; - detailedCpuTime = false; - headerMargin = true; - hideKernelThreads = true; - hideThreads = true; - hideUserlandThreads = true; - highlightBaseName = true; - highlightMegabytes = true; - highlightThreads = true; - shadowOtherUsers = true; - showProgramPath = false; - showThreadNames = false; - sortDescending = true; - sortKey = "PERCENT_CPU"; - treeView = true; - updateProcessNames = false; - meters = { - left = [ - { - kind = "LeftCPUs2"; - mode = 1; - } - { - kind = "RightCPUs2"; - mode = 1; - } - { - kind = "Memory"; - mode = 1; - } - { - kind = "Swap"; - mode = 1; - } - ]; - right = [ "Uptime" "Tasks" "LoadAverage" "Battery" ]; + settings = { + color_scheme = 0; + account_guest_in_cpu_meter = true; + cpu_count_from_zero = false; + delay = 15; + detailed_cpu_time = false; + header_margin = true; + hide_kernel_threads = true; + hide_threads = true; + hide_userland_threads = true; + highlight_base_name = true; + highlight_megabytes = true; + highlight_threads = true; + shadow_other_users = true; + show_program_path = false; + show_thread_names = false; + sort_descending = true; + sort_key = "PERCENT_CPU"; + tree_view = true; + update_process_names = false; + right_meters = [ "Uptime" "Tasks" "LoadAverage" "Battery" ]; + left_meters = [ "LeftCPUs2" "RightCPUs2" "Memory" "Swap" ]; }; }; }; diff --git a/configs/i3.nix b/configs/i3.nix index cee291e..b06e13f 100644 --- a/configs/i3.nix +++ b/configs/i3.nix @@ -67,7 +67,7 @@ in { home-manager.users.me.xsession.windowManager.i3 = { enable = true; config = rec { - fonts = [ "Sans 10" ]; + fonts = {names = ["Sans"]; size = 10.0;}; modifier = "Mod4"; window = { titlebar = false; @@ -129,7 +129,7 @@ in { }; bars = [{ workspaceButtons = false; - fonts = [ "Sans 8" ]; + fonts = {names = ["Sans"]; size = 8.0;}; mode = "hide"; # "dock" position = "bottom"; colors = rec { diff --git a/configs/packages/default.nix b/configs/packages/default.nix index 2c2825b..5bf70af 100644 --- a/configs/packages/default.nix +++ b/configs/packages/default.nix @@ -93,6 +93,7 @@ in { posix_man_pages # moreutils # for parallel, sponge, combine tree + fuse_exfat # to mount windows drives parallel # for parallel, since moreutils shadows task spooler ripgrep # better grep rlwrap diff --git a/configs/packages/haskell/packages.nix b/configs/packages/haskell/packages.nix index 4d7931d..d58a7fe 100644 --- a/configs/packages/haskell/packages.nix +++ b/configs/packages/haskell/packages.nix @@ -87,7 +87,6 @@ with haskellPackages; [ time transformers turtle - type-unary unix-time unordered-containers vector diff --git a/configs/packages/writing.nix b/configs/packages/writing.nix index 8516588..b106e53 100644 --- a/configs/packages/writing.nix +++ b/configs/packages/writing.nix @@ -1,7 +1,5 @@ { pkgs, lib, config, ... }: let - nixpkgs-unstable = import {}; - zoteroStyle = { name, sha256 }: { name = "${name}.csl"; path = pkgs.fetchurl { @@ -64,14 +62,14 @@ in { texlive.combined.scheme-full latexrun (aspellWithDicts (dict: [ dict.de dict.en dict.en-computers ])) - haskellPackages.pandoc-citeproc + # haskellPackages.pandoc-citeproc nur.repos.kmein.text2pdf lowdown glow # markdown to term libreoffice # gnumeric dia - nixpkgs-unstable.pandoc + pandoc # proselint asciidoctor wordnet diff --git a/configs/radio.nix b/configs/radio.nix index 8657b26..e7eacbb 100644 --- a/configs/radio.nix +++ b/configs/radio.nix @@ -1,7 +1,6 @@ { lib, pkgs, config, ... }: let inherit (import ) tmpfilesConfig; - nixpkgs-unstable = import {}; radioStore = "/var/lib/radio"; htgenPort = 8080; @@ -98,7 +97,7 @@ in ${pkgs.youtube-dl}/bin/youtube-dl -j "https://www.youtube.com/watch?v=$video_id" \ | ${pkgs.jq}/bin/jq -r '"% [\(.title)](\(.webpage_url))\n\n\(.description)"' \ | sed 's/$/ /g' \ - | ${nixpkgs-unstable.pandoc}/bin/pandoc -s + | ${pandoc}/bin/pandoc -s exit ;; diff --git a/configs/urlwatch.nix b/configs/urlwatch.nix index e5412be..c27415a 100644 --- a/configs/urlwatch.nix +++ b/configs/urlwatch.nix @@ -109,6 +109,7 @@ in users.extraUsers.urlwatch = { home = urlwatchDir; createHome = true; + isSystemUser = true; }; systemd.services.urlwatch = { diff --git a/configs/wallpaper.nix b/configs/wallpaper.nix index fb0133d..47d2678 100644 --- a/configs/wallpaper.nix +++ b/configs/wallpaper.nix @@ -7,6 +7,8 @@ url = "http://prism.r/realwallpaper-krebs-stars-berlin.png"; }; + users.users.fetchWallpaper.isSystemUser = true; + services.xserver = { display = lib.mkForce 0; # needed for fetchWallpaper to find the X display displayManager.sessionCommands = "${pkgs.xorg.xhost}/bin/xhost +LOCAL:"; diff --git a/configs/weechat.nix b/configs/weechat.nix index 364c00a..c4a7c07 100644 --- a/configs/weechat.nix +++ b/configs/weechat.nix @@ -1,7 +1,6 @@ { lib, pkgs, ... }: let inherit (import ) kieran; - nixpkgs-unstable = import {}; relayPassword = lib.fileContents ; in { systemd.services.weechat = @@ -24,7 +23,7 @@ in { ''; weechat = pkgs.weechat.override { configure = { ... }: { - scripts = [ pkgs.weechatScripts.weechat-autosort nixpkgs-unstable.weechatScripts.colorize_nicks ]; + scripts = [ pkgs.weechatScripts.weechat-autosort pkgs.weechatScripts.colorize_nicks ]; init = let coolColors = lib.lists.subtractLists (lib.range 52 69 ++ lib.range 231 248) (lib.range 31 254); nick = "kmein"; diff --git a/lib/i3status-rust.nix b/lib/i3status-rust.nix index ed36491..9155e99 100644 --- a/lib/i3status-rust.nix +++ b/lib/i3status-rust.nix @@ -51,6 +51,7 @@ in { bat_three_quarters = " "; cogs = "🚦 "; cpu = "🖥 "; + disk_drive = "💽"; mail = "📧 "; memory_mem = "🧠 "; music = "🎵"; @@ -71,11 +72,11 @@ in { volume_full = "🔊 "; volume_half = "🔉 "; volume_muted = "🔇"; - weather_sun = "🌣"; weather_clouds = "🌥"; + weather_default = "🌡"; weather_rain = "🌧"; weather_snow = "🌨"; - weather_default = "🌡"; + weather_sun = "🌣"; weather_thunder = "🌩"; }; }; @@ -83,7 +84,7 @@ in { { block = "weather"; autolocate = true; - format = "{location}: {temp}°C"; + format = "{location}: {temp}C"; service = { name = "openweathermap"; api_key = lib.strings.fileContents ; @@ -121,10 +122,7 @@ in { { block = "net"; device = wirelessInterface; - speed_up = false; - speed_down = false; - signal_strength = true; - ssid = true; + format = "{ssid} {signal_strength}"; } { block = "battery"; @@ -136,12 +134,12 @@ in { } { block = "disk_space"; - alias = "💽"; + format = "{icon} {available}"; } { block = "memory"; display_type = "memory"; - format_mem = "{Mug}G"; + format_mem = "{mem_used;G}"; clickable = false; } { block = "load"; } diff --git a/packages/iolanguage.nix b/packages/iolanguage.nix index ba2bf6e..e17f0fe 100644 --- a/packages/iolanguage.nix +++ b/packages/iolanguage.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, python3, fetchFromGitHub }: +{ lib, stdenv, cmake, python3, fetchFromGitHub }: stdenv.mkDerivation rec { version = "2017.09.06"; name = "iolanguage-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cmake -DCMAKE_INSTALL_PREFIX=$out/ .. make all ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://iolanguage.org/"; description = "Io programming language. Inspired by Self, Smalltalk and LISP."; diff --git a/packages/libcoap.nix b/packages/libcoap.nix index c82eb93..e22c732 100644 --- a/packages/libcoap.nix +++ b/packages/libcoap.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { preConfigure = "./autogen.sh"; configureFlags = [ "--disable-documentation" "--disable-shared" ] ++ lib.optional tls "--enable-dtls"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/obgm/libcoap"; description = "A CoAP (RFC 7252) implementation in C"; platforms = platforms.linux; diff --git a/packages/scripts/daybook.nix b/packages/scripts/daybook.nix index 0ec16e0..d020001 100644 --- a/packages/scripts/daybook.nix +++ b/packages/scripts/daybook.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, pandoc, fetchFromGitHub }: +{ lib, stdenv, makeWrapper, pandoc, fetchFromGitHub }: stdenv.mkDerivation { name = "daybook"; src = fetchFromGitHub { @@ -18,7 +18,7 @@ stdenv.mkDerivation { install daybook $out/bin wrapProgram $out/bin/daybook --prefix PATH ":" ${pandoc}/bin ; ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/kmein/daybook"; description = "A diary writing utility in sh"; license = licenses.mit; diff --git a/packages/scripts/nav.nix b/packages/scripts/nav.nix index 49c9156..4fd35e9 100644 --- a/packages/scripts/nav.nix +++ b/packages/scripts/nav.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, fzf }: +{ lib, fetchFromGitHub, stdenv, fzf }: stdenv.mkDerivation rec { name = "nav"; version = "8da22b1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; propagatedBuildInputs = [ fzf ]; meta = { - maintainer = [ stdenv.lib.maintainers.kmein ]; + maintainer = [ lib.maintainers.kmein ]; description = "JSON data structure navigator"; homepage = "https://github.com/huntrar/nav"; }; diff --git a/packages/scripts/pls.nix b/packages/scripts/pls.nix index d018883..51ec7f9 100755 --- a/packages/scripts/pls.nix +++ b/packages/scripts/pls.nix @@ -16,7 +16,7 @@ let ${pkgs.nur.repos.mic92.untilport}/bin/untilport ${irc.host} ${toString irc.port} && \ ${pkgs.nur.repos.mic92.irc-announce}/bin/irc-announce \ ${irc.host} ${toString irc.port} ${irc.nick} ${lib.escapeShellArg irc.channel} ${toString (if irc.tls then 1 else 0)} \ - "$*" 2>/dev/null + "$*" ''; messages.good = [ diff --git a/shell.nix b/shell.nix index 5992722..1bdf62d 100644 --- a/shell.nix +++ b/shell.nix @@ -1,5 +1,5 @@ { pkgs ? import { } -, release ? "20.09" +, release ? "21.05" }: let inherit (pkgs) lib; diff --git a/systems/toum/configuration.nix b/systems/toum/configuration.nix index a1b2a23..2fa1d76 100644 --- a/systems/toum/configuration.nix +++ b/systems/toum/configuration.nix @@ -13,7 +13,7 @@ in { - + # ]; @@ -28,7 +28,7 @@ in { environment.systemPackages = with pkgs; [ git vim htop wget reptyr - raspberrypi-tools + libraspberrypi ]; users.mutableUsers = false; diff --git a/systems/wilde/configuration.nix b/systems/wilde/configuration.nix index 00e30f6..fbbcf79 100644 --- a/systems/wilde/configuration.nix +++ b/systems/wilde/configuration.nix @@ -7,7 +7,7 @@ in ./hardware-configuration.nix - + # ]; niveum = {