summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrigory Shipunov2023-01-14 12:57:53 +0100
committerGrigory Shipunov2023-01-14 12:57:53 +0100
commiteabc64290a948aeca298dd3d6d75373e3e914cbd (patch)
tree34596191b9386e7d4cc0c2b93c2404885706f0be
parent9ff003a4c1303b4d5dec4239f6f5743dc54f3181 (diff)
update
-rw-r--r--flake.lock30
-rw-r--r--hosts/toaster/amd.nix16
-rw-r--r--hosts/toaster/default.nix6
-rw-r--r--modules/basic-tools.nix1
-rw-r--r--modules/devtools.nix3
-rw-r--r--modules/sway.nix2
6 files changed, 40 insertions, 18 deletions
diff --git a/flake.lock b/flake.lock
index 8b6b4bb..6e65714 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
- "lastModified": 1673245426,
- "narHash": "sha256-C/qvJD9K+JfOtSavRnFv703S9f6RAVMVUlzVq8a9Bv8=",
+ "lastModified": 1673677311,
+ "narHash": "sha256-V7vEMy7vzvD9wyz/822G8rLV+3jkum5EsfAIy9gds1I=",
"owner": "nix-community",
"repo": "fenix",
- "rev": "918a43f74c47473dc979fd5b25746121e6afb48f",
+ "rev": "39e4f1d72376620d76fefe4cdf52a448f12c90aa",
"type": "github"
},
"original": {
@@ -74,11 +74,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1673163619,
- "narHash": "sha256-B33PFBL64ZgTWgMnhFL3jgheAN/DjHPsZ1Ih3z0VE5I=",
+ "lastModified": 1673612960,
+ "narHash": "sha256-DWR7hrbecJKmUJCswk9MXZta710mq+3jZwTvHU/UfyY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "8c54d842d9544361aac5f5b212ba04e4089e8efe",
+ "rev": "e285dd0ca97c264003867c7329f0d1f4f028739c",
"type": "github"
},
"original": {
@@ -106,11 +106,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1673134516,
- "narHash": "sha256-mAZQKqkNQbBmJnmUU0blOfkKlgMSSVyPHdeWeuKad8U=",
+ "lastModified": 1673540789,
+ "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "f6f44561884c3470e2b783683d5dbac42dfc833b",
+ "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf",
"type": "github"
},
"original": {
@@ -133,11 +133,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
- "lastModified": 1673119177,
- "narHash": "sha256-Eabe5SOI5XHRrjcFIgGXE0P5CxHlha07IaBBagM0Ap8=",
+ "lastModified": 1673611648,
+ "narHash": "sha256-Qptnat6M6twwJiXSMt0cJlZdZreExeyzY7cdCG0LicM=",
"owner": "rust-lang",
"repo": "rust-analyzer",
- "rev": "1bd1a095936f2c16493743a05f6f14285c98ec8a",
+ "rev": "a119352adab65d0cab25c13ae0fd7676bed7100f",
"type": "github"
},
"original": {
@@ -155,11 +155,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1673147300,
- "narHash": "sha256-gR9OEfTzWfL6vG0qkbn1TlBAOlg4LuW8xK/u0V41Ihc=",
+ "lastModified": 1673481602,
+ "narHash": "sha256-P80X38fOM2MtoYdgkyuksGOQPDhIhNJW2W2jMeMIZzE=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "2253120d2a6147e57bafb5c689e086221df8032f",
+ "rev": "32187b33ac6ec9b628dcd08dd941a715e6241dda",
"type": "github"
},
"original": {
diff --git a/hosts/toaster/amd.nix b/hosts/toaster/amd.nix
new file mode 100644
index 0000000..07aa493
--- /dev/null
+++ b/hosts/toaster/amd.nix
@@ -0,0 +1,16 @@
+{ pkgs, config, ... }: {
+ boot.initrd.kernelModules = [ "amdgpu" ];
+
+ hardware.opengl = {
+ driSupport = true;
+ driSupport32Bit = true;
+ extraPackages = with pkgs; [
+ rocm-opencl-icd
+ rocm-opencl-runtime
+ amdvlk
+ ];
+ extraPackages32 = with pkgs; [
+ driversi686Linux.amdvlk
+ ];
+ };
+}
diff --git a/hosts/toaster/default.nix b/hosts/toaster/default.nix
index 1204de2..ae90231 100644
--- a/hosts/toaster/default.nix
+++ b/hosts/toaster/default.nix
@@ -1,5 +1,6 @@
-{ ... }: {
+{ pkgs, ... }: {
imports = [
+ ./amd.nix
./hardware-configuration.nix
./network-vpns.nix
./network.nix
@@ -8,6 +9,9 @@
];
nixpkgs.config.allowUnfree = true;
+ environment.systemPackages = with pkgs; [
+ yt-dlp
+ ];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
diff --git a/modules/basic-tools.nix b/modules/basic-tools.nix
index 7ff836d..16959f8 100644
--- a/modules/basic-tools.nix
+++ b/modules/basic-tools.nix
@@ -94,6 +94,7 @@
LP_ENABLE_SCREEN_TITLE=1
LP_ENABLE_TEMP=0
LP_ENABLE_SVN=0
+ LP_BATTERY_THRESHOLD=15
LP_SSH_COLORS=1
'';
};
diff --git a/modules/devtools.nix b/modules/devtools.nix
index 097dc22..32b7089 100644
--- a/modules/devtools.nix
+++ b/modules/devtools.nix
@@ -10,11 +10,12 @@
direnv
(nix-direnv.override { enableFlakes = true; })
# rust
- (inputs.fenix.packages."x86_64-linux".complete.toolchain)
+ (inputs.fenix.packages."x86_64-linux".stable.toolchain)
# nix
rnix-lsp
nil
nixpkgs-fmt
+ nix-index
# julia
julia-bin
# hardware
diff --git a/modules/sway.nix b/modules/sway.nix
index 37efb63..6d5a552 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -138,7 +138,7 @@
lock = "udisksctl lock -b";
};
- qt5 = {
+ qt = {
enable = true;
platformTheme = "gnome";
style = "adwaita-dark";