willemml/dotfiles.nix
1
0
Fork 0
mirror of https://github.com/willemml/dotfiles.nix.git synced 2025-04-12 11:17:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes asahi config

Browse source
This commit is contained in:
willemml 2024-09-02 11:51:33 -07:00
parent 2f9855722a
commit 6817cea882
Signed by: willemml
GPG key ID: C3DE5DF6198DACBD
11 changed files with 100 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/system.nix
View file

@ -4,6 +4,7 @@
globals,
...
}: {
stylix.enable = true;
stylix.image = globals.wallpapers.current;
stylix.polarity = "dark";
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-hard.yaml";
@ -33,7 +34,7 @@
settings.trusted-users = ["root" "willem"];
};
programs.bash.enableCompletion = true;
programs.bash.completion.enable = true;
programs.bash.interactiveShellInit = ''
export PS1=$'\n'"\e[0mbash: \e[34;1m\w"$'\n'"\e[32m\\$\e[0m "
'';

24
flake.lock generated
View file

@ -425,16 +425,18 @@
},
"locked": {
"lastModified": 1725219211,
"narHash": "sha256-OW9OtyKvPalWZFbcw9pLWgyMZFVCHqTZj2fBQFNY0tk=",
"owner": "hyprwm",
"repo": "Hyprland",
"narHash": "sha256-17WA01XfBTuH1CJdGje3095K/7RUUL6lwQHEFq9t2Go=",
"ref": "refs/heads/main",
"rev": "6934e7aa2b300bc4565855a4092fb34de8a9a8d2",
"type": "github"
"revCount": 5178,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
}
},
"hyprland-protocols": {
@ -692,17 +694,17 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"lastModified": 1725089620,
"narHash": "sha256-H+M2+CjQhGH/HUOG+Gx+Ggj8JeHpOtBKVj+Tn4nkpP0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"rev": "7d0d974fc21f02dfeed7ef098d8faf0195162949",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"rev": "7d0d974fc21f02dfeed7ef098d8faf0195162949",
"type": "github"
}
},

8
flake.nix
View file

@ -2,7 +2,7 @@
description = "Willem's Nix configurations";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs?rev=7d0d974fc21f02dfeed7ef098d8faf0195162949";
darwin.url = "github:willemml/nix-darwin?ref=feat/networking.hosts";
#darwin.url = "git+file:///Users/willem/dev/nix-darwin";
@ -15,7 +15,11 @@
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
hyprland.url = "github:hyprwm/Hyprland";
hyprland = {
type = "git";
url = "https://github.com/hyprwm/Hyprland";
submodules = true;
};
nix-github-actions.inputs.nixpkgs.follows = "nixpkgs";
nix-github-actions.url = "github:nix-community/nix-github-actions";

2
home/default.nix
View file

@ -13,6 +13,8 @@
inputs.nix-index-database.hmModules.nix-index
];
stylix.enable = true;
home = {
username = globals.username;

1
home/linux/fonts.nix
View file

@ -5,5 +5,6 @@
nerdfonts
ubuntu_font_family
noto-fonts-cjk-sans
noto-fonts
];
}

42
home/linux/hyprland.nix
View file

@ -1,5 +1,6 @@
{
config,
inputs,
pkgs,
lib,
globals,
@ -27,9 +28,9 @@ in {
polkit-kde-agent
qt6.qtwayland
qt6ct
xdg-desktop-portal-hyprland
xdg-desktop-portal
rofi-wayland
xdg-desktop-portal
inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
]
++ (
if pkgs.stdenv.isAarch64
@ -37,6 +38,31 @@ in {
else [firefox discord]
);
# home.pointerCursor = {
# gtk.enable = true;
# package = pkgs.bibata-cursors;
# name = "Bibata-Modern-Classic";
# size = 24;
# };
# gtk = {
# enable = true;
# theme = {
# package = pkgs.flat-remix-gtk;
# name = "Flat-Remix-GTK-Grey-Darkest";
# };
# iconTheme = {
# package = pkgs.adwaita-icon-theme;
# name = "Adwaita";
# };
# font = {
# name = "Sans";
# size = 12;
# package = pkgs.dejavu_fonts;
# };
# };
# notifications daemon
services.mako.enable = true;
@ -44,6 +70,8 @@ in {
enable = true;
settings = {
cursor.no_hardware_cursors = true;
debug.disable_logs = false;
decoration = {
rounding = 10;
@ -100,7 +128,7 @@ in {
bind = let
bright = "${pkgs.brightnessctl}/bin/brightnessctl";
in [
"$mod, SPACE, exec, rofi -modes \"ssh,drun,window\" -show drun"
"$mod, SPACE, exec, rofi -modes \"ssh,drun,window\" -log ~/rofi.log -show drun"
"ALT, SPACE, exec, rofi -show window"
# swaylock on suspend
@ -178,10 +206,10 @@ in {
};
};
"device:synaptics-tm3053-003" = {
accel_profile = "adaptive";
sensitivity = 0.3;
};
# "device:synaptics-tm3053-003" = {
# accel_profile = "adaptive";
# sensitivity = 0.3;
# };
gestures = {
workspace_swipe = true;

2
home/programs/default.nix
View file

@ -19,7 +19,7 @@
alacritty = {
enable = true;
settings = {
font.normal.style = lib.mkForce "Book";
#font.normal.style = lib.mkForce "Book";
window = {
decorations = "None";
};

3
nixos/hosts/voyager/default.nix
View file

@ -33,7 +33,6 @@
hardware.asahi = {
withRust = true;
addEdgeKernelConfig = true;
useExperimentalGPUDriver = true;
experimentalGPUInstallMode = "replace";
};
@ -51,7 +50,7 @@
'';
};
hardware.opengl.enable = true;
hardware.graphics.enable = true;
networking.hostName = "voyager";
}

21
nixos/profiles/default.nix
View file

@ -18,6 +18,27 @@
hardware.enableRedistributableFirmware = lib.mkDefault true;
stylix = {
fonts = rec {
serif = sansSerif;
sansSerif = {
package = pkgs.dejavu_fonts;
name = "DejaVu Sans";
};
monospace = {
package = pkgs.dejavu_fonts;
name = "DejaVu Sans Mono";
};
emoji = {
package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji";
};
};
};
networking = {
useDHCP = lib.mkDefault true;

18
nixos/profiles/gui.nix
View file

@ -37,16 +37,14 @@
synaptics.enable = false;
displayManager.lightdm.enable = false;
libinput = {
enable = true;
touchpad.tapping = true;
touchpad.naturalScrolling = true;
touchpad.scrollMethod = "twofinger";
touchpad.disableWhileTyping = true;
touchpad.clickMethod = "clickfinger";
};
};
sound.enable = true;
services.libinput = {
enable = true;
touchpad.tapping = true;
touchpad.naturalScrolling = true;
touchpad.scrollMethod = "twofinger";
touchpad.disableWhileTyping = true;
touchpad.clickMethod = "clickfinger";
};
}

12
nixos/profiles/hyprland.nix
View file

@ -2,14 +2,22 @@
inputs,
pkgs,
...
}: {
}: let
hyprpkgs = inputs.hyprland.packages.${pkgs.system};
in {
imports = [
./gui.nix
../modules/polkit.nix
];
programs.hyprland.enable = true;
programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland;
programs.hyprland.package = hyprpkgs.hyprland;
programs.hyprland.portalPackage = hyprpkgs.xdg-desktop-portal-hyprland;
xdg.portal = {
enable = true;
extraPortals = [hyprpkgs.xdg-desktop-portal-hyprland];
};
programs.waybar.enable = true;
programs.waybar.package = pkgs.waybar.overrideAttrs (oldAttrs: {