From 543b582f60410795a8d4e5fc010c075eb06ac6d5 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sat, 21 Nov 2020 18:56:11 +0100 Subject: [PATCH] 20.09 update --- .channelStable.json | 8 ++++---- .channelUnstable.json | 8 ++++---- configs/pepe/syncthing.nix | 13 ++++++------- configs/porani/syncthing.nix | 9 ++++----- configs/sterni/packages.nix | 4 ++-- configs/sterni/syncthing.nix | 2 +- configs/workhorse/nextcloud.nix | 28 ++++++++++++++-------------- configs/workhorse/syncthing.nix | 11 +++++------ configs/workout/syncthing.nix | 2 +- modules/default.nix | 2 +- modules/later/syncthing.nix | 4 ++-- modules/services/samba-share.nix | 2 +- modules/system/x11.nix | 8 +++----- pkgs/image-generator/default.nix | 3 ++- pkgs/taskwarrior-hooks/default.nix | 3 ++- shell.nix | 6 +++--- system/all/packages.nix | 2 +- system/all/syncthing.nix | 2 +- system/desktop/home-manager.nix | 1 - updateChannels.sh | 4 ++-- 20 files changed, 59 insertions(+), 63 deletions(-) diff --git a/.channelStable.json b/.channelStable.json index 8a1e5f7..334306d 100644 --- a/.channelStable.json +++ b/.channelStable.json @@ -1,7 +1,7 @@ { - "url": "https://github.com/NixOS/nixpkgs-channels.git", - "rev": "51d115ac89d676345b05a0694b23bd2691bf708a", - "date": "2020-09-04T14:07:56-07:00", - "sha256": "1gfjaa25nq4vprs13h30wasjxh79i67jj28v54lkj4ilqjhgh2rs", + "url": "https://github.com/NixOS/nixpkgs.git", + "rev": "58f9c4c7d3a42c912362ca68577162e38ea8edfb", + "date": "2020-11-18T12:49:40-05:00", + "sha256": "1517dy07jf4zhzknqbgm617lgjxsn7a6k1vgq61c67f6h55qs5ij", "fetchSubmodules": false } diff --git a/.channelUnstable.json b/.channelUnstable.json index b96dad5..eceb17f 100644 --- a/.channelUnstable.json +++ b/.channelUnstable.json @@ -1,7 +1,7 @@ { - "url": "https://github.com/NixOS/nixpkgs-channels.git", - "rev": "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38", - "date": "2020-08-20T19:08:02+02:00", - "sha256": "1ak7jqx94fjhc68xh1lh35kh3w3ndbadprrb762qgvcfb8351x8v", + "url": "https://github.com/NixOS/nixpkgs.git", + "rev": "2deeb58f49480f468adca6b08291322de4dbce6b", + "date": "2020-11-12T23:50:31+00:00", + "sha256": "0fx2car6dcd1yz6jjkifcan0amwzhs3170h0r69k0wfwiaadpvjv", "fetchSubmodules": false } diff --git a/configs/pepe/syncthing.nix b/configs/pepe/syncthing.nix index 288e14e..60a1156 100644 --- a/configs/pepe/syncthing.nix +++ b/configs/pepe/syncthing.nix @@ -5,19 +5,18 @@ custom.samba-share = { enable = true; folders = { - movies = config.test.services.syncthing.declarative.folders.movies.path; - music = - config.test.services.syncthing.declarative.folders.music-library.path; - samples = config.test.services.syncthing.declarative.folders.samples.path; - series = config.test.services.syncthing.declarative.folders.series.path; + movies = config.services.syncthing.declarative.folders.movies.path; + music = config.services.syncthing.declarative.folders.music-library.path; + samples = config.services.syncthing.declarative.folders.samples.path; + series = config.services.syncthing.declarative.folders.series.path; }; private.test = { - folder = config.test.services.syncthing.declarative.folders.porn.path; + folder = config.services.syncthing.declarative.folders.porn.path; users = "kodi"; }; }; - test.services.syncthing = { + services.syncthing = { enable = true; openDefaultPorts = true; declarative = { diff --git a/configs/porani/syncthing.nix b/configs/porani/syncthing.nix index 0939bf1..8f6ca0f 100644 --- a/configs/porani/syncthing.nix +++ b/configs/porani/syncthing.nix @@ -5,14 +5,13 @@ custom.samba-share = { enable = true; folders = { - movies = config.test.services.syncthing.declarative.folders.movies.path; - series = config.test.services.syncthing.declarative.folders.series.path; - music = - config.test.services.syncthing.declarative.folders.music-library.path; + movies = config.services.syncthing.declarative.folders.movies.path; + series = config.services.syncthing.declarative.folders.series.path; + music = config.services.syncthing.declarative.folders.music-library.path; }; }; - test.services.syncthing = { + services.syncthing = { guiAddress = lib.mkForce "${config.networking.hostName}.insecure:8384"; enable = true; openDefaultPorts = true; diff --git a/configs/sterni/packages.nix b/configs/sterni/packages.nix index edd3ce4..687675e 100644 --- a/configs/sterni/packages.nix +++ b/configs/sterni/packages.nix @@ -6,7 +6,7 @@ in { nixpkgs.overlays = [ (import ) ]; environment.systemPackages = with pkgs; [ - bitwig-studio + #bitwig-studio #unstable.sonic-visualiser sononym-crawler darktable @@ -22,7 +22,7 @@ in { jetbrains.datagrip # foto - fuji-cam-wifi-tool + #fuji-cam-wifi-tool # processing processing diff --git a/configs/sterni/syncthing.nix b/configs/sterni/syncthing.nix index d4a67c7..a10cd84 100644 --- a/configs/sterni/syncthing.nix +++ b/configs/sterni/syncthing.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: { - test.services.syncthing = { + services.syncthing = { enable = true; openDefaultPorts = false; user = "palo"; diff --git a/configs/workhorse/nextcloud.nix b/configs/workhorse/nextcloud.nix index a51a163..70e091a 100644 --- a/configs/workhorse/nextcloud.nix +++ b/configs/workhorse/nextcloud.nix @@ -45,31 +45,31 @@ in { }; # shared folders samples = { - mountPoint = toString - config.test.services.syncthing.declarative.folders.samples.path; - hostPath = toString - config.test.services.syncthing.declarative.folders.samples.path; + mountPoint = + toString config.services.syncthing.declarative.folders.samples.path; + hostPath = + toString config.services.syncthing.declarative.folders.samples.path; isReadOnly = true; }; movies = { - mountPoint = toString - config.test.services.syncthing.declarative.folders.movies.path; - hostPath = toString - config.test.services.syncthing.declarative.folders.movies.path; + mountPoint = + toString config.services.syncthing.declarative.folders.movies.path; + hostPath = + toString config.services.syncthing.declarative.folders.movies.path; isReadOnly = true; }; music = { mountPoint = toString - config.test.services.syncthing.declarative.folders.music-library.path; + config.services.syncthing.declarative.folders.music-library.path; hostPath = toString - config.test.services.syncthing.declarative.folders.music-library.path; + config.services.syncthing.declarative.folders.music-library.path; isReadOnly = true; }; series = { - mountPoint = toString - config.test.services.syncthing.declarative.folders.series.path; - hostPath = toString - config.test.services.syncthing.declarative.folders.series.path; + mountPoint = + toString config.services.syncthing.declarative.folders.series.path; + hostPath = + toString config.services.syncthing.declarative.folders.series.path; isReadOnly = true; }; }; diff --git a/configs/workhorse/syncthing.nix b/configs/workhorse/syncthing.nix index 8023a16..71aa869 100644 --- a/configs/workhorse/syncthing.nix +++ b/configs/workhorse/syncthing.nix @@ -3,15 +3,14 @@ custom.samba-share = { enable = true; folders = { - movies = config.test.services.syncthing.declarative.folders.movies.path; - series = config.test.services.syncthing.declarative.folders.series.path; - samples = config.test.services.syncthing.declarative.folders.samples.path; - music = - config.test.services.syncthing.declarative.folders.music-library.path; + movies = config.services.syncthing.declarative.folders.movies.path; + series = config.services.syncthing.declarative.folders.series.path; + samples = config.services.syncthing.declarative.folders.samples.path; + music = config.services.syncthing.declarative.folders.music-library.path; }; }; - test.services.syncthing = { + services.syncthing = { enable = true; openDefaultPorts = false; dataDir = "/home/syncthing"; diff --git a/configs/workout/syncthing.nix b/configs/workout/syncthing.nix index fd10366..956a5db 100644 --- a/configs/workout/syncthing.nix +++ b/configs/workout/syncthing.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: { - test.services.syncthing = { + services.syncthing = { enable = true; openDefaultPorts = false; user = "palo"; diff --git a/modules/default.nix b/modules/default.nix index e6df87d..7ba90b1 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -2,7 +2,7 @@ imports = [ - ./later/syncthing.nix + #./later/syncthing.nix #./later/nextcloud.nix ./services/light-control.nix diff --git a/modules/later/syncthing.nix b/modules/later/syncthing.nix index aaa8a94..49422d3 100644 --- a/modules/later/syncthing.nix +++ b/modules/later/syncthing.nix @@ -1,11 +1,11 @@ { config, lib, pkgs, ... }: -assert lib.versionOlder lib.version "20.09"; +# assert lib.versionOlder lib.version "20.09"; with lib; let - cfg = config.test.services.syncthing; + cfg = config.services.syncthing; defaultUser = "syncthing"; devices = mapAttrsToList (name: device: { diff --git a/modules/services/samba-share.nix b/modules/services/samba-share.nix index f79c698..31909f0 100644 --- a/modules/services/samba-share.nix +++ b/modules/services/samba-share.nix @@ -94,7 +94,7 @@ in { }) # todo : maybe better to have a parameter for this - (mkIf config.test.services.syncthing.enable { + (mkIf config.services.syncthing.enable { users.groups."syncthing".members = [ "smbguest" ]; }) ]; diff --git a/modules/system/x11.nix b/modules/system/x11.nix index 211fcd8..8d92263 100644 --- a/modules/system/x11.nix +++ b/modules/system/x11.nix @@ -34,11 +34,9 @@ in { # ----------------------- desktopManager = { xterm.enable = false; }; displayManager.defaultSession = "none+xmonad"; - displayManager.lightdm = { - enable = true; - autoLogin.enable = true; - autoLogin.user = cfg.autoLoginUser; - }; + displayManager.autoLogin.enable = true; + displayManager.autoLogin.user = cfg.autoLoginUser; + displayManager.lightdm = { enable = true; }; windowManager = { xmonad.enable = true; xmonad.enableContribAndExtras = true; diff --git a/pkgs/image-generator/default.nix b/pkgs/image-generator/default.nix index 1b7fa94..63236ae 100644 --- a/pkgs/image-generator/default.nix +++ b/pkgs/image-generator/default.nix @@ -10,7 +10,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1vflkrld7qiikykna2ygw6cv8vn07x458pkrsrxm8imhm579076r"; }; - cargoSha256 = "07pwds279qc54g5fza805ah2m8jhrdzng7vb1bi24a9ra9ci8s29"; + cargoSha256 = "1zpsqg9v1w17ks22i3vspdydfbznv9s3c9av7lww69wkarksznp5"; + #cargoSha256 = "07pwds279qc54g5fza805ah2m8jhrdzng7vb1bi24a9ra9ci8s29"; #cargoSha256 = "10s1h1xya2gl5wj9cj104z50d9awv8z2mbply22lpzwzqyxrrxd9"; #verifyCargoDeps = true; diff --git a/pkgs/taskwarrior-hooks/default.nix b/pkgs/taskwarrior-hooks/default.nix index d7b211a..2ae26d9 100644 --- a/pkgs/taskwarrior-hooks/default.nix +++ b/pkgs/taskwarrior-hooks/default.nix @@ -10,7 +10,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1mj0k6ykac332667315kqrvg37j8r8078g48nafv7ini6lw8djas"; }; - cargoSha256 = "1ijnh2ank9slmfglw4yhnycl11x26m94m2hiq3hcasmbs6c39zj5"; + cargoSha256 = "0l4sa5c1pfjdlbdxrd61wd2qij4zaf8rx1xqac80jicly9rf3859"; + #cargoSha256 = "1ijnh2ank9slmfglw4yhnycl11x26m94m2hiq3hcasmbs6c39zj5"; #verifyCargoDeps = true; meta = with stdenv.lib; { diff --git a/shell.nix b/shell.nix index 509e369..2f22da5 100644 --- a/shell.nix +++ b/shell.nix @@ -30,11 +30,11 @@ let nixPkgs = { nixpkgs.git = { ref = (ops.importJson ./.channelStable.json).rev; - url = "https://github.com/NixOS/nixpkgs-channels"; + url = "https://github.com/NixOS/nixpkgs"; }; nixpkgs-unstable.git = { ref = (ops.importJson ./.channelUnstable.json).rev; - url = "https://github.com/NixOS/nixpkgs-channels"; + url = "https://github.com/NixOS/nixpkgs"; }; }; @@ -108,7 +108,7 @@ let #home-manager.file = toString ~/dev/home-manager; home-manager.git = { url = "https://github.com/rycee/home-manager.git"; - ref = "a378bccd609c159fa8d421233b9c5eae04f02042"; + ref = "7b6ebf2785cfc9dd6fc2b101cbbb2152eb68d45c"; }; background-image-generators.git = { diff --git a/system/all/packages.nix b/system/all/packages.nix index 35d29b7..7071ef9 100644 --- a/system/all/packages.nix +++ b/system/all/packages.nix @@ -102,7 +102,7 @@ in { ]; # configure navi - environment.variables.NAVI_PATH = "$HOME/.cheats"; + #environment.variables.NAVI_PATH = "$HOME/.cheats"; } diff --git a/system/all/syncthing.nix b/system/all/syncthing.nix index 8d6d22c..fea010a 100644 --- a/system/all/syncthing.nix +++ b/system/all/syncthing.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: with lib; { - test.services.syncthing = { + services.syncthing = { guiAddress = "${config.networking.hostName}.private:8384"; declarative = { overrideDevices = true; diff --git a/system/desktop/home-manager.nix b/system/desktop/home-manager.nix index 594a9be..d3d5043 100644 --- a/system/desktop/home-manager.nix +++ b/system/desktop/home-manager.nix @@ -75,7 +75,6 @@ in { home.file.".zshrc".text = '' # a fix for https://github.com/NixOS/nixpkgs/issues/27587 - source ${pkgs.navi}/share/navi/shell/navi.plugin.zsh autoload -U compinit && compinit ''; diff --git a/updateChannels.sh b/updateChannels.sh index 00e0769..aaa3bd6 100644 --- a/updateChannels.sh +++ b/updateChannels.sh @@ -3,7 +3,7 @@ function fetch (){ local rev=$1 local output=$2 - local url=${3:-https://github.com/NixOS/nixpkgs-channels.git} + local url=${3:-https://github.com/NixOS/nixpkgs.git} echo echo @@ -15,7 +15,7 @@ function fetch (){ } -fetch "refs/heads/nixos-20.03" .channelStable.json +fetch "refs/heads/nixos-20.09" .channelStable.json fetch "refs/heads/nixos-unstable" .channelUnstable.json fetch "refs/tags/v3.2.0" .nix-writers.json "https://cgit.krebsco.de/nix-writers/" fetch "ef1e4480cf8af45cfdeac597b2f1b1af33923e93" .nixos-generators.json "https://github.com/nix-community/nixos-generators.git"