uhm, whoops, forgot

This commit is contained in:
Serenity-F 2024-04-05 03:54:04 +10:00
parent 44c76dce89
commit 8a92c7ac85
7 changed files with 41 additions and 84 deletions

View file

@ -9,7 +9,7 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
# nixos user repository ? :o # nixos user repository ? :o
nur.url "git:nix-community/NUR"; nur.url = "git:nix-community/NUR";
# alejandra ?? think its a code formatter # alejandra ?? think its a code formatter
# alejandra.url = "github:kamadorueda/alejandra/3.0.0"; # alejandra.url = "github:kamadorueda/alejandra/3.0.0";

View file

@ -10,6 +10,7 @@
firefox firefox
## filsesystem support ## filsesystem support
udiskie
ntfs3g ntfs3g
xfsprogs xfsprogs
@ -46,6 +47,11 @@
## maybe more ## maybe more
## libraries
glib
qt5-wayland
qt6-wayland
]; ];

View file

@ -3,5 +3,8 @@
imports = [ (import ./hyprland.nix) ] imports = [ (import ./hyprland.nix) ]
++ [ (import ./config.nix) ] ++ [ (import ./config.nix) ]
++ [ (import ./variables.nix) ] ++ [ (import ./variables.nix) ]
++ [ (import ./waybar) ]
++ [ (import ./wofi) ]
# ++ [ (import ./stylix) ]
++ [ inputs.hyprland.homeManagerModules.default ]; ++ [ inputs.hyprland.homeManagerModules.default ];
} }

View file

@ -1,20 +0,0 @@
{ config, pkgs, ... }:
{
home = {
sessionVariables = {
EDITOR = "micro";
BROWSER = "firefox";
TERMINAL = "kitty";
XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_DESKTOP - "Hyprland";
XDG_SESSION_TYPE = "wayland";
};
};
}

View file

@ -1,52 +0,0 @@
{ config, lib, pkgs, osConfig, ... }
{
imports = [
hyprland.homeManagerModules.default
./hyprland-environment.nix
];
home = {
packages = with pkgs; [
waybar
];
};
programs = {
hyperland = {
enable = true;
xwayland.enable = true;
};
};
wayland.windowManager.hyprland = {
enable = true;
systemdIntegration = true;
settings = {
"$mod" = "SUPER";
bind = [
"$mod, F, exec, firefox"
", Print, exec, grimblast copy area"
] ++ ( # workspaces
# binds $mod + [shift+] {1..10} to [move to] workspace {1..10}
builtins.concatLists (builtins.genList (
x: let
ws = let
c = (x + 1) / 10;
in
builtins.toString (x + 1 - (c * 10));
in [
"$mod, ${ws}, workspace, ${toString (x + 1)}"
"$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
]
)
10)
);
};
};
home.stateVersion = "23.11";
}

View file

@ -1,28 +1,41 @@
{ inputs, pkgs, ...}: { inputs, pkgs, ...}:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
# swww wayland
swaybg
inputs.hypr-contrib.packages.${pkgs.system}.grimblast inputs.hypr-contrib.packages.${pkgs.system}.grimblast
hyprlock
hyprpaper
hyprpicker hyprpicker
hyprcursor
wofi wofi
grim grim
dunst
slurp slurp
wl-clipboard nm-applet
# cliphist overskride
cliphist
wl-clip-persist
wf-recorder wf-recorder
glib
wayland
direnv
]; ];
systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ];
systemd.user.targets.hyprland-session.Unit.Wants = [
"xdg-desktop-autostart.target"
];
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
systemd.enable = true;
xwayland = { xwayland = {
enable = true; enable = true;
# hidpi = true; # hidpi = true;
}; };
# enableNvidiaPatches = false;
systemd.enable = true;
}; };
} }

View file

@ -1,6 +1,11 @@
{ ... }: { ... }:
{ {
home.sessionVariables = { home.sessionVariables = {
TERMINAL = "kitty";
EDITOR = "micro";
BROWSER = "firefox";
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
__GL_GSYNC_ALLOWED = "0"; __GL_GSYNC_ALLOWED = "0";
__GL_VRR_ALLOWED = "0"; __GL_VRR_ALLOWED = "0";
@ -20,6 +25,8 @@
WLR_BACKEND = "vulkan"; WLR_BACKEND = "vulkan";
WLR_RENDERER = "vulkan"; WLR_RENDERER = "vulkan";
WLR_NO_HARDWARE_CURSORS = "1"; WLR_NO_HARDWARE_CURSORS = "1";
XDG_CURRENT_DESKTOP = "hyprland";
XDG_SESSION_DESKTOP = "hyprland";
XDG_SESSION_TYPE = "wayland"; XDG_SESSION_TYPE = "wayland";
SDL_VIDEODRIVER = "wayland"; SDL_VIDEODRIVER = "wayland";
CLUTTER_BACKEND = "wayland"; CLUTTER_BACKEND = "wayland";