[flake] Initial setup

3 files changed, 40 insertions, 21 deletions

diff --git a/configuration.nix b/configuration.nix
index 5a49601..ace667f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -66,6 +66,7 @@ in {
     shell = pkgs.zsh;
     homeMode = "711"; # mostly done for httpd access
   };
+programs.zsh.enable = true;
 
   environment.shells = with pkgs; [ zsh ];
 
@@ -91,25 +92,27 @@ in {
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "23.05"; # Did you read the comment?
 
-  hardware.bluetooth.enable = true;
-  hardware.sane.enable = true;
-  hardware.rtl-sdr.enable = true;
-  virtualisation.docker.enable = true;
-
-  security.polkit.enable = true;
-  boot.kernelModules = [ "kvm-intel" ];
+  # hardware.bluetooth.enable = true;
+  # hardware.sane.enable = true;
+  # hardware.rtl-sdr.enable = true;
+  # virtualisation.docker.enable = true;
+  #
+  # security.polkit.enable = true;
+  # boot.kernelModules = [ "kvm-intel" ];
 
   # https://nixos.wiki/wiki/Accelerated_Video_Playback
-  nixpkgs.config.packageOverrides = pkgs: {
-    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
-  };
-  hardware.opengl = {
-    enable = true;
-    extraPackages = with pkgs; [
-      intel-media-driver # LIBVA_DRIVER_NAME=iHD
-      vaapiIntel         # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
-      vaapiVdpau
-      libvdpau-va-gl
-    ];
-  };
+  # nixpkgs.config.packageOverrides = pkgs: {
+  #   vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+  # };
+  # hardware.opengl = {
+  #   enable = true;
+  #   extraPackages = with pkgs; [
+  #     intel-media-driver # LIBVA_DRIVER_NAME=iHD
+  #     vaapiIntel         # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
+  #     vaapiVdpau
+  #     libvdpau-va-gl
+  #   ];
+  # };
+
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
 }
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..f97e77d
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,17 @@
+{
+  description = "System setup";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-23.05";
+  };
+
+  outputs = { self, nixpkgs, ... }: {
+    # ThinkPad X270
+    nixosConfigurations.juno = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        ./configuration.nix
+      ];
+    };
+  };
+}
diff --git a/packages.nix b/packages.nix
index 07bc050..94e5210 100644
--- a/packages.nix
+++ b/packages.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (import ./sysidentity.nix) sysidentity;
-  unstable = import <nixos-unstable> { config.allowUnfree = true; };
+  #unstable = import <nixos-unstable> { config.allowUnfree = true; };
   tex = (pkgs.texlive.combine {
     inherit (pkgs.texlive) scheme-medium
     babel-bulgarian cyrillic cancel enumitem;
@@ -62,7 +62,6 @@ in {
       ];
       laptop = [
         brightnessctl powertop upower libinput-gestures acpid tlp epkowa
-        (unstable.epsonscan2.override { withNonFreePlugins = true; })
       ];
       juno = [
         thinkfan xorg.xf86inputsynaptics