alejandra

This commit is contained in:
Tristan 2024-01-05 18:48:13 +00:00
parent 7cbdcdcd87
commit 4d0ee4459a
12 changed files with 331 additions and 341 deletions

View file

@ -18,10 +18,11 @@
} @ inputs: let } @ inputs: let
system = "x86_64-linux"; system = "x86_64-linux";
mkConf = import ./lib/mkconf.nix; mkConf = import ./lib/mkconf.nix;
pkgs = import nixpkgs {inherit system;};
user = "tristan"; user = "tristan";
userName = "Tristan Beedell"; userName = "Tristan Beedell";
in { in {
formatter.${system} = pkgs.alejandra;
nixosConfigurations = { nixosConfigurations = {
zenix = mkConf "zenix" { zenix = mkConf "zenix" {
inherit inputs nixpkgs system user userName home-manager; inherit inputs nixpkgs system user userName home-manager;

View file

@ -341,5 +341,4 @@ in {
}; };
programs.direnv.enable = true; programs.direnv.enable = true;
} }

View file

@ -179,5 +179,4 @@ user: {
services.prometheus.exporters.node.enable = true; services.prometheus.exporters.node.enable = true;
networking.networkmanager.insertNameservers = ["1.1.1.1" "1.0.0.1"]; networking.networkmanager.insertNameservers = ["1.1.1.1" "1.0.0.1"];
} }

View file

@ -120,7 +120,5 @@
}; };
wallpaper = ../images/nix-soft.png; wallpaper = ../images/nix-soft.png;
}; };
}; };
} }

View file

@ -15,7 +15,6 @@ nixpkgs.lib.nixosSystem {
inherit system; inherit system;
modules = [ modules = [
inputs.stylix.nixosModules.stylix inputs.stylix.nixosModules.stylix
({pkgs, ...}: { ({pkgs, ...}: {
stylix.image = ../images/demonslayer.png; stylix.image = ../images/demonslayer.png;

View file

@ -7,7 +7,7 @@
with lib; let with lib; let
cfg = config.displays; 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: displayHyprlandSetting = display:
specificDisplay display specificDisplay display

View file

@ -12,5 +12,8 @@ in {
type = lib.types.oneOf ["hyprland" "sway"]; 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 {};
} }

View file

@ -15,13 +15,13 @@
}; };
home-manager.users.${user}.imports = [ home-manager.users.${user}.imports = [
( import ./swaylock.nix ) (import ./swaylock.nix)
( import ./swayidle.nix ) (import ./swayidle.nix)
{ {
xdg.portal = { xdg.portal = {
enable = true; enable = true;
configPackages = [ pkgs.hyprland ]; configPackages = [pkgs.hyprland];
extraPortals = [ pkgs.xdg-desktop-portal-hyprland pkgs.xdg-desktop-portal-gtk ]; extraPortals = [pkgs.xdg-desktop-portal-hyprland pkgs.xdg-desktop-portal-gtk];
}; };
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
@ -167,10 +167,7 @@
enable = true; enable = true;
}; };
programs.waybar.settings.mainBar.modules-left = programs.waybar.settings.mainBar.modules-left = ["hyprland/workspaces" "hyprland/window"];
["hyprland/workspaces" "hyprland/window"];
} }
]; ];
} }

View file

@ -16,12 +16,12 @@
}; };
home-manager.users.${user}.imports = [ home-manager.users.${user}.imports = [
( import ./swaylock.nix ) (import ./swaylock.nix)
{ {
xdg.portal = { xdg.portal = {
enable = true; enable = true;
configPackages = [ pkgs.sway ]; configPackages = [pkgs.sway];
extraPortals = [ pkgs.xdg-desktop-portal-sway pkgs.xdg-desktop-portal-gtk ]; extraPortals = [pkgs.xdg-desktop-portal-sway pkgs.xdg-desktop-portal-gtk];
}; };
wayland.windowManager.sway = { wayland.windowManager.sway = {

View file

@ -1,5 +1,4 @@
{pkgs,...}: { {pkgs, ...}: {
services.swayidle = { services.swayidle = {
enable = true; enable = true;
systemdTarget = "graphical-session.target"; systemdTarget = "graphical-session.target";
@ -24,5 +23,4 @@
} }
]; ];
}; };
} }

View file

@ -1,5 +1,4 @@
{pkgs,...}: { {pkgs, ...}: {
programs.swaylock = { programs.swaylock = {
enable = true; enable = true;
package = pkgs.swaylock-effects; package = pkgs.swaylock-effects;

View file

@ -1,4 +1,4 @@
{pkgs,...}: { {pkgs, ...}: {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
settings = { settings = {
@ -44,7 +44,4 @@
target = "graphical-session.target"; target = "graphical-session.target";
}; };
}; };
} }