diff --git a/nixos/msi/configuration.nix b/nixos/msi/configuration.nix index a883ef9..c459695 100644 --- a/nixos/msi/configuration.nix +++ b/nixos/msi/configuration.nix @@ -30,6 +30,7 @@ in # Nix package installer settings nix = { + package = pkgs.lix; settings = { # Collapse duplicates into a single hard-link during build auto-optimise-store = true; diff --git a/nixos/msi/home.nix b/nixos/msi/home.nix index 1ec691c..58b8c87 100644 --- a/nixos/msi/home.nix +++ b/nixos/msi/home.nix @@ -4,7 +4,7 @@ imports = [ ./modules/xdg.nix ./modules/gaming.nix - ./modules/ghci + ./modules/haskell ./modules/lean.nix ./modules/ocaml.nix ./modules/js.nix diff --git a/nixos/msi/modules/ghci/.ghci b/nixos/msi/modules/haskell/.ghci similarity index 100% rename from nixos/msi/modules/ghci/.ghci rename to nixos/msi/modules/haskell/.ghci diff --git a/nixos/msi/modules/ghci/default.nix b/nixos/msi/modules/haskell/default.nix similarity index 72% rename from nixos/msi/modules/ghci/default.nix rename to nixos/msi/modules/haskell/default.nix index 7453b5d..e462f05 100644 --- a/nixos/msi/modules/ghci/default.nix +++ b/nixos/msi/modules/haskell/default.nix @@ -2,8 +2,10 @@ { home.packages = with pkgs; [ + cabal-install ghc haskell-language-server + haskellPackages.cabal-gild ]; home.file.".ghci".source = ./.ghci; diff --git a/nixos/msi/sound.nix b/nixos/msi/sound.nix index 52d210f..9ee4f2e 100644 --- a/nixos/msi/sound.nix +++ b/nixos/msi/sound.nix @@ -1,23 +1,7 @@ -{ pkgs, ... }: +{ ... }: { - environment.systemPackages = [ pkgs.alsa-utils ]; - - # ALSA provides a udev rule for restoring volume settings. - services.udev.packages = [ pkgs.alsa-utils ]; - - systemd.services.alsa-store = - { description = "Store Sound Card State"; - wantedBy = [ "multi-user.target" ]; - unitConfig.RequiresMountsFor = "/var/lib/alsa"; - unitConfig.ConditionVirtualization = "!systemd-nspawn"; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "${pkgs.coreutils}/bin/mkdir -p /var/lib/alsa"; - ExecStop = "${pkgs.alsa-utils}/sbin/alsactl store --ignore"; - }; - }; + hardware.alsa.enablePersistence = true; security.rtkit.enable = true;