fix: revert to f4a0fec

This commit is contained in:
EinEtwas 2024-10-15 10:44:53 +02:00
parent 0f69de605e
commit 17ad6f1394
11 changed files with 27 additions and 16 deletions

View file

@ -1,4 +1,4 @@
{ pkgs, inputs, ... }:
{ config, pkgs, inputs, ... }:
{
imports = [
# <home-manager/nixos>
@ -15,7 +15,6 @@
# inherit ./hyprland.nix;
home.username = "rhea";
home.homeDirectory = "/home/rhea";
programs.home-manager.enable = true;
home.pointerCursor = {
@ -25,6 +24,7 @@
size = 16;
};
imports = [
./hyprland.nix
./git.nix

View file

@ -1,4 +1,4 @@
{ lib, pkgs, ... }: {
{ lib, inputs, pkgs, ... }: {
wayland.windowManager.hyprland = {
enable = true;
#package = pkgs.hyprland-patched;
@ -108,6 +108,7 @@
bind = let
alacritty = lib.getExe pkgs.alacritty;
chrome = lib.getExe pkgs.google-chrome;
hyprshot = lib.getExe pkgs.hyprshot;
wofi = lib.getExe pkgs.wofi;
workspaces = ["1" "2" "3" "4" "5" "6" "7" "8" "9"];

View file

@ -1,8 +1,8 @@
{ pkgs, ... }:
{ pkgs, nixpkgs, home-manager, ... }:
{
home.packages = with pkgs; [
vesktop
obsidian
gparted
polkit_gnome
gh # github

View file

@ -1,11 +1,8 @@
{ pkgs, ... }:
{ config, pkgs, ... }:
{
programs.waybar = {
enable = true;
systemd.enable = true;
package = pkgs.waybar;
style = ./waybar.css;
settings = {
mainBar = {
@ -80,6 +77,9 @@
clock = {
"format-alt" = "{:%a, %d. %b %H:%M}";
};
};
};
};

View file

@ -1,3 +1,4 @@
{ config, pkgs, ... }:
{
programs.wofi = {
enable = true;

View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ pkgs, ... }:
{ config, pkgs, ... }:
{
# Bootloader.
@ -73,7 +73,6 @@
environment.sessionVariables = {
NIXOS_OZONE_WL = "1";
DEFAULT_BROWSER = "${pkgs.google-chrome}/bin/google-chrome-stable";
};
services.devmon.enable = true;

View file

@ -1,3 +1,4 @@
{ pkgs, ...}:
{
services.fprintd = {
enable = true;

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, modulesPath, ... }:
{ config, lib, pkgs, modulesPath, ... }:
{
imports =

11
modules/hyprland.nix Normal file
View file

@ -0,0 +1,11 @@
{ inputs, pkgs, ... }:
{
# Enable Hyprland
programs.hyprland.enable = true;
environment.sessionVariables.NIXOS_OZONE_WL = "1";
environment.systemPackages = with pkgs; [
hyprlock
];
}

View file

@ -8,7 +8,6 @@
os-update = "sudo nixos-rebuild switch --flake \".#$HOST\" --log-format internal-json -v |& nom --json";
};
fonts.enableDefaultPackages = true;
fonts.packages = with pkgs; [
nerdfonts
];

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: {
{ inputs, pkgs, ... }: {
programs.hyprland.enable = true;
xdg.portal = {
enable = true;
wlr.enable = true;
@ -6,7 +7,5 @@
extraPortals = [
pkgs.xdg-desktop-portal-hyprland
];
# TODO: I should probably set `xdg.portal.config` or `xdg.portal.configPackages` here, but for now this works...
# config.common.default = "*";
};
}