From 6b1488bbf55c2faa66c276961c9a1d761b217bfb Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Mon, 18 Mar 2024 21:00:13 +0000 Subject: [PATCH] Refactor; Mesa debugging --- common/default.nix | 2 +- flake.lock | 86 ++++++++++++++++++++++--- flake.nix | 1 + home/modules/home-pkgs.nix | 10 +-- hosts/aarch64-linux/alastor/default.nix | 8 ++- 5 files changed, 90 insertions(+), 17 deletions(-) diff --git a/common/default.nix b/common/default.nix index f1cab42..09f265b 100644 --- a/common/default.nix +++ b/common/default.nix @@ -5,5 +5,5 @@ pkgs, ... }: { - nixpkgs.config.permittedInsecurePackages = ["electron-25.9.0" "electron-24.8.6"]; + #nixpkgs.config.permittedInsecurePackages = ["electron-25.9.0" "electron-24.8.6"]; } diff --git a/flake.lock b/flake.lock index 2d1b2bf..1fd8120 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,25 @@ { "nodes": { + "apple-silicon": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1710209440, + "narHash": "sha256-1JwFo3u2aVrvpz12OotjCK51EQ0hEDI7xSG7CEvTSk8=", + "owner": "tpwrules", + "repo": "nixos-apple-silicon", + "rev": "bdc68b494d6a26c9457f4841ab1a6109b12a33e6", + "type": "github" + }, + "original": { + "owner": "tpwrules", + "repo": "nixos-apple-silicon", + "type": "github" + } + }, "devshell": { "inputs": { "flake-utils": "flake-utils_3", @@ -25,7 +45,7 @@ "firefox-addons": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "dir": "pkgs/firefox-addons", @@ -44,6 +64,21 @@ } }, "flake-compat": { + "locked": { + "lastModified": 1688025799, + "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -57,7 +92,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -266,17 +301,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1627814220, - "narHash": "sha256-P+MDgdZw2CBk9X1ZZaUgHgN+32pTfLFf3XVIBOXirI4=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab5b6828af26215bf2646c31961da5d3749591ef", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" } }, @@ -297,6 +332,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1627814220, + "narHash": "sha256-P+MDgdZw2CBk9X1ZZaUgHgN+32pTfLFf3XVIBOXirI4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ab5b6828af26215bf2646c31961da5d3749591ef", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1710631334, "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", @@ -315,7 +366,7 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", @@ -340,7 +391,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_4", "gitignore": "gitignore", "nixpkgs": [ @@ -368,15 +419,32 @@ }, "root": { "inputs": { + "apple-silicon": "apple-silicon", "firefox-addons": "firefox-addons", "flake-utils": "flake-utils_2", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-master": "nixpkgs-master", "nixvim": "nixvim" } }, + "rust-overlay": { + "flake": false, + "locked": { + "lastModified": 1686795910, + "narHash": "sha256-jDa40qRZ0GRQtP9EMZdf+uCbvzuLnJglTUI2JoHfWDc=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "5c2b97c0a9bc5217fc3dfb1555aae0fb756d99f9", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 1d8df8d..ea3f59b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; + apple-silicon.url = "github:tpwrules/nixos-apple-silicon"; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/modules/home-pkgs.nix b/home/modules/home-pkgs.nix index 40facfc..219de37 100644 --- a/home/modules/home-pkgs.nix +++ b/home/modules/home-pkgs.nix @@ -41,10 +41,10 @@ in { pkgs.nerdfonts pkgs.ipafont - pkgs.signal-desktop - pkgs.vesktop - pkgs.telegram-desktop - pkgs.element-desktop + #pkgs.signal-desktop + #pkgs.vesktop + #pkgs.telegram-desktop + #pkgs.element-desktop pkgs.qbittorrent pkgs.nicotine-plus @@ -60,7 +60,7 @@ in { pkgs.sayonara pkgs.mpv - pkgs.feishin + #pkgs.feishin pkgs.nixos-icons pkgs.swww diff --git a/hosts/aarch64-linux/alastor/default.nix b/hosts/aarch64-linux/alastor/default.nix index 27bb567..5082b17 100644 --- a/hosts/aarch64-linux/alastor/default.nix +++ b/hosts/aarch64-linux/alastor/default.nix @@ -5,12 +5,14 @@ config, lib, pkgs, + inputs, ... }: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ./apple-silicon-support + #./apple-silicon-support + inputs.apple-silicon.nixosModules.apple-silicon-support ../../../common #../../antivirus.nix ../../../modules/home-manager.nix @@ -53,7 +55,9 @@ # }; # Enable the X11 windowing system. - # services.xserver.enable = true; + services.xserver.enable = true; + services.xserver.desktopManager.plasma6.enable = true; + services.xserver.displayManager.sddm.enable = true; # Configure keymap in X11 # services.xserver.xkb.layout = "us";