From f3687f637dab0593a8a2a21ea279377b6a3705ee Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Wed, 1 Nov 2023 02:14:15 -0700 Subject: [PATCH] not building whyyy --- extras/dev.nix | 7 ++++--- extras/gaming.nix | 5 +++++ flake.lock | 24 ++++++++++++------------ flake.nix | 3 +++ systems/NOcomputer.nix | 1 - systems/NOlaptop.nix | 11 ++++++++++- 6 files changed, 34 insertions(+), 17 deletions(-) diff --git a/extras/dev.nix b/extras/dev.nix index 7574914..820ab9d 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -26,9 +26,10 @@ vulkan-loader ]; - nixpkgs.config.permittedInsecurePackages = [ - "electron-12.2.3" - ]; + # nixpkgs.config.permittedInsecurePackages = [ + # # "electron-12.2.3" + # "electron-24.8.6" + # ]; services.udev.extraRules = '' SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic GDB Server", SYMLINK+="ttyBmpGdb" diff --git a/extras/gaming.nix b/extras/gaming.nix index 7771a15..e46784f 100644 --- a/extras/gaming.nix +++ b/extras/gaming.nix @@ -10,6 +10,11 @@ # unstable.parsec-bin ]; + nixpkgs.config.permittedInsecurePackages = [ + "electron-24.8.6" + # "electron-12.2.3" + ]; + programs.steam.enable = true; programs.gamemode.enable = true; programs.gamescope.enable = true; diff --git a/flake.lock b/flake.lock index 90ecf45..20e5e50 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1697748412, - "narHash": "sha256-5VSB63UE/O191cuZiGHbCJ9ipc7cGKB8cHp0cfusuyo=", + "lastModified": 1698053470, + "narHash": "sha256-sP8D/41UiwC2qn0X40oi+DfuVzNHMROqIWdSdCI/AYA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72d53d51704295f1645d20384cd13aecc182f624", + "rev": "80d98a7d55c6e27954a166cb583a41325e9512d7", "type": "github" }, "original": { @@ -103,11 +103,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { @@ -118,11 +118,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1697655685, - "narHash": "sha256-79Kuv+QdgsVc+rkibuAgWHnh8IXrLBTOKg5nM0Qvux0=", + "lastModified": 1698562188, + "narHash": "sha256-9nkxGnA/T+jLhHAMFRW157Qi/zfbf5dF1q7HfKROl3o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80c1aab725151632ddc2a20caeb914e76dd0673c", + "rev": "3e10c80821dedb93592682379f476745f370a58e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1b1a955..cfe7834 100644 --- a/flake.nix +++ b/flake.nix @@ -8,8 +8,11 @@ nixos-raspberrypi.url = "github:ramblurr/nixos-raspberrypi"; aagl.url = "github:ezKEa/aagl-gtk-on-nix"; aagl.inputs.nixpkgs.follows = "nixpkgs"; + # prescurve.url = "path:/home/tao/Projects/prescurve"; + # prescurve.inputs.nixpkgs.follows = "nixpkgs"; }; + # outputs = { nixpkgs, nixos-hardware, nixpkgs-unstable, nixos-raspberrypi, aagl, prescurve, ... }@attrs: outputs = { nixpkgs, nixos-hardware, nixpkgs-unstable, nixos-raspberrypi, aagl, ... }@attrs: let nixos-system = (systemModules: nixpkgs.lib.nixosSystem { diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index 0e555dc..9e55126 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -15,7 +15,6 @@ # nvidia-vaapi-driver ]; - environment.sessionVariables = { # wayland chromium workaround NIXOS_OZONE_WL = "1"; diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index c4bef9f..b7c4bf6 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -1,5 +1,6 @@ -{ pkgs, ... }: { +{ pkgs, prescurve, ... }: { environment.systemPackages = with pkgs; [ + prescurve intel-gpu-tools # libsForQt5.skanpage powertop @@ -35,6 +36,14 @@ services.xserver.displayManager.defaultSession = "plasmawayland"; + # systemd.user.services.backlight = { + # # description = ""; + # ExecStart = "${pkgs.prescurve}/bin/prescurve_backlight"; + # Restart = "on-failure"; + # wantedBy = [ "default.target" ]; + # }; + + # SUBSYSTEM=="backlight", GROUP="video", MODE="0664" services.udev.extraRules = '' ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness"