maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Delete dead code

Browse source
This commit is contained in:
Malte Brandy 2021-12-09 23:10:09 +01:00
parent d64b5436c2
commit 2e6aa75352
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
11 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
channels.nix
View file

@ -3,10 +3,10 @@ let
nixpkgs-channel = "nixos-21.11"; nixpkgs-channel = "nixos-21.11";
home-manager-channel = "home-manager-21.11"; home-manager-channel = "home-manager-21.11";
}; };
unstable = { #unstable = {
nixpkgs-channel = "nixos-unstable"; # nixpkgs-channel = "nixos-unstable";
home-manager-channel = "home-manager-master"; # home-manager-channel = "home-manager-master";
}; #};
in in
rec { rec {
hera = nixos-21-11; hera = nixos-21-11;

1
common/common.nix
View file

@ -6,7 +6,6 @@
path = "${path}/${name}"; path = "${path}/${name}";
devices = hosts; devices = hosts;
}; };
rootFolder = path;
devices = { devices = {
apollo.id = "BOTTTGS-QQUHWAK-IFBT3T2-HGHHUZ7-QHRZXC7-JC42VT7-67ZOJBE-WHDWEQX"; apollo.id = "BOTTTGS-QQUHWAK-IFBT3T2-HGHHUZ7-QHRZXC7-JC42VT7-67ZOJBE-WHDWEQX";
zeus.id = "5BUZIS5-ESTYAJO-IQQD7EA-O3VGONJ-E74OHUJ-ZSLF4JK-6HS3UHG-4CQ5OAO"; zeus.id = "5BUZIS5-ESTYAJO-IQQD7EA-O3VGONJ-E74OHUJ-ZSLF4JK-6HS3UHG-4CQ5OAO";

1
home-manager/machines.nix
View file

@ -1,5 +1,4 @@
let let
inherit (import (import ../nix/sources.nix).nixos-unstable { }) lib;
restrictedPages = [ restrictedPages = [
"reddit.com" "reddit.com"
"github.com" "github.com"

1
nixos/machines/hera/configuration.nix
View file

@ -1,6 +1,5 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
inherit (config.m-0.private) me;
inherit (import ../../../common/common.nix { inherit pkgs; }) syncthing; inherit (import ../../../common/common.nix { inherit pkgs; }) syncthing;
backupJobs = pkgs.privateValue { } "borgbackup"; backupJobs = pkgs.privateValue { } "borgbackup";
backupJobNames = map (name: "borgbackup-job-${name}") (lib.attrNames backupJobs); backupJobNames = map (name: "borgbackup-job-${name}") (lib.attrNames backupJobs);

7
nixos/roles/git.nix
View file

@ -1,13 +1,6 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
gitoliteCfg = config.services.gitolite; gitoliteCfg = config.services.gitolite;
me = config.m-0.private.me;
update-command = [
"${pkgs.systemd}/bin/systemctl"
"restart"
"test-config.service"
"--no-block"
];
post-update = pkgs.writeHaskellScript post-update = pkgs.writeHaskellScript
{ {
name = "post-update"; name = "post-update";

1
nixos/roles/laminar/kassandra.nix
View file

@ -6,7 +6,6 @@ let
export PATH=${lib.makeBinPath path}:$PATH export PATH=${lib.makeBinPath path}:$PATH
''; '';
repo = "/var/www/fdroid"; repo = "/var/www/fdroid";
appName = "de.maralorn.kassandra";
deploy = "${pkgs.writeShellScript "deploy" '' deploy = "${pkgs.writeShellScript "deploy" ''
systemctl restart kassandra systemctl restart kassandra
cd /var/cache/gc-links/kassandra-android cd /var/cache/gc-links/kassandra-android

1
nixos/roles/laminar/test-config.nix
View file

@ -48,7 +48,6 @@ let
git show -q git show -q
REPODIR=. REPODIR=.
''; '';
remoteFlags = "--builders @/etc/nix/machines";
systems = builtins.attrNames (builtins.readDir ../../machines); systems = builtins.attrNames (builtins.readDir ../../machines);
homes = lib.attrNames (import ../../../home-manager/machines.nix); homes = lib.attrNames (import ../../../home-manager/machines.nix);
mkHomeJob = ( mkHomeJob = (

4
nixos/roles/matrix-signal/default.nix
View file

@ -1,8 +1,4 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, ... }:
let
synapse-port = 8008;
in
{ {
imports = [ imports = [
./mautrix-signal-module.nix ./mautrix-signal-module.nix

2
nixos/roles/standalone/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, config, lib, ... }: { { pkgs, config, ... }: {
boot = { boot = {
plymouth.enable = true; plymouth.enable = true;

1
overlays/30-ghc/default.nix
View file

@ -1,6 +1,5 @@
final: prev: final: prev:
let let
inherit (prev.haskell.lib) overrideCabal unmarkBroken doJailbreak dontCheck;
myPkgs = import ./packages.nix; myPkgs = import ./packages.nix;
in in
{ {

2
private

@ -1 +1 @@
Subproject commit 6b928b7d6554c7cdd2b912ca7e753fb4a3122ff0 Subproject commit f89590a6fc8c75eb17dfbbfd17203b5a4e172bce