diff --git a/flake.nix b/flake.nix index 73eb58c..f6c3ede 100644 --- a/flake.nix +++ b/flake.nix @@ -4,30 +4,27 @@ inputs = { # Nixpkgs and hardware specific configs - - # there was a way to have unstable as an overlay, - # will set it back up, lazy rn, for now pick one - # nixpkgs.url = "nixpkgs/nixos-23.11"; nixpkgs.url = "nixpkgs/nixos-unstable"; - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - + # declarative disks disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; + # declarative dots home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + # ricer friendly wayland compositor hyprland.url = "github:hyprwm/Hyprland"; }; - outputs = { nixpkgs, nixos-hardware, disko, home-manager, hyprland, ... }: { + outputs = { nixpkgs, nixos-hardware, disko, home-manager, ... }: { nixosConfigurations = { proserpina = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; diff --git a/modules/core/display.nix b/modules/core/display.nix index 6683344..896c644 100644 --- a/modules/core/display.nix +++ b/modules/core/display.nix @@ -1,10 +1,12 @@ -{ inputs, pkgs, username, ... }: +{ pkgs, lib, inputs, ... }: { programs.hyprland = { enable = true; xwayland.enable = true; + packages = inputs.hyprland.packages."${pkgs.system}" + }; xdg.portal = { @@ -17,22 +19,22 @@ ]; }; - services.xserver = { - enable = true; - layout = "us"; # what is the difference # - xkbVariant = ""; # between - xkb.layout = "us"; # these 2 lolwut # - displayManager.autoLogin = { - enable = true; - user = "serenity"; - }; - libinput = { - enable = true; - mouse = { - accelProfile = "flat"; - }; - }; - }; + # services.xserver = { + # enable = true; + # layout = "us"; # what is the difference # + # xkbVariant = ""; # between + # xkb.layout = "us"; # these 2 lolwut # + # displayManager.autoLogin = { + # enable = true; + # user = "serenity"; + # }; + # libinput = { + # enable = true; + # mouse = { + # accelProfile = "flat"; + # }; + # }; + # }; # apparently prevents getting stuck at shutdown systemd.extraConfig = "DefaultTimeoutStopSec=10s"; diff --git a/modules/home/default.nix b/modules/home/default.nix deleted file mode 100644 index 622b278..0000000 --- a/modules/home/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - - wayland.windowManager.hyprland.enable = true; - -} diff --git a/modules/home/hyprland.nix b/modules/home/hyprland.nix new file mode 100644 index 0000000..aeaea7a --- /dev/null +++ b/modules/home/hyprland.nix @@ -0,0 +1,44 @@ +{ pkgs, lib, config, inputs, ... }: + + let + startupScript = pkgs.pkgs.writeShellScriptBin "start" '' + ${pkgs.waybar}/bin/waybar & + ${pkgs.swww}/bin/swww init & + + sleep 1 + + ${pkgs.swww}/bin/swww img ${./wallpaper.png} & + ''; + in +{ + + wayland.windowManager.hyprland = { + enable = true; + + plugins = [ + inputs.hyprland-plugins.packages."${pkgs.system}".borders-plus-plus + ]; + + settings = { + + exec-once = ''${startupScript}/bin/start''; + + "plugin:borders-plus-plus" = { + add_borders = 1; # 0 - 9 + + # you can add up to 9 borders + "col.border_1" = "rgb(ffffff)"; + "col.border_2" = "rgb(2222ff)"; + + # -1 means "default" as in the one defined in general:border_size + border_size_1 = 10; + border_size_2 = -1; + + # makes outer edges match rounding of the parent. Turn on / off to better understand. Default = on. + natural_rounding = "yes"; + }; + + }; + }; + +}