Updated nixpkgs and added Docker

This commit is contained in:
Andrea Ciceri 2021-10-24 23:20:20 +02:00
parent 8f2faaead9
commit 9d9c65a835
No known key found for this signature in database
GPG key ID: A1FC89532D1C5654
7 changed files with 15 additions and 11 deletions

8
flake.lock generated
View file

@ -544,17 +544,17 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1633971123, "lastModified": 1634229982,
"narHash": "sha256-WmI4NbH1IPGFWVkuBkKoYgOnxgwSfWDgdZplJlQ93vA=", "narHash": "sha256-O4IfSHZ8+j35Gfp7/Gdhx3tWlfEDPXboUd8m1wzT1CQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e4ef597edfd8a0ba5f12362932fc9b1dd01a0aef", "rev": "30aeeaded47d4e246941147acaa357d1605ad486",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30aeeaded47d4e246941147acaa357d1605ad486",
"type": "github" "type": "github"
} }
} }

View file

@ -4,7 +4,7 @@
inputs = inputs =
{ {
stable.url = "github:nixos/nixpkgs/release-21.05"; stable.url = "github:nixos/nixpkgs/release-21.05";
unstable.url = "github:nixos/nixpkgs/nixos-unstable"; unstable.url = "github:nixos/nixpkgs/30aeeaded47d4e246941147acaa357d1605ad486";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";

View file

@ -1,11 +1,11 @@
{ config, lib, pkgs, profiles, ... }: { config, lib, pkgs, profiles, ... }:
{ {
imports = with profiles; [ mount-nas sshd dbus avahi printing xdg ]; imports = with profiles; [ mount-nas sshd dbus avahi printing xdg docker ];
boot = { boot = {
initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
initrd.kernelModules = []; initrd.kernelModules = [ ];
kernelModules = [ "kvm-intel" ]; kernelModules = [ "kvm-intel" ];
extraModulePackages = with config.boot.kernelPackages; [ extraModulePackages = with config.boot.kernelPackages; [
v4l2loopback v4l2loopback
@ -41,7 +41,7 @@
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-label/swap"; } ]; [{ device = "/dev/disk/by-label/swap"; }];
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
} }

View file

@ -0,0 +1,3 @@
{
virtualisation.docker.enable = true;
}

View file

@ -13,6 +13,7 @@
gsettings-desktop-schemas gsettings-desktop-schemas
lxappearance lxappearance
yarn yarn
yarn2nix
texlive.combined.scheme-full texlive.combined.scheme-full
]; ];
}; };

View file

@ -1,8 +1,7 @@
(use-package nix-mode (use-package nix-mode
:mode "\\.nix\\'" :mode "\\.nix\\'"
;:hook :hook
;(before-save . lsp-format-buffer)) (before-save . lsp-format-buffer))
)
(require 'sudo-utils) (require 'sudo-utils)
(defun nixos-rebuild-switch () (defun nixos-rebuild-switch ()

View file

@ -50,6 +50,7 @@
keybindings = lib.mkOptionDefault { keybindings = lib.mkOptionDefault {
"${modifier}+x" = "exec ${pkgs.customEmacs}/bin/emacs"; "${modifier}+x" = "exec ${pkgs.customEmacs}/bin/emacs";
"${modifier}+b" = "exec ${pkgs.firefox}/bin/firefox"; "${modifier}+b" = "exec ${pkgs.firefox}/bin/firefox";
"${modifier}+s" = "exec \'file=\"~/shots/\$(date --iso-8601=seconds).png\"; ${pkgs.grim}/bin/grim -t png -g \"\$(${pkgs.slurp}/bin/slurp)\" \$file; wl-copy -t image/png < \$file\'";
}; };
}; };
extraConfig = '' extraConfig = ''