alejandra
This commit is contained in:
parent
7cbdcdcd87
commit
4d0ee4459a
12 changed files with 331 additions and 341 deletions
|
|
@ -18,10 +18,11 @@
|
|||
} @ inputs: let
|
||||
system = "x86_64-linux";
|
||||
mkConf = import ./lib/mkconf.nix;
|
||||
|
||||
pkgs = import nixpkgs {inherit system;};
|
||||
user = "tristan";
|
||||
userName = "Tristan Beedell";
|
||||
in {
|
||||
formatter.${system} = pkgs.alejandra;
|
||||
nixosConfigurations = {
|
||||
zenix = mkConf "zenix" {
|
||||
inherit inputs nixpkgs system user userName home-manager;
|
||||
|
|
|
|||
|
|
@ -341,5 +341,4 @@ in {
|
|||
};
|
||||
|
||||
programs.direnv.enable = true;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -179,5 +179,4 @@ user: {
|
|||
services.prometheus.exporters.node.enable = true;
|
||||
|
||||
networking.networkmanager.insertNameservers = ["1.1.1.1" "1.0.0.1"];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -120,7 +120,5 @@
|
|||
};
|
||||
wallpaper = ../images/nix-soft.png;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ nixpkgs.lib.nixosSystem {
|
|||
inherit system;
|
||||
|
||||
modules = [
|
||||
|
||||
inputs.stylix.nixosModules.stylix
|
||||
({pkgs, ...}: {
|
||||
stylix.image = ../images/demonslayer.png;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
with lib; let
|
||||
cfg = config.displays;
|
||||
|
||||
renderDisplaysForHyprland = displays: (map displayHyprlandSetting (builtins.filter (d: d.enable) displays ));
|
||||
renderDisplaysForHyprland = displays: (map displayHyprlandSetting (builtins.filter (d: d.enable) displays));
|
||||
|
||||
displayHyprlandSetting = display:
|
||||
specificDisplay display
|
||||
|
|
|
|||
|
|
@ -12,5 +12,8 @@ in {
|
|||
type = lib.types.oneOf ["hyprland" "sway"];
|
||||
};
|
||||
|
||||
config = if opt == "hyprland" then (import ../programs/hyprland.nix {inherit user;} {inherit lib pkgs;}) else {};
|
||||
config =
|
||||
if opt == "hyprland"
|
||||
then (import ../programs/hyprland.nix {inherit user;} {inherit lib pkgs;})
|
||||
else {};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
};
|
||||
|
||||
home-manager.users.${user}.imports = [
|
||||
( import ./swaylock.nix )
|
||||
( import ./swayidle.nix )
|
||||
(import ./swaylock.nix)
|
||||
(import ./swayidle.nix)
|
||||
{
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
configPackages = [ pkgs.hyprland ];
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-hyprland pkgs.xdg-desktop-portal-gtk ];
|
||||
configPackages = [pkgs.hyprland];
|
||||
extraPortals = [pkgs.xdg-desktop-portal-hyprland pkgs.xdg-desktop-portal-gtk];
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
|
|
@ -167,10 +167,7 @@
|
|||
enable = true;
|
||||
};
|
||||
|
||||
programs.waybar.settings.mainBar.modules-left =
|
||||
["hyprland/workspaces" "hyprland/window"];
|
||||
|
||||
|
||||
programs.waybar.settings.mainBar.modules-left = ["hyprland/workspaces" "hyprland/window"];
|
||||
}
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@
|
|||
};
|
||||
|
||||
home-manager.users.${user}.imports = [
|
||||
( import ./swaylock.nix )
|
||||
(import ./swaylock.nix)
|
||||
{
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
configPackages = [ pkgs.sway ];
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-sway pkgs.xdg-desktop-portal-gtk ];
|
||||
configPackages = [pkgs.sway];
|
||||
extraPortals = [pkgs.xdg-desktop-portal-sway pkgs.xdg-desktop-portal-gtk];
|
||||
};
|
||||
|
||||
wayland.windowManager.sway = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{pkgs,...}: {
|
||||
|
||||
{pkgs, ...}: {
|
||||
services.swayidle = {
|
||||
enable = true;
|
||||
systemdTarget = "graphical-session.target";
|
||||
|
|
@ -24,5 +23,4 @@
|
|||
}
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{pkgs,...}: {
|
||||
|
||||
{pkgs, ...}: {
|
||||
programs.swaylock = {
|
||||
enable = true;
|
||||
package = pkgs.swaylock-effects;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs,...}: {
|
||||
{pkgs, ...}: {
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
@ -44,7 +44,4 @@
|
|||
target = "graphical-session.target";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue