Merge remote-tracking branch 'orange/master'

6 files changed, 0 insertions, 209 deletions

diff --git a/makefu/1systems/x/x13/battery.nix b/makefu/1systems/x/x13/battery.nix
deleted file mode 100644
index 3e28292e3..000000000
--- a/makefu/1systems/x/x13/battery.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  powerManagement.powertop.enable = true;
-  services.power-profiles-daemon.enable = true;
-  users.users.makefu.packages = [ pkgs.gnome.gnome-power-manager ];
-}
diff --git a/makefu/1systems/x/x13/default.nix b/makefu/1systems/x/x13/default.nix
deleted file mode 100644
index 27ea0c99c..000000000
--- a/makefu/1systems/x/x13/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ pkgs, lib, ... }:
-# new zfs deployment
-{
-  imports = [
-    ./zfs.nix
-    ./input.nix
-    ./battery.nix
-    <stockholm/makefu/2configs/hw/bluetooth.nix>
-    <nixos-hardware/lenovo/thinkpad/l14/amd> # close enough
-    # <stockholm/makefu/2configs/hw/tpm.nix>
-    <stockholm/makefu/2configs/hw/ssd.nix>
-    # <stockholm/makefu/2configs/hw/xmm7360.nix>
-  ];
-  boot.zfs.requestEncryptionCredentials = true;
-  networking.hostId = "f8b8e0a2";
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  # services.xserver.enable = lib.mkForce false;
-
-  services.xserver.videoDrivers = [ "amdgpu" ];
-  boot.initrd.kernelModules = [ "amdgpu" ];
-  hardware.opengl.driSupport = true;
-  hardware.opengl.extraPackages = [ pkgs.amdvlk pkgs.rocm-opencl-icd pkgs.rocm-opencl-runtime ];
-  # For 32 bit applications
-  hardware.opengl.driSupport32Bit = true;
-  hardware.opengl.extraPackages32 = with pkgs; [
-    driversi686Linux.amdvlk
-  ];
-  # is required for amd graphics support ( xorg wont boot otherwise )
-  #boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelPackages = lib.mkForce pkgs.linuxPackages;
-
-  services.fwupd.enable = true;
-
-  programs.light.enable = true;
-
-  users.groups.video = {};
-  users.groups.render = {};
-  users.users.makefu.extraGroups = [ "video" "render" ];
-
-  boot.extraModprobeConfig = ''
-    options thinkpad_acpi fan_control=1
-  '';
-}
-
diff --git a/makefu/1systems/x/x13/disk.nix b/makefu/1systems/x/x13/disk.nix
deleted file mode 100644
index 7ce77bdf5..000000000
--- a/makefu/1systems/x/x13/disk.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ disk ? "/dev/sda", ... }: {
-  disko.devices = {
-    disk = {
-      nvme = {
-        type = "disk";
-        device = disk;
-        content = {
-          type = "table";
-          format = "gpt";
-          partitions = [
-            {
-              name = "ESP";
-              start = "0";
-              end = "512MiB";
-              fs-type = "fat32";
-              bootable = true;
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-              };
-            }
-            {
-              name = "zfs";
-              start = "512MiB";
-              end = "100%";
-              content = {
-                type = "zfs";
-                pool = "tank";
-              };
-            }
-          ];
-        };
-      };
-    };
-    zpool = {
-      tank = {
-        type = "zpool";
-        rootFsOptions = {
-          compression = "lz4";
-          #reservation = "5G";
-          "com.sun:auto-snapshot" = "false";
-        };
-        mountpoint = null;
-        postCreateHook = "zfs snapshot tank@blank";
-
-        datasets = {
-          
-          root = {
-            type = "zfs_fs";
-            mountpoint = "/";
-            options = {
-              encryption = "aes-256-gcm";
-              keyformat = "passphrase";
-              "com.sun:auto-snapshot" = "true";
-            };
-            #keylocation = "file:///tmp/secret.key";
-          };
-          "root/home" = {
-            type = "zfs_fs";
-            mountpoint = "/home";
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/makefu/1systems/x/x13/input.nix b/makefu/1systems/x/x13/input.nix
deleted file mode 100644
index 93816ce84..000000000
--- a/makefu/1systems/x/x13/input.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  # current issues:
-  #  1. for pressing insert hold shift+fn+Fin
-
-  # scroll by holding middle mouse
-  #services.xserver.displayManager.sessionCommands =''
-  #    xinput set-int-prop "ETPS/2 Elantech TrackPoint" "Evdev Wheel Emulation" 8 1
-  #    xinput set-int-prop "ETPS/2 Elantech TrackPoint" "Evdev Wheel Emulation Button" 8 2
-  #    xinput set-prop "ETPS/2 Elantech TrackPoint" "Evdev Wheel Emulation Axes" 6 7 4 5
-  #    # configure timeout of pressing and holding middle button
-  #    # xinput set-int-prop "ETPS/2 Elantech TrackPoint" "Evdev Wheel Emulation Timeout" 8 200
-  #    xinput disable 'ETPS/2 Elantech Touchpad'
-  #'';
-
-  services.xserver.libinput.enable = true;
-  boot.kernelParams = [
-    #"psmouse.proto=imps"
-    #"psmouse.proto=bare"
-    #"psmouse.resetafter=0"
-    "psmouse.synaptics_intertouch=1" # echo 1 > /sys/devices/platform/i8042/serio1/reg_07
-  ];
-
-  programs.light.enable = true;
-  services.actkbd = {
-    enable = true;
-    bindings = [
-      { keys = [ 225 ]; events = [ "key" ]; command = "${pkgs.light}/bin/light -A 10"; } # fn - F5
-      { keys = [ 224 ]; events = [ "key" ]; command = "${pkgs.light}/bin/light -U 10"; } # fn - F6
-      # fn - 4 => suspend
-      # fn - d => lcdshadow
-      #{ keys = [ 227 ]; events = [ "key" ]; command = builtins.toString ( # fn - F7
-      #  pkgs.writers.writeDash "toggle_touchpad" ''
-      #    PATH=${lib.makeBinPath [ pkgs.xorg.xinput pkgs.gnugrep ]}
-      #    DISPLAY=:0
-      #    export DISPLAY PATH
-
-      #    device=$(xinput list --name-only | grep Touchpad)
-      #    if [ "$(xinput list-props "$device" | grep -P ".*Device Enabled.*\K.(?=$)" -o)" -eq 1 ];then
-      #        xinput disable "$device"
-      #    else
-      #        xinput enable "$device"
-      #    fi
-      #  '');
-      #}
-    ];
-  };
-}
diff --git a/makefu/1systems/x/x13/toggle_brightness b/makefu/1systems/x/x13/toggle_brightness
deleted file mode 100644
index dc1436cb6..000000000
--- a/makefu/1systems/x/x13/toggle_brightness
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-proc=/proc/acpi/ibm/lcdshadow
-status=$(awk '/status:/{print $2}' "$proc")
-if [ "$status" -eq 0 ];then
-  echo 1 > "$proc"
-else
-  echo 0 > "$proc"
-fi
diff --git a/makefu/1systems/x/x13/zfs.nix b/makefu/1systems/x/x13/zfs.nix
deleted file mode 100644
index ba341ef50..000000000
--- a/makefu/1systems/x/x13/zfs.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  boot.zfs.enableUnstable = true; # required for 21.05
-  fileSystems."/" =
-    { device = "zroot/root/nixos";
-      fsType = "zfs";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/20BF-2755";
-      fsType = "vfat";
-    };
-
-  fileSystems."/home" =
-    { device = "zroot/root/home";
-      fsType = "zfs";
-    };
-
-    swapDevices = [ ];
-    services.zfs.autoScrub.enable = true;
-}