palo
/
nixos-config
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

20.09 update

feature/hass
Ingolf Wagner 2020-11-21 18:56:11 +01:00
parent 87c1b4590a
commit 543b582f60
Signed by: palo
GPG Key ID: 76BF5F1928B9618B
20 changed files with 59 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.channelStable.json
View File

@ -1,7 +1,7 @@
{ {
"url": "https://github.com/NixOS/nixpkgs-channels.git", "url": "https://github.com/NixOS/nixpkgs.git",
"rev": "51d115ac89d676345b05a0694b23bd2691bf708a", "rev": "58f9c4c7d3a42c912362ca68577162e38ea8edfb",
"date": "2020-09-04T14:07:56-07:00", "date": "2020-11-18T12:49:40-05:00",
"sha256": "1gfjaa25nq4vprs13h30wasjxh79i67jj28v54lkj4ilqjhgh2rs", "sha256": "1517dy07jf4zhzknqbgm617lgjxsn7a6k1vgq61c67f6h55qs5ij",
"fetchSubmodules": false "fetchSubmodules": false
} }

8
.channelUnstable.json
View File

@ -1,7 +1,7 @@
{ {
"url": "https://github.com/NixOS/nixpkgs-channels.git", "url": "https://github.com/NixOS/nixpkgs.git",
"rev": "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38", "rev": "2deeb58f49480f468adca6b08291322de4dbce6b",
"date": "2020-08-20T19:08:02+02:00", "date": "2020-11-12T23:50:31+00:00",
"sha256": "1ak7jqx94fjhc68xh1lh35kh3w3ndbadprrb762qgvcfb8351x8v", "sha256": "0fx2car6dcd1yz6jjkifcan0amwzhs3170h0r69k0wfwiaadpvjv",
"fetchSubmodules": false "fetchSubmodules": false
} }

13
configs/pepe/syncthing.nix
View File

@ -5,19 +5,18 @@
custom.samba-share = { custom.samba-share = {
enable = true; enable = true;
folders = { folders = {
movies = config.test.services.syncthing.declarative.folders.movies.path; movies = config.services.syncthing.declarative.folders.movies.path;
music = music = config.services.syncthing.declarative.folders.music-library.path;
config.test.services.syncthing.declarative.folders.music-library.path; samples = config.services.syncthing.declarative.folders.samples.path;
samples = config.test.services.syncthing.declarative.folders.samples.path; series = config.services.syncthing.declarative.folders.series.path;
series = config.test.services.syncthing.declarative.folders.series.path;
}; };
private.test = { private.test = {
folder = config.test.services.syncthing.declarative.folders.porn.path; folder = config.services.syncthing.declarative.folders.porn.path;
users = "kodi"; users = "kodi";
}; };
}; };
test.services.syncthing = { services.syncthing = {
enable = true; enable = true;
openDefaultPorts = true; openDefaultPorts = true;
declarative = { declarative = {

9
configs/porani/syncthing.nix
View File

@ -5,14 +5,13 @@
custom.samba-share = { custom.samba-share = {
enable = true; enable = true;
folders = { folders = {
movies = config.test.services.syncthing.declarative.folders.movies.path; movies = config.services.syncthing.declarative.folders.movies.path;
series = config.test.services.syncthing.declarative.folders.series.path; series = config.services.syncthing.declarative.folders.series.path;
music = music = config.services.syncthing.declarative.folders.music-library.path;
config.test.services.syncthing.declarative.folders.music-library.path;
}; };
}; };
test.services.syncthing = { services.syncthing = {
guiAddress = lib.mkForce "${config.networking.hostName}.insecure:8384"; guiAddress = lib.mkForce "${config.networking.hostName}.insecure:8384";
enable = true; enable = true;
openDefaultPorts = true; openDefaultPorts = true;

4
configs/sterni/packages.nix
View File

@ -6,7 +6,7 @@ in {
nixpkgs.overlays = [ (import <mozilla-overlay/rust-overlay.nix>) ]; nixpkgs.overlays = [ (import <mozilla-overlay/rust-overlay.nix>) ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
bitwig-studio #bitwig-studio
#unstable.sonic-visualiser #unstable.sonic-visualiser
sononym-crawler sononym-crawler
darktable darktable
@ -22,7 +22,7 @@ in {
jetbrains.datagrip jetbrains.datagrip
# foto # foto
fuji-cam-wifi-tool #fuji-cam-wifi-tool
# processing # processing
processing processing

2
configs/sterni/syncthing.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
test.services.syncthing = { services.syncthing = {
enable = true; enable = true;
openDefaultPorts = false; openDefaultPorts = false;
user = "palo"; user = "palo";

28
configs/workhorse/nextcloud.nix
View File

@ -45,31 +45,31 @@ in {
}; };
# shared folders # shared folders
samples = { samples = {
mountPoint = toString mountPoint =
config.test.services.syncthing.declarative.folders.samples.path; toString config.services.syncthing.declarative.folders.samples.path;
hostPath = toString hostPath =
config.test.services.syncthing.declarative.folders.samples.path; toString config.services.syncthing.declarative.folders.samples.path;
isReadOnly = true; isReadOnly = true;
}; };
movies = { movies = {
mountPoint = toString mountPoint =
config.test.services.syncthing.declarative.folders.movies.path; toString config.services.syncthing.declarative.folders.movies.path;
hostPath = toString hostPath =
config.test.services.syncthing.declarative.folders.movies.path; toString config.services.syncthing.declarative.folders.movies.path;
isReadOnly = true; isReadOnly = true;
}; };
music = { music = {
mountPoint = toString mountPoint = toString
config.test.services.syncthing.declarative.folders.music-library.path; config.services.syncthing.declarative.folders.music-library.path;
hostPath = toString hostPath = toString
config.test.services.syncthing.declarative.folders.music-library.path; config.services.syncthing.declarative.folders.music-library.path;
isReadOnly = true; isReadOnly = true;
}; };
series = { series = {
mountPoint = toString mountPoint =
config.test.services.syncthing.declarative.folders.series.path; toString config.services.syncthing.declarative.folders.series.path;
hostPath = toString hostPath =
config.test.services.syncthing.declarative.folders.series.path; toString config.services.syncthing.declarative.folders.series.path;
isReadOnly = true; isReadOnly = true;
}; };
}; };

11
configs/workhorse/syncthing.nix
View File

@ -3,15 +3,14 @@
custom.samba-share = { custom.samba-share = {
enable = true; enable = true;
folders = { folders = {
movies = config.test.services.syncthing.declarative.folders.movies.path; movies = config.services.syncthing.declarative.folders.movies.path;
series = config.test.services.syncthing.declarative.folders.series.path; series = config.services.syncthing.declarative.folders.series.path;
samples = config.test.services.syncthing.declarative.folders.samples.path; samples = config.services.syncthing.declarative.folders.samples.path;
music = music = config.services.syncthing.declarative.folders.music-library.path;
config.test.services.syncthing.declarative.folders.music-library.path;
}; };
}; };
test.services.syncthing = { services.syncthing = {
enable = true; enable = true;
openDefaultPorts = false; openDefaultPorts = false;
dataDir = "/home/syncthing"; dataDir = "/home/syncthing";

2
configs/workout/syncthing.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
test.services.syncthing = { services.syncthing = {
enable = true; enable = true;
openDefaultPorts = false; openDefaultPorts = false;
user = "palo"; user = "palo";

2
modules/default.nix
View File

@ -2,7 +2,7 @@
imports = [ imports = [
./later/syncthing.nix #./later/syncthing.nix
#./later/nextcloud.nix #./later/nextcloud.nix
./services/light-control.nix ./services/light-control.nix

4
modules/later/syncthing.nix
View File

@ -1,11 +1,11 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
assert lib.versionOlder lib.version "20.09"; # assert lib.versionOlder lib.version "20.09";
with lib; with lib;
let let
cfg = config.test.services.syncthing; cfg = config.services.syncthing;
defaultUser = "syncthing"; defaultUser = "syncthing";
devices = mapAttrsToList (name: device: { devices = mapAttrsToList (name: device: {

2
modules/services/samba-share.nix
View File

@ -94,7 +94,7 @@ in {
}) })
# todo : maybe better to have a parameter for this # 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" ]; users.groups."syncthing".members = [ "smbguest" ];
}) })
]; ];

8
modules/system/x11.nix
View File

@ -34,11 +34,9 @@ in {
# ----------------------- # -----------------------
desktopManager = { xterm.enable = false; }; desktopManager = { xterm.enable = false; };
displayManager.defaultSession = "none+xmonad"; displayManager.defaultSession = "none+xmonad";
displayManager.lightdm = { displayManager.autoLogin.enable = true;
enable = true; displayManager.autoLogin.user = cfg.autoLoginUser;
autoLogin.enable = true; displayManager.lightdm = { enable = true; };
autoLogin.user = cfg.autoLoginUser;
};
windowManager = { windowManager = {
xmonad.enable = true; xmonad.enable = true;
xmonad.enableContribAndExtras = true; xmonad.enableContribAndExtras = true;

3
pkgs/image-generator/default.nix
View File

@ -10,7 +10,8 @@ rustPlatform.buildRustPackage rec {
sha256 = "1vflkrld7qiikykna2ygw6cv8vn07x458pkrsrxm8imhm579076r"; sha256 = "1vflkrld7qiikykna2ygw6cv8vn07x458pkrsrxm8imhm579076r";
}; };
cargoSha256 = "07pwds279qc54g5fza805ah2m8jhrdzng7vb1bi24a9ra9ci8s29"; cargoSha256 = "1zpsqg9v1w17ks22i3vspdydfbznv9s3c9av7lww69wkarksznp5";
#cargoSha256 = "07pwds279qc54g5fza805ah2m8jhrdzng7vb1bi24a9ra9ci8s29";
#cargoSha256 = "10s1h1xya2gl5wj9cj104z50d9awv8z2mbply22lpzwzqyxrrxd9"; #cargoSha256 = "10s1h1xya2gl5wj9cj104z50d9awv8z2mbply22lpzwzqyxrrxd9";
#verifyCargoDeps = true; #verifyCargoDeps = true;

3
pkgs/taskwarrior-hooks/default.nix
View File

@ -10,7 +10,8 @@ rustPlatform.buildRustPackage rec {
sha256 = "1mj0k6ykac332667315kqrvg37j8r8078g48nafv7ini6lw8djas"; sha256 = "1mj0k6ykac332667315kqrvg37j8r8078g48nafv7ini6lw8djas";
}; };
cargoSha256 = "1ijnh2ank9slmfglw4yhnycl11x26m94m2hiq3hcasmbs6c39zj5"; cargoSha256 = "0l4sa5c1pfjdlbdxrd61wd2qij4zaf8rx1xqac80jicly9rf3859";
#cargoSha256 = "1ijnh2ank9slmfglw4yhnycl11x26m94m2hiq3hcasmbs6c39zj5";
#verifyCargoDeps = true; #verifyCargoDeps = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {

6
shell.nix
View File

@ -30,11 +30,11 @@ let
nixPkgs = { nixPkgs = {
nixpkgs.git = { nixpkgs.git = {
ref = (ops.importJson ./.channelStable.json).rev; ref = (ops.importJson ./.channelStable.json).rev;
url = "https://github.com/NixOS/nixpkgs-channels"; url = "https://github.com/NixOS/nixpkgs";
}; };
nixpkgs-unstable.git = { nixpkgs-unstable.git = {
ref = (ops.importJson ./.channelUnstable.json).rev; 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.file = toString ~/dev/home-manager;
home-manager.git = { home-manager.git = {
url = "https://github.com/rycee/home-manager.git"; url = "https://github.com/rycee/home-manager.git";
ref = "a378bccd609c159fa8d421233b9c5eae04f02042"; ref = "7b6ebf2785cfc9dd6fc2b101cbbb2152eb68d45c";
}; };
background-image-generators.git = { background-image-generators.git = {

2
system/all/packages.nix
View File

@ -102,7 +102,7 @@ in {
]; ];
# configure navi # configure navi
environment.variables.NAVI_PATH = "$HOME/.cheats"; #environment.variables.NAVI_PATH = "$HOME/.cheats";
} }

2
system/all/syncthing.nix
View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; { with lib; {
test.services.syncthing = { services.syncthing = {
guiAddress = "${config.networking.hostName}.private:8384"; guiAddress = "${config.networking.hostName}.private:8384";
declarative = { declarative = {
overrideDevices = true; overrideDevices = true;

1
system/desktop/home-manager.nix
View File

@ -75,7 +75,6 @@ in {
home.file.".zshrc".text = '' home.file.".zshrc".text = ''
# a fix for https://github.com/NixOS/nixpkgs/issues/27587 # a fix for https://github.com/NixOS/nixpkgs/issues/27587
source ${pkgs.navi}/share/navi/shell/navi.plugin.zsh
autoload -U compinit && compinit autoload -U compinit && compinit
''; '';

4
updateChannels.sh
View File

@ -3,7 +3,7 @@
function fetch (){ function fetch (){
local rev=$1 local rev=$1
local output=$2 local output=$2
local url=${3:-https://github.com/NixOS/nixpkgs-channels.git} local url=${3:-https://github.com/NixOS/nixpkgs.git}
echo echo
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/heads/nixos-unstable" .channelUnstable.json
fetch "refs/tags/v3.2.0" .nix-writers.json "https://cgit.krebsco.de/nix-writers/" 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" fetch "ef1e4480cf8af45cfdeac597b2f1b1af33923e93" .nixos-generators.json "https://github.com/nix-community/nixos-generators.git"