hyprland in home-manager!!!
This commit is contained in:
parent
328bd672af
commit
a9119067c5
14 changed files with 80 additions and 44 deletions
|
|
@ -18,6 +18,8 @@
|
|||
# Include the results of the hardware scan.
|
||||
./imports.nix
|
||||
];
|
||||
|
||||
environment.pathsToLink = [ "/share/applications" "/share/xdg-desktop-portal" ];
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||
|
|
|
|||
10
flake.nix
10
flake.nix
|
|
@ -8,12 +8,12 @@
|
|||
};
|
||||
|
||||
outputs =
|
||||
inputs@{
|
||||
{
|
||||
self,
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
...
|
||||
}:
|
||||
}@inputs:
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||
in
|
||||
|
|
@ -40,16 +40,12 @@
|
|||
};
|
||||
marty-latitude = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./marty-latitude.nix
|
||||
./configuration.nix
|
||||
./user/marty.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
# {
|
||||
# home-manager.useGlobalPkgs = true;
|
||||
# home-manager.useUserPackages = true;
|
||||
# home-manager.users.marty = import ./config.nix/modules/home.nix
|
||||
# }
|
||||
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
users = {
|
||||
marty = import ./config.nix/modules/home.nix;
|
||||
marty = import ./modules/home.nix;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
users = {
|
||||
marty = import ./config.nix/modules/home.nix;
|
||||
marty = import ./modules/home.nix;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./window_manager ];
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
# manage.
|
||||
home.username = "marty";
|
||||
|
|
@ -17,6 +18,9 @@
|
|||
|
||||
# The home.packages option allows you to install Nix packages into your
|
||||
# environment.
|
||||
|
||||
programs.fish.enable = true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
# # Adds the 'hello' command to your environment. It prints a friendly
|
||||
# # "Hello, world!" when run.
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
{
|
||||
imports = [
|
||||
./development/import_development.nix
|
||||
./window_manager/import_wm.nix
|
||||
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,22 +5,22 @@
|
|||
...
|
||||
}:
|
||||
|
||||
let
|
||||
enable_waybar =
|
||||
if config.networking.hostName == "marty-pc" then
|
||||
true
|
||||
else if config.networking.hostName == "marty-latitude" then
|
||||
true
|
||||
else if config.networking.hostName == "marty-server" then
|
||||
false
|
||||
else
|
||||
false;
|
||||
in
|
||||
# let
|
||||
# enable_waybar =
|
||||
# if config.networking.hostName == "marty-pc" then
|
||||
# true
|
||||
# else if config.networking.hostName == "marty-latitude" then
|
||||
# true
|
||||
# else if config.networking.hostName == "marty-server" then
|
||||
# false
|
||||
# else
|
||||
# false;
|
||||
# in
|
||||
|
||||
{
|
||||
programs = {
|
||||
waybar = {
|
||||
enable = enable_waybar;
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ config, pkgs,... }:
|
||||
|
||||
{
|
||||
home.packages = [pkgs.cmatrix];
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
theme = "sidebar";
|
||||
|
|
|
|||
|
|
@ -5,26 +5,41 @@
|
|||
...
|
||||
}:
|
||||
|
||||
let
|
||||
enable_hyprland =
|
||||
if config.networking.hostName == "marty-pc" then
|
||||
true
|
||||
else if config.networking.hostName == "marty-latitude" then
|
||||
true
|
||||
else if config.networking.hostName == "marty-server" then
|
||||
false
|
||||
else
|
||||
false;
|
||||
in
|
||||
# let
|
||||
# enable_hyprland =
|
||||
# if config.networking.hostName == "marty-pc" then
|
||||
# true
|
||||
# else if config.networking.hostName == "marty-latitude" then
|
||||
# true
|
||||
# else if config.networking.hostName == "marty-server" then
|
||||
# false
|
||||
# else
|
||||
# false;
|
||||
# in
|
||||
|
||||
{
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
configPackages = [ pkgs.xdg-desktop-portal-hyprland ];
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
|
||||
};
|
||||
programs = {
|
||||
hyprland = {
|
||||
enable = enable_hyprland;
|
||||
xwayland.enable = enable_hyprland;
|
||||
kitty = {
|
||||
enable = true;
|
||||
};
|
||||
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
18
system/dm.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{ config, pkgs, lib, ...}:
|
||||
|
||||
{
|
||||
services = {
|
||||
xserver = {
|
||||
xkb = {
|
||||
layout = "de";
|
||||
variant = "";
|
||||
};
|
||||
};
|
||||
displayManager.gdm = {
|
||||
enable = true;
|
||||
wayland = true;
|
||||
autoSuspend = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -11,5 +11,6 @@
|
|||
./shell.nix
|
||||
./terminal.nix
|
||||
./networking.nix
|
||||
./dm.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@
|
|||
coreutils
|
||||
];
|
||||
};
|
||||
programs = {
|
||||
fish = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
# programs = {
|
||||
# fish = {
|
||||
# enable = true;
|
||||
# };
|
||||
# };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
"audio"
|
||||
"render"
|
||||
];
|
||||
shell = pkgs.fish;
|
||||
# shell = pkgs.fish;
|
||||
};
|
||||
|
||||
security.sudo = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue