diff --git a/flake.lock b/flake.lock index 0bce6f1..2136ea8 100644 --- a/flake.lock +++ b/flake.lock @@ -544,17 +544,17 @@ }, "unstable": { "locked": { - "lastModified": 1633971123, - "narHash": "sha256-WmI4NbH1IPGFWVkuBkKoYgOnxgwSfWDgdZplJlQ93vA=", + "lastModified": 1634229982, + "narHash": "sha256-O4IfSHZ8+j35Gfp7/Gdhx3tWlfEDPXboUd8m1wzT1CQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4ef597edfd8a0ba5f12362932fc9b1dd01a0aef", + "rev": "30aeeaded47d4e246941147acaa357d1605ad486", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "30aeeaded47d4e246941147acaa357d1605ad486", "type": "github" } } diff --git a/flake.nix b/flake.nix index f177b97..372b10b 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { 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"; diff --git a/hosts/pc/configuration.nix b/hosts/pc/configuration.nix index 66f6e6d..9cee61d 100644 --- a/hosts/pc/configuration.nix +++ b/hosts/pc/configuration.nix @@ -1,11 +1,11 @@ { 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 = { initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; - initrd.kernelModules = []; + initrd.kernelModules = [ ]; kernelModules = [ "kvm-intel" ]; extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback @@ -41,7 +41,7 @@ }; swapDevices = - [ { device = "/dev/disk/by-label/swap"; } ]; + [{ device = "/dev/disk/by-label/swap"; }]; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; } diff --git a/profiles/docker/default.nix b/profiles/docker/default.nix new file mode 100644 index 0000000..a878015 --- /dev/null +++ b/profiles/docker/default.nix @@ -0,0 +1,3 @@ +{ + virtualisation.docker.enable = true; +} diff --git a/users/ccr/default.nix b/users/ccr/default.nix index 0f7e56a..1004edc 100644 --- a/users/ccr/default.nix +++ b/users/ccr/default.nix @@ -13,6 +13,7 @@ gsettings-desktop-schemas lxappearance yarn + yarn2nix texlive.combined.scheme-full ]; }; diff --git a/users/profiles/emacs/emacs.d/config/nix.el b/users/profiles/emacs/emacs.d/config/nix.el index 957d891..4f6d444 100644 --- a/users/profiles/emacs/emacs.d/config/nix.el +++ b/users/profiles/emacs/emacs.d/config/nix.el @@ -1,8 +1,7 @@ (use-package nix-mode :mode "\\.nix\\'" - ;:hook - ;(before-save . lsp-format-buffer)) -) + :hook + (before-save . lsp-format-buffer)) (require 'sudo-utils) (defun nixos-rebuild-switch () diff --git a/users/profiles/sway/default.nix b/users/profiles/sway/default.nix index 0ec1529..b68372d 100644 --- a/users/profiles/sway/default.nix +++ b/users/profiles/sway/default.nix @@ -50,6 +50,7 @@ keybindings = lib.mkOptionDefault { "${modifier}+x" = "exec ${pkgs.customEmacs}/bin/emacs"; "${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 = ''