simon/nixos-config
simon/nixos-config
1
1
Fork 0
Code Issues 8 Pull requests Actions Projects Activity

WIP: Update to 21.05 #52

Closed
simon wants to merge 5 commits from 21.05 into master
pull from: 21.05
merge into: simon:master
Conversation 1 Commits 5 Files changed 17 +63 -67
17 changed files with 63 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
flake.lock
View file

@ -91,16 +91,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1617824794, "lastModified": 1621794721,
"narHash": "sha256-UGkvzx0nIXHhNq/KwJLjXvKAQRE2V33MuX+UirvqrkQ=", "narHash": "sha256-JXfTSZUu9EVbT9D/MFsx0cXfa8bw1NFCzIxZ7gO73Uo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2aa20ae969f2597c4df10a094440a66e9d7f8c86", "rev": "90493027e33ba9eb3f50dc1da365d0e4ca31bf14",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-20.09", "ref": "release-21.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -187,16 +187,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1621718065, "lastModified": 1622104865,
"narHash": "sha256-2xw+iyUzV3blVq0EQjL2Qhzpp3r9uCLzYQns4nW7m7Y=", "narHash": "sha256-TY2wQE1m8nhjHTJ0lDL8ZUb9lA7Pw2WD2+bOiIhSqcE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ac60476ed94fd5424d9f3410c438825f793a8cbb", "rev": "676ddafd3dbdc8dd95471df84bc5198d2d37d241",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-20.09", "ref": "release-21.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
flake.nix
View file

@ -4,10 +4,10 @@
inputs = { inputs = {
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:nixos/nixpkgs/nixos-20.09"; nixpkgs.url = "github:nixos/nixpkgs/release-21.05"; # FIXME: nixos-
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager/release-20.09"; home-manager.url = "github:nix-community/home-manager/release-21.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
krops.url = "github:Mic92/krops"; krops.url = "github:Mic92/krops";

2
machines/fuuko/services/binary-cache.nix
View file

@ -70,7 +70,7 @@ in
systemd.services.nar-serve = systemd.services.nar-serve =
let let
# TODO: remove once new version is released and in nixpkgs # TODO: remove once new version is released and in nixpkgs
nar-serve = pkgs.unstable.nar-serve.overrideAttrs (o: o // { nar-serve = pkgs.nar-serve.overrideAttrs (o: o // {
version = "unstable-2021-04-08"; version = "unstable-2021-04-08";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {

2
machines/fuuko/services/drone/runner-exec.nix
View file

@ -47,7 +47,7 @@ in
"/etc/static" "/etc/static"
"/nix" "/nix"
]; ];
ExecStart = "${pkgs.unstable.drone-runner-exec}/bin/drone-runner-exec"; ExecStart = "${pkgs.drone-runner-exec}/bin/drone-runner-exec";
User = user; User = user;
Group = group; Group = group;
}; };

2
machines/fuuko/services/drone/server.nix
View file

@ -28,7 +28,7 @@ in
drone-rpc-environment.path drone-rpc-environment.path
drone-server-environment.path drone-server-environment.path
]; ];
ExecStart = "${pkgs.unstable.drone}/bin/drone-server"; ExecStart = "${pkgs.drone}/bin/drone-server";
Restart = "on-failure"; Restart = "on-failure";
User = user; User = user;
Group = group; Group = group;

4
machines/nunotaba/configuration.nix
View file

@ -22,6 +22,10 @@
enable = true; enable = true;
client.enable = true; client.enable = true;
}; };
services.privoxy = {
enable = true;
enableTor = true;
};
networking.hostName = "nunotaba"; networking.hostName = "nunotaba";

8
machines/nunotaba/hardware-configuration.nix
View file

@ -25,9 +25,9 @@
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-uuid/8937d1ac-23cb-456f-9c16-e348acc66bb7"; device = "/dev/disk/by-uuid/c3ab2182-18b3-4cc6-a5b3-3fef32222aef";
fsType = "ext4"; fsType = "btrfs";
options = [ "discard" "noatime" ]; options = [ "discard=async" "noatime" "compress=zstd" ];
}; };
"/boot" = { "/boot" = {
@ -40,7 +40,7 @@
{ device = "/dev/disk/by-uuid/b9ad2d56-fee0-49df-98c1-00d93d991b9f"; } { device = "/dev/disk/by-uuid/b9ad2d56-fee0-49df-98c1-00d93d991b9f"; }
]; ];
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
# Most of the time I want to use both screens at the same time and suspend it # Most of the time I want to use both screens at the same time and suspend it
# regularily by closing the lid # regularily by closing the lid

4
machines/sayuri/configuration.nix
View file

@ -27,6 +27,10 @@
enable = true; enable = true;
client.enable = true; client.enable = true;
}; };
services.privoxy = {
enable = true;
enableTor = true;
};
networking.hostName = "sayuri"; networking.hostName = "sayuri";

5
machines/sayuri/hardware-configuration.nix
View file

@ -6,9 +6,6 @@
]; ];
boot = { boot = {
# async trim on btrfs requires kernel 5.6+
# TODO: Remove with kernel 5.6+ in stable
kernelPackages = pkgs.linuxPackages_latest;
kernelModules = [ "kvm-intel" ]; kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ]; extraModulePackages = [ ];
loader.grub.device = "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_250GB_S4EUNJ0N412342P"; loader.grub.device = "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_250GB_S4EUNJ0N412342P";
@ -78,7 +75,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
clinfo clinfo
unstable.radeontop radeontop
rocm-smi rocm-smi
]; ];
} }

11
pkgs/default.nix
View file

@ -18,17 +18,6 @@ in
# version that works in my setup # version that works in my setup
prometheus-fritzbox-exporter = callPackage ./prometheus-fritzbox-exporter { }; prometheus-fritzbox-exporter = callPackage ./prometheus-fritzbox-exporter { };
# FIXME: 21.05: Move to home-manager module package attribute
mpv-unwrapped = prev.mpv-unwrapped.overrideAttrs (o: o // {
patches = [
# FIXME: 21.05: Remove since it has mpv 0.33
(prev.fetchpatch {
url = "https://github.com/mpv-player/mpv/commit/43c13e5ea23230edca38426d4a9eed049a70890e.patch";
sha256 = "0g73ws36cs2hfzqck6xiaimj5yd5hz68b4wf3qayyv4nrf5sz02c";
})
];
});
# TODO: Remove when pavucontrol > 4.0 is released # TODO: Remove when pavucontrol > 4.0 is released
pavucontrol = prev.pavucontrol.overrideAttrs (o: o // { pavucontrol = prev.pavucontrol.overrideAttrs (o: o // {
patches = [ patches = [

1
users/simon/modules/mpd.nix
View file

@ -7,7 +7,6 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
enable = true; enable = true;
musicDirectory = "~/Music"; musicDirectory = "~/Music";
network.listenAddress = "${config.services.mpd.dataDir}/socket"; network.listenAddress = "${config.services.mpd.dataDir}/socket";
package = pkgs.unstable.mpd;
extraConfig = '' extraConfig = ''
zeroconf_enabled "no" zeroconf_enabled "no"

6
users/simon/modules/mpv.nix
View file

@ -35,8 +35,8 @@ let
gallery-view = pkgs.fetchFromGitHub { gallery-view = pkgs.fetchFromGitHub {
owner = "occivink"; owner = "occivink";
repo = "mpv-gallery-view"; repo = "mpv-gallery-view";
rev = "5139d346de67e8dbee8c8983777026502d6bc627"; rev = "eca93f9ff2b8716ac750824c9980f6eb766756cf";
sha256 = "1xcl31rpb6kp479kil4srkclw9ly565zavr65ary9s8795ygfcrs"; sha256 = "01ys2nd166lvcppnrch8ls5n6jhrha2z0jcn9hnfip63gvv2c5gn";
meta.license = lib.licenses.gpl2; meta.license = lib.licenses.gpl2;
}; };
@ -220,7 +220,7 @@ in
xdg.configFile."mpv/scripts/gallery-thumbgen-1.lua".source = "${gallery-view}/scripts/gallery-thumbgen.lua"; xdg.configFile."mpv/scripts/gallery-thumbgen-1.lua".source = "${gallery-view}/scripts/gallery-thumbgen.lua";
xdg.configFile."mpv/scripts/gallery-thumbgen-2.lua".source = "${gallery-view}/scripts/gallery-thumbgen.lua"; xdg.configFile."mpv/scripts/gallery-thumbgen-2.lua".source = "${gallery-view}/scripts/gallery-thumbgen.lua";
xdg.configFile."mpv/scripts/gallery-thumbgen-3.lua".source = "${gallery-view}/scripts/gallery-thumbgen.lua"; xdg.configFile."mpv/scripts/gallery-thumbgen-3.lua".source = "${gallery-view}/scripts/gallery-thumbgen.lua";
xdg.configFile."mpv/scripts/lib/gallery.lua".source = "${gallery-view}/scripts/lib/gallery.lua"; xdg.configFile."mpv/scripts/lib.disable/gallery.lua".source = "${gallery-view}/scripts/lib.disable/gallery.lua";
xdg.configFile."mpv/scripts/playlist-view.lua".source = "${gallery-view}/scripts/playlist-view.lua"; xdg.configFile."mpv/scripts/playlist-view.lua".source = "${gallery-view}/scripts/playlist-view.lua";
xdg.configFile."mpv/script-opts/playlist_view.conf".text = '' xdg.configFile."mpv/script-opts/playlist_view.conf".text = ''
thumbs_dir=${config.xdg.cacheHome}/thumbnails/mpv thumbs_dir=${config.xdg.cacheHome}/thumbnails/mpv

12
users/simon/modules/programs.nix
View file

@ -19,7 +19,7 @@ let
}; };
# waifu2x-converter-cpp wrapper for real life images # waifu2x-converter-cpp wrapper for real life images
waifu2x-photo = pkgs.writeShellScriptBin "waifu2x-photo" '' waifu2x-photo = pkgs.writeShellScriptBin "waifu2x-photo" ''
${pkgs.unstable.waifu2x-converter-cpp}/bin/waifu2x-converter-cpp \ ${pkgs.waifu2x-converter-cpp}/bin/waifu2x-converter-cpp \
--model-dir ${waifu2x-photo-models} \ --model-dir ${waifu2x-photo-models} \
$@ $@
''; '';
@ -57,7 +57,7 @@ in
# network tools # network tools
dnsutils # dig dnsutils # dig
unstable.dogdns # better dig dogdns # better dig
gatling # high performance web server gatling # high performance web server
sshfs # mount remote host sshfs # mount remote host
vnstat # client for vnstatd vnstat # client for vnstatd
@ -77,7 +77,7 @@ in
# end user programs # end user programs
apacheHttpd # for htpasswd apacheHttpd # for htpasswd
unstable.libqalculate # flexible calculator for humans libqalculate # flexible calculator for humans
taskwarrior # todo list manager taskwarrior # todo list manager
# passwords # passwords
@ -113,8 +113,8 @@ in
ffmpeg-full # A/V multitool ffmpeg-full # A/V multitool
mediainfo # show information about media files mediainfo # show information about media files
mkvtoolnix-cli # matroska (de-)muxing mkvtoolnix-cli # matroska (de-)muxing
unstable.streamlink # video stream downloader streamlink # video stream downloader
unstable.waifu2x-converter-cpp # super-resolution for anime-style images waifu2x-converter-cpp # super-resolution for anime-style images
waifu2x-photo # waifu2x-converter-cpp for real life photos waifu2x-photo # waifu2x-converter-cpp for real life photos
# audio # audio
@ -176,7 +176,7 @@ in
antimicroX # gamepad to keyboard/mouse mapping antimicroX # gamepad to keyboard/mouse mapping
filezilla # ftp client filezilla # ftp client
gparted # gui for parted gparted # gui for parted
unstable.qalculate-gtk # flexible calculator qalculate-gtk # flexible calculator
scrcpy # stream/control android phones over adb scrcpy # stream/control android phones over adb
wev # wayland event monitor wev # wayland event monitor
wl-clipboard # not really gui, but cli tool to manage wayland clipboard wl-clipboard # not really gui, but cli tool to manage wayland clipboard

14
users/simon/modules/sway.nix
View file

@ -29,10 +29,6 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
# TODO: remove with 21.05
package = pkgs.unstable.sway;
xwayland = false;
config = { config = {
modifier = "Mod4"; modifier = "Mod4";
@ -202,7 +198,11 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
urgent = rec { border = "#073642"; background = "#dc322f"; text = "#073642"; indicator = "#2aa198"; childBorder = background; }; urgent = rec { border = "#073642"; background = "#dc322f"; text = "#073642"; indicator = "#2aa198"; childBorder = background; };
}; };
fonts = [ "monospace 10" ]; fonts = {
names = [ "monospace" ];
style = "Regular";
size = 10.0;
};
}; };
extraConfig = '' extraConfig = ''
@ -282,7 +282,6 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
brightnessctl # control screen brightness brightnessctl # control screen brightness
sway-contrib.grimshot # screenshots sway-contrib.grimshot # screenshots
wdisplays # graphical output manager wdisplays # graphical output manager
pkgs.unstable.xwayland # TODO: remove with 21.05
]; ];
xdg.configFile."swaynag/config".text = xdg.configFile."swaynag/config".text =
@ -517,8 +516,7 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
Service = { Service = {
# ensure sway is already started, otherwise workspaces will not work # ensure sway is already started, otherwise workspaces will not work
ExecStartPre = "${config.wayland.windowManager.sway.package}/bin/swaymsg"; ExecStartPre = "${config.wayland.windowManager.sway.package}/bin/swaymsg";
# FIXME: Remove override with 21.05 (https://github.com/NixOS/nixpkgs/pull/98490) ExecStart = "${pkgs.waybar}/bin/waybar";
ExecStart = "${pkgs.waybar.override { pulseSupport = true; }}/bin/waybar";
ExecReload = "${pkgs.utillinux}/bin/kill -SIGUSR2 $MAINPID"; ExecReload = "${pkgs.utillinux}/bin/kill -SIGUSR2 $MAINPID";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = "1s"; RestartSec = "1s";

16
users/simon/modules/youtube-dl.nix
View file

@ -1,13 +1,13 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
formats = (lib.flatten # zAudioFormat because a better video format is preferred and
(lib.crossLists (x: y: [ "${x}+${y}" ]) # cartesianProductOfSets cycles through the attributes in lexicographic order
[ formats = (map
[ "bestvideo[vcodec^=av01]" "bestvideo[vcodec^=vp9]" "bestvideo[vcodec^=avc1]" "bestvideo" ] ({ videoFormat, zAudioFormat }: "${videoFormat}+${zAudioFormat}")
[ "bestaudio[acodec^=opus]" "bestaudio[acodec^=mp4a]" "bestaudio" ] (lib.cartesianProductOfSets {
])) ++ [ videoFormat = [ "bestvideo[vcodec^=av01]" "bestvideo[vcodec^=vp9]" "bestvideo[vcodec^=avc1]" "bestvideo" ];
"best" zAudioFormat = [ "bestaudio[acodec^=opus]" "bestaudio[acodec^=mp4a]" "bestaudio" ];
]; })) ++ [ "best" ];
options = { options = {
format = lib.concatStringsSep "/" formats; format = lib.concatStringsSep "/" formats;

2
users/simon/modules/ytcc.nix
View file

@ -17,5 +17,5 @@
}; };
}; };
home.packages = with pkgs; [ unstable.ytcc ]; home.packages = with pkgs; [ ytcc ];
} }

21
users/simon/modules/zsh.nix
View file

@ -64,17 +64,22 @@ in
envExtra = '' envExtra = ''
export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on" export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
''; '';
initExtra = lib.mkAfter '' initExtra = lib.mkMerge [
eval $(${pkgs.coreutils}/bin/dircolors -b ${dircolors-solarized}/dircolors.ansi-universal) (lib.mkBefore ''
prompt off # collides with starship
'')
(lib.mkAfter ''
eval $(${pkgs.coreutils}/bin/dircolors -b ${dircolors-solarized}/dircolors.ansi-universal)
# no sad smiley (starship shows exit status) # no sad smiley (starship shows exit status)
zstyle ':prompt:grml:right:setup' items zstyle ':prompt:grml:right:setup' items
# do not glob # (conflicts with nix flakes) # do not glob # (conflicts with nix flakes)
disable -p '#' disable -p '#'
source ${../files/zsh/pass-wrappers.zsh} source ${../files/zsh/pass-wrappers.zsh}
''; '')
];
}; };
}; };
} }