kropsify some more

configs/editors.nix

@@ -1,5 +1,5 @@
 { pkgs, config, ... }:
-let vimConfig = import <niveum/dot/vim.nix> { inherit config pkgs; };
+let vimConfig = import <dot/vim.nix> { inherit config pkgs; };
 in {
   programs.nano.nanorc = ''
     set autoindent
@@ -19,7 +19,7 @@ in {
   nixpkgs.config.packageOverrides = pkgs: {
     nvim = pkgs.neovim.override {
       configure = {
-        customRC = builtins.readFile <niveum/dot/vimrc>;
+        customRC = builtins.readFile <dot/vimrc>;
         packages.nvim = with pkgs.vimPlugins; {
           start = with pkgs.vimPlugins; [
             ale

configs/graphics.nix

@@ -1,6 +1,6 @@
 { pkgs, lib, config, ... }:
 {
-  services.xserver = with import <niveum/lib>; with import <niveum/theme.nix>; {
+  services.xserver = with import <lib>; with import <dot/theme.nix>; {
     enable = true;
     layout = commaSep [ "de" "gr" "ru" ];
     xkbVariant = commaSep [ "T3" "polytonic" "phonetic_winkeys" ];
@@ -17,7 +17,7 @@
       notifier = ''${pkgs.libnotify}/bin/notify-send -u normal -a xautolock "Locking soon" "The screen will lock in 10 seconds."'';
     };
     displayManager.sessionCommands = ''
-      ${pkgs.feh}/bin/feh --bg-fill $(find ${<niveum/art>} -type f | shuf -n 1) &
+      ${pkgs.feh}/bin/feh --bg-fill $(find ${<art>} -type f | shuf -n 1) &
       ${pkgs.dropbox-cli}/bin/dropbox start &
       ${pkgs.seafile-client}/bin/seafile-applet &
       ${pkgs.systemd}/bin/systemctl --user import-environment XDG_SESSION_PATH
@@ -43,7 +43,7 @@
   i18n = {
     defaultLocale = "en_GB.UTF-8";
     consoleKeyMap = "de";
-    consoleColors = with import <niveum/theme.nix>; map (c: lib.strings.removePrefix "#" c) colorPalette;
+    consoleColors = with import <dot/theme.nix>; map (c: lib.strings.removePrefix "#" c) colorPalette;
   };
 
   services.compton = {
@@ -83,12 +83,12 @@
 
     xsession.windowManager.i3 = {
       enable = true;
-      config = import <niveum/dot/i3.nix> { inherit lib pkgs config; };
+      config = import <dot/i3.nix> { inherit lib pkgs config; };
     };
 
-    xresources.properties = import <niveum/dot/xresources.nix> { inherit lib; };
-    programs.rofi = import <niveum/dot/rofi.nix> { inherit config; };
-    services.dunst = import <niveum/dot/dunst.nix> { inherit pkgs config; };
-    programs.urxvt = import <niveum/dot/urxvt.nix> { inherit pkgs config; };
+    xresources.properties = import <dot/xresources.nix> { inherit lib; };
+    programs.rofi = import <dot/rofi.nix> { inherit config; };
+    services.dunst = import <dot/dunst.nix> { inherit pkgs config; };
+    programs.urxvt = import <dot/urxvt.nix> { inherit pkgs config; };
   };
 }

configs/hu-berlin.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }:
 let
-  eduroam = (import <niveum/secrets.nix>).eduroam;
+  eduroam = (import <dot/secrets.nix>).eduroam;
   eduroamConfig = {
       auth = ''
         key_mgmt=WPA-EAP

configs/packages.nix

@@ -1,13 +1,13 @@
 { config, pkgs, lib, ... }:
 let
-  bvg = pkgs.callPackage <niveum/packages/bvg.nix> {};
-  daybook = pkgs.callPackage <niveum/packages/daybook.nix> {};
-  iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> {};
-  sncli = pkgs.python3Packages.callPackage <niveum/packages/sncli.nix> {};
-  todoist = pkgs.callPackage <niveum/packages/todoist> {};
-  spotify-cli-linux = pkgs.python3Packages.callPackage <niveum/packages/spotify-cli-linux.nix> {};
-  instaloader = pkgs.python3Packages.callPackage <niveum/packages/instaloader.nix> {};
-  haskells = import <niveum/dot/haskells.nix>;
+  bvg = pkgs.callPackage <packages/bvg.nix> {};
+  daybook = pkgs.callPackage <packages/daybook.nix> {};
+  iolanguage = pkgs.callPackage <packages/iolanguage.nix> {};
+  sncli = pkgs.python3Packages.callPackage <packages/sncli.nix> {};
+  todoist = pkgs.callPackage <packages/todoist> {};
+  spotify-cli-linux = pkgs.python3Packages.callPackage <packages/spotify-cli-linux.nix> {};
+  instaloader = pkgs.python3Packages.callPackage <packages/instaloader.nix> {};
+  haskells = import <dot/haskells.nix>;
   unstable = import <nixos-unstable> {};
   executables = pkgs.haskell.lib.justStaticExecutables;
 in with pkgs;

configs/retiolum.nix

@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 {
-  imports = [ <niveum/modules/retiolum.nix> ];
+  imports = [ <modules/retiolum.nix> ];
 
   networking.hosts = {
     "42:0:ca48:f98f:63d7:31ce:922b:245d" = [ "go" ];
@@ -18,7 +18,7 @@
   }.${config.networking.hostName};
 
   environment.etc."tinc/retiolum/rsa_key.priv" = {
-    text = (import <niveum/secrets.nix>).retiolum.privateKey.${config.networking.hostName};
+    text = (import <dot/secrets.nix>).retiolum.privateKey.${config.networking.hostName};
     mode = "400";
   };
 }

configs/scripts.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 let
-  theme = import <niveum/theme.nix>;
+  theme = import <dot/theme.nix>;
   unstable = import <nixos-unstable> {};
   scripts.dic = pkgs.callPackage (pkgs.fetchurl {
     url = "https://cgit.krebsco.de/stockholm/plain/krebs/5pkgs/simple/dic/default.nix?id=8371e21c10bdb5d5353cc581efba7e09e4ce7a91";

configs/shells.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 let
   zsh-plugins-file =
     pkgs.writeText "zsh_plugins.txt" (lib.concatStringsSep "\n" [
@@ -69,7 +69,7 @@ in {
 
       export KEYTIMEOUT=1
 
-      hash -d nixos=/etc/nixos
+      hash -d nixos=/etc/nixos niveum=${config.users.users.kfm.home}/prog/git/niveum
 
       autoload -U zmv run-help
 
@@ -77,6 +77,12 @@ in {
         mkdir $1
         cd $1
       }
+
+      niveum-deploy() {
+        for system in "$@"; do
+          eval $(nix-build ~niveum/deploy.nix -A "$system")
+        done
+      }
     '';
     promptInit = ''
       autoload -Uz vcs_info