nixos: upgrade to 21.05
This commit is contained in:
parent
1612a194c7
commit
8cfffeed69
|
@ -72,7 +72,7 @@
|
|||
sound.enable = false; # Disable sound.
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
raspberrypi-tools # Userland tools for the Raspberry Pi board
|
||||
libraspberrypi # Userland tools for the Raspberry Pi board
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
};
|
||||
# !!! Do select not latest (5.8 at the time) as it is currently broken
|
||||
# !!! (see https://github.com/NixOS/nixpkgs/issues/97064)
|
||||
kernelPackages = pkgs.linuxPackages; # For a Raspberry Pi 2 or 3)
|
||||
kernelPackages = pkgs.linuxPackages_5_4; # For a Raspberry Pi 2 or 3)
|
||||
kernelParams = [
|
||||
"cma=32M" # Needed for the virtual console to work on the RPi 3
|
||||
"console=ttyS0,115200n8" # Enable the serial console
|
||||
|
@ -73,7 +73,7 @@
|
|||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
raspberrypi-tools # Userland tools for the Raspberry Pi board
|
||||
libraspberrypi # Userland tools for the Raspberry Pi board
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
@ -72,7 +72,6 @@
|
|||
docutils # Python Documentation Utilities
|
||||
electrum # Bitcoin wallet
|
||||
element-desktop # A feature-rich client for Matrix.org
|
||||
emacs26-nox # Emacs, no X11
|
||||
evince
|
||||
exiftool # A tool to read, write and edit EXIF meta information
|
||||
ffmpeg-full # record, convert and stream audio and video
|
||||
|
@ -194,7 +193,7 @@
|
|||
};
|
||||
bluetooth = {
|
||||
enable = true;
|
||||
config = {
|
||||
settings = {
|
||||
General = {
|
||||
Enable = "Source,Sink,Media,Socket";
|
||||
NoPlugin = "sap";
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"cardano-node": {
|
||||
"branch": "refs/tags/1.27.0",
|
||||
"branch": "nixos-21.05",
|
||||
"description": "The core component that is used to participate in a Cardano decentralised blockchain.",
|
||||
"homepage": "https://cardano.org",
|
||||
"owner": "input-output-hk",
|
||||
"repo": "cardano-node",
|
||||
"rev": "8fe46140a52810b6ca456be01d652ca08fe730bf",
|
||||
"sha256": "1c9zc899wlgicrs49i33l0bwb554acsavzh1vcyhnxmpm0dmy8vj",
|
||||
"rev": "8358cf886d2346416c23318ca24bc95d0e1529be",
|
||||
"sha256": "0w4c5vahf1r92pgh086l7zn7hdxci4n7xfy2hq5znc7hl5dsnxc1",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/input-output-hk/cardano-node/archive/8fe46140a52810b6ca456be01d652ca08fe730bf.tar.gz",
|
||||
"url": "https://github.com/input-output-hk/cardano-node/archive/8358cf886d2346416c23318ca24bc95d0e1529be.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"daedalus": {
|
||||
|
@ -48,16 +48,16 @@
|
|||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"nixpkgs": {
|
||||
"branch": "nixos-20.09",
|
||||
"branch": "nixos-21.05",
|
||||
"builtin": false,
|
||||
"description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
|
||||
"homepage": "https://github.com/NixOS/nixpkgs",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "eae0cabc124702e04bb2098070ca46d661543d29",
|
||||
"sha256": "1xbhy14agzjyb8mcnzi6ii535rig2fhq3h3zdfdv1kg2443sj6vd",
|
||||
"rev": "eaba7870ffc3400eca4407baa24184b7fe337ec1",
|
||||
"sha256": "115disiz4b08iw46cidc7lm0advrxn5g2ldmlrxd53zf03skyb2w",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/eae0cabc124702e04bb2098070ca46d661543d29.tar.gz",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/eaba7870ffc3400eca4407baa24184b7fe337ec1.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
chromium
|
||||
element-desktop # A feature-rich client for Matrix.org
|
||||
firefoxWrapper # install Firefox with support for plugins
|
||||
gnome3.gnome-tweaks # A tool to customize advanced GNOME 3 options
|
||||
gnome.gnome-tweaks # A tool to customize advanced GNOME 3 options
|
||||
google-chrome # A freeware web browser developed by Google
|
||||
libreoffice-fresh
|
||||
mplayer # A movie player that supports many video formats
|
||||
|
@ -33,7 +33,6 @@
|
|||
shotwell # Photo organizer
|
||||
signal-desktop # Private, simple, and secure messenger
|
||||
usbutils # Tools for working with USB devices, such as lsusb
|
||||
user-manager
|
||||
xorg.libxcb # X C binding
|
||||
];
|
||||
|
||||
|
@ -52,7 +51,7 @@
|
|||
xserver = {
|
||||
enable = true;
|
||||
desktopManager = {
|
||||
gnome3.enable = true; # Enable GNOME desktop environment
|
||||
gnome.enable = true; # Enable GNOME desktop environment
|
||||
};
|
||||
displayManager = {
|
||||
defaultSession = "gnome"; # Set GNOME as the default session
|
||||
|
@ -73,7 +72,7 @@
|
|||
};
|
||||
bluetooth = {
|
||||
enable = true; # Enable bluetooth
|
||||
config = {
|
||||
settings = {
|
||||
General = {
|
||||
Enable = "Source,Sink,Media,Socket";
|
||||
NoPlugin = "sap";
|
||||
|
@ -89,9 +88,6 @@
|
|||
# Configure Firefox and Chromium
|
||||
nixpkgs.config = {
|
||||
allowUnfree = true;
|
||||
firefox = {
|
||||
enableAdobeFlash = false; # Disabled because Adobe Flash is just rubbish
|
||||
};
|
||||
};
|
||||
|
||||
programs = {
|
||||
|
|
|
@ -17,8 +17,8 @@
|
|||
minetest # Infinite-world block sandbox game
|
||||
multimc # Minecraft launcher
|
||||
nethack-x11 # Rogue-like game
|
||||
opendungeons # real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius
|
||||
#pingus # A puzzle game with mechanics similar to Lemmings
|
||||
#opendungeons # real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius
|
||||
pingus # A puzzle game with mechanics similar to Lemmings
|
||||
shattered-pixel-dungeon # Roguelike game with pixel-art graphics
|
||||
superTux # Classic 2D jump'n run sidescroller game
|
||||
superTuxKart # A Free 3D kart racing game
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
# Configure and install required fonts
|
||||
fonts.enableDefaultFonts = true;
|
||||
fonts.enableFontDir = true;
|
||||
fonts.fontDir.enable = true;
|
||||
fonts.fonts = with pkgs; [
|
||||
powerline-fonts # Required for Powerline prompts
|
||||
];
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
lidSwitch = "hybrid-sleep";
|
||||
lidSwitchDocked = "hybrid-sleep";
|
||||
};
|
||||
tlp.enable = true;
|
||||
tlp.enable = false;
|
||||
upower = {
|
||||
enable = true; # Enable application power managemetn support
|
||||
percentageCritical = 15;
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
enable = true; # Enable the X11 windowing system.
|
||||
desktopManager = {
|
||||
xterm.enable = false; # Disable NixOS default desktop manager.
|
||||
gnome3.enable = true; # Enable GNOME desktop environment
|
||||
gnome.enable = true; # Enable GNOME desktop environment
|
||||
};
|
||||
displayManager = {
|
||||
defaultSession = "none+xmonad"; # Set xmonad as the default window manager.
|
||||
|
|
Loading…
Reference in a new issue