hyprland in home-manager!!!

This commit is contained in:
marty 2025-12-18 07:56:21 +00:00
parent 328bd672af
commit a9119067c5
14 changed files with 80 additions and 44 deletions

View file

@ -18,6 +18,8 @@
# Include the results of the hardware scan. # Include the results of the hardware scan.
./imports.nix ./imports.nix
]; ];
environment.pathsToLink = [ "/share/applications" "/share/xdg-desktop-portal" ];
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave # on your system were taken. Its perfectly fine and recommended to leave

View file

@ -8,12 +8,12 @@
}; };
outputs = outputs =
inputs@{ {
self, self,
nixpkgs, nixpkgs,
home-manager, home-manager,
... ...
}: }@inputs:
let let
pkgs = nixpkgs.legacyPackages.x86_64-linux; pkgs = nixpkgs.legacyPackages.x86_64-linux;
in in
@ -40,16 +40,12 @@
}; };
marty-latitude = nixpkgs.lib.nixosSystem { marty-latitude = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [ modules = [
./marty-latitude.nix ./marty-latitude.nix
./configuration.nix ./configuration.nix
./user/marty.nix ./user/marty.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
# {
# home-manager.useGlobalPkgs = true;
# home-manager.useUserPackages = true;
# home-manager.users.marty = import ./config.nix/modules/home.nix
# }
]; ];
}; };

View file

@ -23,7 +23,7 @@
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users = { users = {
marty = import ./config.nix/modules/home.nix; marty = import ./modules/home.nix;
}; };
}; };

View file

@ -23,7 +23,7 @@
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users = { users = {
marty = import ./config.nix/modules/home.nix; marty = import ./modules/home.nix;
}; };
}; };

View file

@ -1,6 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ ./window_manager ];
# Home Manager needs a bit of information about you and the paths it should # Home Manager needs a bit of information about you and the paths it should
# manage. # manage.
home.username = "marty"; home.username = "marty";
@ -17,6 +18,9 @@
# The home.packages option allows you to install Nix packages into your # The home.packages option allows you to install Nix packages into your
# environment. # environment.
programs.fish.enable = true;
home.packages = with pkgs; [ home.packages = with pkgs; [
# # Adds the 'hello' command to your environment. It prints a friendly # # Adds the 'hello' command to your environment. It prints a friendly
# # "Hello, world!" when run. # # "Hello, world!" when run.

View file

@ -8,7 +8,6 @@
{ {
imports = [ imports = [
./development/import_development.nix ./development/import_development.nix
./window_manager/import_wm.nix
]; ];
} }

View file

@ -5,22 +5,22 @@
... ...
}: }:
let # let
enable_waybar = # enable_waybar =
if config.networking.hostName == "marty-pc" then # if config.networking.hostName == "marty-pc" then
true # true
else if config.networking.hostName == "marty-latitude" then # else if config.networking.hostName == "marty-latitude" then
true # true
else if config.networking.hostName == "marty-server" then # else if config.networking.hostName == "marty-server" then
false # false
else # else
false; # false;
in # in
{ {
programs = { programs = {
waybar = { waybar = {
enable = enable_waybar; enable = true;
}; };
}; };
} }

View file

@ -1,6 +1,7 @@
{ config, pkgs,... }: { config, pkgs,... }:
{ {
home.packages = [pkgs.cmatrix];
programs.rofi = { programs.rofi = {
enable = true; enable = true;
theme = "sidebar"; theme = "sidebar";

View file

@ -5,26 +5,41 @@
... ...
}: }:
let # let
enable_hyprland = # enable_hyprland =
if config.networking.hostName == "marty-pc" then # if config.networking.hostName == "marty-pc" then
true # true
else if config.networking.hostName == "marty-latitude" then # else if config.networking.hostName == "marty-latitude" then
true # true
else if config.networking.hostName == "marty-server" then # else if config.networking.hostName == "marty-server" then
false # false
else # else
false; # false;
in # in
{ {
xdg.portal = {
enable = true;
configPackages = [ pkgs.xdg-desktop-portal-hyprland ];
extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
};
programs = { programs = {
hyprland = { kitty = {
enable = enable_hyprland; enable = true;
xwayland.enable = enable_hyprland;
}; };
hyprlock = { hyprlock = {
enable = enable_hyprland; enable = true;
}; };
}; };
wayland.windowManager.hyprland = {
enable = true;
settings = {
"$mod" = "SUPER";
bind = [
"$mod, D, exec, rofi -show drun"
"$mod, Enter, exec, kitty"
];
};
};
home.sessionVariables.NIXOS_OZONE_WL = "1";
} }

18
system/dm.nix Normal file
View file

@ -0,0 +1,18 @@
{ config, pkgs, lib, ...}:
{
services = {
xserver = {
xkb = {
layout = "de";
variant = "";
};
};
displayManager.gdm = {
enable = true;
wayland = true;
autoSuspend = false;
};
};
}

View file

@ -11,5 +11,6 @@
./shell.nix ./shell.nix
./terminal.nix ./terminal.nix
./networking.nix ./networking.nix
./dm.nix
]; ];
} }

View file

@ -7,9 +7,9 @@
coreutils coreutils
]; ];
}; };
programs = { # programs = {
fish = { # fish = {
enable = true; # enable = true;
}; # };
}; # };
} }

View file

@ -16,7 +16,7 @@
"audio" "audio"
"render" "render"
]; ];
shell = pkgs.fish; # shell = pkgs.fish;
}; };
security.sudo = { security.sudo = {