diff options
author | makefu <github@syntax-fehler.de> | 2023-06-13 00:31:19 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2023-06-13 00:31:19 +0200 |
commit | 395ec1dcce5bfc9a026d1a867ead8d8e1f240635 (patch) | |
tree | 5be1854bccaf1c9d4f254af7ca5f7df2fe5b70e8 | |
parent | db6423f146b140c099d12708bcc1b94e72bbe278 (diff) |
configs: apply fixes for flakes
-rw-r--r-- | 2configs/gui/automatic-diskmount.nix | 4 | ||||
-rw-r--r-- | 2configs/home-manager/default.nix | 4 | ||||
-rw-r--r-- | 2configs/home-manager/zsh.nix | 2 | ||||
-rw-r--r-- | 2configs/tools/core-gui.nix | 1 | ||||
-rw-r--r-- | 2configs/tools/core.nix | 5 | ||||
-rw-r--r-- | 2configs/wireguard/wiregrill.nix | 5 |
6 files changed, 10 insertions, 11 deletions
diff --git a/2configs/gui/automatic-diskmount.nix b/2configs/gui/automatic-diskmount.nix index ad3774be8..2cf97da33 100644 --- a/2configs/gui/automatic-diskmount.nix +++ b/2configs/gui/automatic-diskmount.nix @@ -1,5 +1,5 @@ -{ pkgs, ... }: -with import <stockholm/lib>; #genid +{ pkgs, stockholm, ... }: +with stockholm.lib; #genid { # auto-mounting via polkit services.udisks2.enable = true; ## automount all disks: diff --git a/2configs/home-manager/default.nix b/2configs/home-manager/default.nix index be8861100..6af03559e 100644 --- a/2configs/home-manager/default.nix +++ b/2configs/home-manager/default.nix @@ -1,7 +1,5 @@ { - imports = [ - <home-manager/nixos> - ]; + imports = [ ]; home-manager.useUserPackages = true; home-manager.useGlobalPkgs = true; home-manager.users.makefu = { diff --git a/2configs/home-manager/zsh.nix b/2configs/home-manager/zsh.nix index c875d52c8..6f05bcc72 100644 --- a/2configs/home-manager/zsh.nix +++ b/2configs/home-manager/zsh.nix @@ -37,7 +37,7 @@ programs.direnv.enable = true; programs.direnv.nix-direnv.enable = true; programs.direnv.enableZshIntegration = true; - home.packages = [ (pkgs.writeDashBin "nixify" '' + home.packages = [ (pkgs.writers.writeDashBin "nixify" '' test ! -e shell.nix && cat > shell.nix <<EOF { pkgs ? import <nixpkgs> {}}: diff --git a/2configs/tools/core-gui.nix b/2configs/tools/core-gui.nix index bcd3022e8..74d122c51 100644 --- a/2configs/tools/core-gui.nix +++ b/2configs/tools/core-gui.nix @@ -7,7 +7,6 @@ feh clipit # firefox - keepassx pcmanfm evince # replacement for mirage: diff --git a/2configs/tools/core.nix b/2configs/tools/core.nix index aea2e560e..378c89b02 100644 --- a/2configs/tools/core.nix +++ b/2configs/tools/core.nix @@ -49,10 +49,11 @@ ${gnused}/bin/sed -i "''${1}d" ~/.ssh/known_hosts jq parallel proot - populate rxvt_unicode.terminfo - kpaste + + # TODO: missing stockholm overlay + # kpaste ]; } diff --git a/2configs/wireguard/wiregrill.nix b/2configs/wireguard/wiregrill.nix index 922dc8c0f..27984d41b 100644 --- a/2configs/wireguard/wiregrill.nix +++ b/2configs/wireguard/wiregrill.nix @@ -1,5 +1,6 @@ -with import <stockholm/lib>; -{ config, pkgs, ... }: let + +{ config, pkgs, lib, ... }: with lib; with pkgs.stockholm.lib; +let self = config.krebs.build.host.nets.wiregrill; isRouter = !isNull self.via; # via "internet" is not set |