configs: apply fixes for flakes

This commit is contained in:
makefu 2023-06-13 00:31:19 +02:00
parent db6423f146
commit 395ec1dcce
6 changed files with 10 additions and 11 deletions

View file

@ -1,5 +1,5 @@
{ pkgs, ... }: { pkgs, stockholm, ... }:
with import <stockholm/lib>; #genid with stockholm.lib; #genid
{ # auto-mounting via polkit { # auto-mounting via polkit
services.udisks2.enable = true; services.udisks2.enable = true;
## automount all disks: ## automount all disks:

View file

@ -1,7 +1,5 @@
{ {
imports = [ imports = [ ];
<home-manager/nixos>
];
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.users.makefu = { home-manager.users.makefu = {

View file

@ -37,7 +37,7 @@
programs.direnv.enable = true; programs.direnv.enable = true;
programs.direnv.nix-direnv.enable = true; programs.direnv.nix-direnv.enable = true;
programs.direnv.enableZshIntegration = true; programs.direnv.enableZshIntegration = true;
home.packages = [ (pkgs.writeDashBin "nixify" '' home.packages = [ (pkgs.writers.writeDashBin "nixify" ''
test ! -e shell.nix && cat > shell.nix <<EOF test ! -e shell.nix && cat > shell.nix <<EOF
{ pkgs ? import <nixpkgs> {}}: { pkgs ? import <nixpkgs> {}}:

View file

@ -7,7 +7,6 @@
feh feh
clipit clipit
# firefox # firefox
keepassx
pcmanfm pcmanfm
evince evince
# replacement for mirage: # replacement for mirage:

View file

@ -49,10 +49,11 @@ ${gnused}/bin/sed -i "''${1}d" ~/.ssh/known_hosts
jq jq
parallel parallel
proot proot
populate
rxvt_unicode.terminfo rxvt_unicode.terminfo
kpaste
# TODO: missing stockholm overlay
# kpaste
]; ];
} }

View file

@ -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; self = config.krebs.build.host.nets.wiregrill;
isRouter = !isNull self.via; # via "internet" is not set isRouter = !isNull self.via; # via "internet" is not set