diff options
Diffstat (limited to '')
-rw-r--r-- | modules/common/curl.nix | 2 | ||||
-rw-r--r-- | modules/common/mpv.nix | 2 | ||||
-rw-r--r-- | modules/common/profiles/dev/default.nix | 77 |
3 files changed, 41 insertions, 40 deletions
diff --git a/modules/common/curl.nix b/modules/common/curl.nix index 97b4b55..1514a09 100644 --- a/modules/common/curl.nix +++ b/modules/common/curl.nix @@ -10,7 +10,7 @@ in { options.nixfiles.modules.curl.enable = mkEnableOption "cURL"; config = mkIf cfg.enable { - hm.home.file.".curlrc".text = '' + hm.xdg.configFile.".curlrc".text = '' connect-timeout = 60 progress-bar remote-time diff --git a/modules/common/mpv.nix b/modules/common/mpv.nix index 596d163..6f45304 100644 --- a/modules/common/mpv.nix +++ b/modules/common/mpv.nix @@ -109,7 +109,7 @@ in { osd-level = 1; osd-shadow-color = "#33000000"; - osc = false; + # osc = false; blend-subtitles = true; embeddedfonts = false; diff --git a/modules/common/profiles/dev/default.nix b/modules/common/profiles/dev/default.nix index 8c9e400..f7c313f 100644 --- a/modules/common/profiles/dev/default.nix +++ b/modules/common/profiles/dev/default.nix @@ -28,55 +28,56 @@ in { wget.enable = true; }; - hm.home = { - file = { - ".gdbinit".source = ./gdbinit; + hm = { + home = { + sessionVariables = rec { + CABAL_DIR = "${config.dirs.data}/cabal"; + CABAL_CONFIG = pkgs.writeText "cabal-config" '' + repository hackage.haskell.org + url: https://hackage.haskell.org/ + secure: True - ".ghc/ghci.conf".source = ./ghci.conf; - }; - - sessionVariables = rec { - CABAL_DIR = "${config.my.home}/.cabal"; - CABAL_CONFIG = pkgs.writeText "cabal-config" '' - repository hackage.haskell.org - url: https://hackage.haskell.org/ - secure: True + jobs: $ncpus - jobs: $ncpus + remote-repo-cache: ${CABAL_DIR}/packages - remote-repo-cache: ${CABAL_DIR}/packages + world-file: ${CABAL_DIR}/world - world-file: ${CABAL_DIR}/world + logs-dir: ${CABAL_DIR}/logs + build-summary: ${CABAL_DIR}/logs/build.log - logs-dir: ${CABAL_DIR}/logs - build-summary: ${CABAL_DIR}/logs/build.log + installdir: ${CABAL_DIR}/bin + extra-prog-path: ${CABAL_DIR}/bin + ''; + STACK_ROOT = "${config.dirs.data}/stack"; - installdir: ${CABAL_DIR}/bin - extra-prog-path: ${CABAL_DIR}/bin - ''; + RUSTUP_HOME = "${config.dirs.data}/rustup"; + CARGO_HOME = "${config.dirs.data}/cargo"; - STACK_ROOT = "${config.my.home}/.stack"; + GOPATH = "${config.dirs.data}/go"; + GORE_HOME = "${config.dirs.data}/gore"; - CARGO_HOME = "${config.my.home}/.cargo"; + PYTHONSTARTUP = ./pystartup.py; + }; - GOPATH = "${config.my.home}/.go"; - GORE_HOME = "${config.my.home}/.gore"; - - PYTHONSTARTUP = ./pystartup.py; + packages = with pkgs; [ + nix-index + nix-update + nixpkgs-review + hydra-check + jq + yq + htmlq + sops + httpie + logcli + ]; }; - packages = with pkgs; [ - nix-index - nix-update - nixpkgs-review - hydra-check - jq - yq - htmlq - sops - httpie - logcli - ]; + xdg.configFile = { + "gdb/gdbinit".source = ./gdbinit; + "ghc/ghci.conf".source = ./ghci.conf; + }; }; }; } |