Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

laptop config fixes #118

Merged
merged 4 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/flake_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
- name: Run Statix Lint
run: statix fix

# - name: Run Nix Format
# run: nix fmt
- name: Run Nix Format
run: nix fmt

- name: Nix Flake Check - Manual
run: nix flake check
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ This repo has become more opinionated over time and now requires passing down va

```nix
Resolved URL: git+file:///home/runner/work/nixflakes/nixflakes?shallow=1
Locked URL: git+file:///home/runner/work/nixflakes/nixflakes?rev=3d8458a4c4bccdd926078054deefd9909c85570d&shallow=1
Locked URL: git+file:///home/runner/work/nixflakes/nixflakes?rev=0f1a430c8b7e8e20fb71794cbb9f0a47a3a41f32&shallow=1
Description: Eriim's machine specific configuration flake.
Path: /nix/store/xha87h1pjywj0n3nvxd0fgkgb516jxrw-source
Revision: 3d8458a4c4bccdd926078054deefd9909c85570d
Path: /nix/store/0a63b1k1iwlkvfmcpc1ab9br2b01x8xq-source
Revision: 0f1a430c8b7e8e20fb71794cbb9f0a47a3a41f32
Revisions: 1
Last modified: 2024-06-26 02:19:10
Last modified: 2024-06-28 02:49:48
Inputs:
├───NixOS-WSL: github:nix-community/NixOS-WSL/269411cfed6aab694e46f719277c972de96177bb (2024-06-24 09:09:31)
│ ├───flake-compat: github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33 (2023-10-04 13:37:54)
Expand Down Expand Up @@ -193,7 +193,7 @@ Inputs:
### Flake Outputs

```nix
git+file:///home/runner/work/nixflakes/nixflakes?rev=3d8458a4c4bccdd926078054deefd9909c85570d&shallow=1
git+file:///home/runner/work/nixflakes/nixflakes?rev=0f1a430c8b7e8e20fb71794cbb9f0a47a3a41f32&shallow=1
├───devShells
│ └───x86_64-linux
│ └───default: development environment 'nix-shell'
Expand Down
5 changes: 4 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,10 @@
hyprlandConfig = "laptop";
inherit system;
} // attrs;
modules = [ ./. ./modules/virt/podman.nix ];
modules = [
./.
./modules/virt/podman.nix
];
}; # terminus
}; # configurations

Expand Down
5 changes: 1 addition & 4 deletions modules/core/terminal/fonts/MplusCodeNerdFont/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
stdenv,
lib,
}:
{ stdenv, lib }:

stdenv.mkDerivation rec {
pname = "M+1CodeNerdFont";
Expand Down
7 changes: 2 additions & 5 deletions modules/core/terminal/fonts/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,11 @@
"Noto Color Emoji"
];
sansSerif = [
"Roboto"
"Roboto"
"Noto Color Emoji"
];
monospace = [
"Monaspace Neon"
];
monospace = [ "Monaspace Neon" ];
emoji = [ "Noto Color Emoji" ];
};
};
}

2 changes: 1 addition & 1 deletion modules/hardware/nvidia/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
services.xserver.videoDrivers = [ "nvidia" ];
hardware.graphics = {
enable = true;
# driSupport32Bit = true;
# driSupport32Bit = true;
};

hardware.nvidia = {
Expand Down
2 changes: 0 additions & 2 deletions modules/hyprland/config/laptop.nix
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@
col.active_border = rgba(0D599Fee) rgba(ffffffee) 45deg
col.inactive_border = rgba(595959aa)
layout = dwindle
cursor_inactive_timeout = 15
no_cursor_warps = yes
resize_on_border = yes
hover_icon_on_border = yes
}
Expand Down