diff --git a/flake.lock b/flake.lock index aeb8d9a..fd5607c 100644 --- a/flake.lock +++ b/flake.lock @@ -146,11 +146,11 @@ "emacs-overlay_2": { "flake": false, "locked": { - "lastModified": 1655893294, - "narHash": "sha256-ICpY7sKldeWDIJ1gnIyyLDv2xNKqkczxTy7Xjz2b8s0=", + "lastModified": 1655954209, + "narHash": "sha256-I+y+kn7GZdKWdU0Feb1CgxEtNjFuG2xyI/gC0ASYUQM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e0d8cd1477216ece946d472c51e15a27cacf6664", + "rev": "4ce40e3561935b03956b91c188225b559312cee4", "type": "github" }, "original": { @@ -540,11 +540,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1655807518, - "narHash": "sha256-5YV29Ry/DpAJc/0Hc/+ISVBAjwHpJvAkeKkcUG5lWsc=", + "lastModified": 1655895887, + "narHash": "sha256-AbihSVmPKFcQmaVgzNSLQ8sLAaVTTELPSzZ+/gRVfyk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a72d7811be1162dd6804c4e36e5402d76fb6e921", + "rev": "e1e08fe28bf0588a41cd556eac40b98d2793da99", "type": "github" }, "original": { @@ -571,11 +571,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1655096306, - "narHash": "sha256-3B3zBaQVLL956deZgmucouvkZroObQ4JKHzbIfFS9/c=", + "lastModified": 1655729248, + "narHash": "sha256-5GrrkHaXknG1M4lYskTR3H9Ghzdmdhp8LhFL9xEKwtU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a119e218ad27bea32057a3463e3694a61c9e3802", + "rev": "d423c0ce15adf573c2045bef5c921b958b674bb4", "type": "github" }, "original": { @@ -733,8 +733,8 @@ "private_assets": { "flake": false, "locked": { - "lastModified": 1655930779, - "narHash": "sha256-QaIZ0HRwWD1lC3e+DwdXaBHtmhduOtEfoa1KGpw3Ew0=", + "lastModified": 1655934778, + "narHash": "sha256-o0pRJw9GrlcH+VGJbzRjck/tWgj3LVKbxpRhVkOPUEQ=", "path": "/home/palo/dev/private_assets", "type": "path" }, diff --git a/flake.nix b/flake.nix index cac888f..ff6bd08 100644 --- a/flake.nix +++ b/flake.nix @@ -155,7 +155,7 @@ sterni = { name, nodes, pkgs, ... }: { deployment.targetHost = "${name}.private"; - deployment.tags = [ "desktop" ]; + deployment.tags = [ "desktop" "online" ]; imports = [ grocy-scanner.nixosModule ]; @@ -178,12 +178,13 @@ doom-emacs-nix.hmModule home-manager-utils.hmModule ]; + programs.doom-emacs.enable = false; }; }; pepe = { name, nodes, pkgs, ... }: { deployment.targetHost = "${name}.private"; - deployment.tags = [ "server" ]; + deployment.tags = [ "server" "online" ]; imports = [ grocy-scanner.nixosModule ]; @@ -191,7 +192,7 @@ robi = { name, nodes, pkgs, ... }: { deployment.targetHost = "${name}"; - deployment.tags = [ "server" ]; + deployment.tags = [ "server" "online" ]; imports = [ ]; }; diff --git a/nixos/configs/sternchen/packages.nix b/nixos/configs/sternchen/packages.nix index 29ea536..f2e83d2 100644 --- a/nixos/configs/sternchen/packages.nix +++ b/nixos/configs/sternchen/packages.nix @@ -45,7 +45,7 @@ gwenview skanlite - tor-browser-bundle-bin + unstable.tor-browser-bundle-bin #(tor-browser-bundle-bin.overrideAttrs (old: rec { # version = "11.0.1"; # name = "tor-browser-bundle-${version}"; diff --git a/nixos/system/all/nginx.nix b/nixos/system/all/nginx.nix index 58b64fc..8730e39 100644 --- a/nixos/system/all/nginx.nix +++ b/nixos/system/all/nginx.nix @@ -5,7 +5,7 @@ let in { - security.acme.email = "contact@ingolf-wagner.de"; + security.acme.defaults.email = "contact@ingolf-wagner.de"; security.acme.acceptTerms = true; services.nginx = { diff --git a/nixos/system/desktop/home-manager.nix b/nixos/system/desktop/home-manager.nix index fa1a44f..ccfe79a 100644 --- a/nixos/system/desktop/home-manager.nix +++ b/nixos/system/desktop/home-manager.nix @@ -30,7 +30,6 @@ in imports = [ ./home-manager/dunst.nix - #./home-manager/spacemacs.nix ./home-manager/doom-emacs.nix ./home-manager/ssh.nix ./home-manager/xmonad.nix diff --git a/nixos/system/desktop/home-manager/doom-emacs.nix b/nixos/system/desktop/home-manager/doom-emacs.nix index 35bfa8d..f5c3192 100644 --- a/nixos/system/desktop/home-manager/doom-emacs.nix +++ b/nixos/system/desktop/home-manager/doom-emacs.nix @@ -1,7 +1,7 @@ -{ pkgs, ... }: { +{ pkgs, lib, ... }: { home-manager.users.mainUser = { programs.doom-emacs = { - enable = true; + enable = lib.mkDefault true; doomPrivateDir = ./doom.d; emacsPackagesOverlay = self: super: { diff --git a/nixos/system/desktop/wtf.nix b/nixos/system/desktop/wtf.nix index 7aa6ebd..20c7823 100644 --- a/nixos/system/desktop/wtf.nix +++ b/nixos/system/desktop/wtf.nix @@ -324,25 +324,25 @@ let refreshInterval = 30; }; - active-tasks = cmdRunner { - title = "active tasks"; - cmd = activeTasks; - top = 4; - left = 2; - height = 1; - width = 3; - refreshInterval = 60; - }; + #active-tasks = cmdRunner { + # title = "active tasks"; + # cmd = activeTasks; + # top = 4; + # left = 2; + # height = 1; + # width = 3; + # refreshInterval = 60; + #}; - next-week-tasks = cmdRunner { - title = "upcoming"; - cmd = taskNextWeek; - top = 4; - left = 0; - height = 1; - width = 2; - refreshInterval = 60; - }; + #next-week-tasks = cmdRunner { + # title = "upcoming"; + # cmd = taskNextWeek; + # top = 4; + # left = 0; + # height = 1; + # width = 2; + # refreshInterval = 60; + #}; network-status = cmdRunner { title = "network status";