diff --git a/configs/packages.nix b/configs/packages.nix index b6d4e29..c139e9c 100644 --- a/configs/packages.nix +++ b/configs/packages.nix @@ -1,6 +1,5 @@ { config, pkgs, lib, ... }: let - scripts = import ../dot/scripts.nix { inherit pkgs lib; }; daybook = pkgs.callPackage ../packages/daybook.nix {}; iolanguage = pkgs.callPackage ../packages/iolanguage.nix {}; todoist = pkgs.callPackage ../packages/todoist {}; @@ -104,7 +103,7 @@ in with pkgs; services.urxvtd.enable = true; services.dbus.packages = [ pkgs.gnome3.dconf ]; - users.users.kfm.packages = scripts ++ [ + users.users.kfm.packages = [ ] ++ [ # typesetting (texlive.combine { inherit (pkgs.texlive) scheme-full texdoc latex2e-help-texinfo; diff --git a/dot/scripts.nix b/configs/scripts.nix similarity index 96% rename from dot/scripts.nix rename to configs/scripts.nix index a48967a..0cad5dd 100644 --- a/dot/scripts.nix +++ b/configs/scripts.nix @@ -1,4 +1,4 @@ -{ pkgs, lib }: +{ config, pkgs, lib, ... }: let theme = import ../theme.nix; unstable = import {}; @@ -496,4 +496,19 @@ let wait ${q-todo} ''; -in lib.attrsets.attrValues scripts +in { + environment.shellAliases = + let rlwrap = cmd: "${pkgs.rlwrap}/bin/rlwrap ${cmd}"; + in { + o = "${pkgs.xdg_utils}/bin/xdg-open"; + ns = "nix-shell --command zsh"; + ":r" = ''echo "You stupid!"''; + clipboard = "${pkgs.xclip}/bin/xclip -se c"; + ip = "${pkgs.iproute}/bin/ip -c"; + ocaml = rlwrap "${pkgs.ocaml}/bin/ocaml"; + tmux = "${pkgs.tmux}/bin/tmux -2"; + nixi = ''nix repl ""''; + }; + + environment.systemPackages = lib.attrsets.attrValues scripts; +} diff --git a/configs/shells.nix b/configs/shells.nix index a3d01d4..34ef0c4 100644 --- a/configs/shells.nix +++ b/configs/shells.nix @@ -1,18 +1,5 @@ { pkgs, ... }: { - environment.shellAliases = - let rlwrap = cmd: "${pkgs.rlwrap}/bin/rlwrap ${cmd}"; - in { - o = "${pkgs.xdg_utils}/bin/xdg-open"; - ns = "nix-shell --command zsh"; - ":r" = ''echo "You stupid!"''; - clipboard = "${pkgs.xclip}/bin/xclip -se c"; - ip = "${pkgs.iproute}/bin/ip -c"; - ocaml = rlwrap "${pkgs.ocaml}/bin/ocaml"; - tmux = "${pkgs.tmux}/bin/tmux -2"; - nixi = ''nix repl ""''; - }; - environment.interactiveShellInit = "export PATH=$PATH:$HOME/.local/bin:$HOME/.cargo/bin"; programs.zsh = { diff --git a/main.nix b/main.nix index e12ed3a..fc0c309 100644 --- a/main.nix +++ b/main.nix @@ -11,6 +11,7 @@ in { configs/graphics.nix configs/packages.nix configs/networks.nix + configs/scripts.nix configs/retiolum.nix ];