Skip to content

Commit

Permalink
updating nix config (deprecated warnings)
Browse files Browse the repository at this point in the history
trace: warning: In file hw-laptop.nix
a list is being assigned to the option config.boot.initrd.luks.devices.
This will soon be an error as type loaOf is deprecated.
See NixOS/nixpkgs#63103 for more information.
Do
  boot.initrd.luks.devices =
    { main = {...}; }
instead of
  boot.initrd.luks.devices =
    [ { name = "main"; ...} ]

trace: warning: The option `i18n.consoleKeyMap' defined in `configuration.nix' has been renamed to `console.keyMap'.

trace: warning: The following options are deprecated:
  - services.xserver.desktopManager.default
  - services.xserver.windowManager.default
Please use
  services.xserver.displayManager.defaultSession = "none+xmonad";
instead.
  • Loading branch information
yokodake committed Mar 5, 2020
1 parent 219c7f8 commit 14150bb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 15 deletions.
17 changes: 7 additions & 10 deletions configuration.nix
Expand Up @@ -9,10 +9,8 @@
systemd.packages = [ pkgs.systemd-cryptsetup-generator ];

# Select internationalisation properties.
i18n = {
consoleKeyMap = "us";
defaultLocale = "en_US.UTF-8";
};
console.keyMap = "us";
i18n.defaultLocale = "en_US.UTF-8";

# Set your time zone.
time.timeZone = "Europe/Paris";
Expand All @@ -32,16 +30,14 @@
layout = "us,us(intl)";
xkbOptions = "grp:shift_caps_toggle,nbsp:level2";

desktopManager = {
default = "none";
xterm.enable = false;
};
desktopManager.xterm.enable = false;

#windowManager.i3.enable = true;
windowManager.xmonad.enable = true;
windowManager.xmonad.extraPackages = self: [ self.xmonad-contrib ];
windowManager.xmonad.haskellPackages = pkgs.haskell.packages.ghc865;
windowManager.default = "xmonad";

displayManager.defaultSession = "none+xmonad";
};
sshd.enable = true;
};
Expand Down Expand Up @@ -104,10 +100,12 @@
anki
binutils
cabal2nix
clang-tools
curl
emacs
feh
ffmpeg
filezilla
firefox-devedition-bin
git
haskell.compiler.ghc881
Expand Down Expand Up @@ -151,7 +149,6 @@
xscreensaver
zathura
zip
clang-tools
];

nix.gc.automatic = true;
Expand Down
9 changes: 4 additions & 5 deletions hw-laptop.nix
Expand Up @@ -32,13 +32,12 @@
[ { device = "/dev/disk/by-uuid/f9af689c-8d7c-4646-a573-58f0ea55e75d"; }
];

boot.initrd.luks.devices = [
{
name = "main";
boot.initrd.luks.devices = {
main = {
device = "/dev/disk/by-uuid/84b64e62-2879-4f44-85e4-db209dc6e8b1";
preLVM = true;
}
];
};
};

nix.maxJobs = lib.mkDefault 4;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
Expand Down

0 comments on commit 14150bb

Please sign in to comment.