Compare commits

...

5 commits

5 changed files with 48 additions and 16 deletions

6
flake.lock generated
View file

@ -594,11 +594,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1744098102, "lastModified": 1744932701,
"narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -27,17 +27,17 @@ inputs: let
modules = concatLists [ modules = concatLists [
# This is used to pre-emptively set the hostPlatform for nixpkgs. # This is used to pre-emptively set the hostPlatform for nixpkgs.
# Also, we set the system hostname here. # Also, we set the system hostname here.
[
# self.nixosModules.user
]
(singleton { (singleton {
networking.hostName = hostname; networking.hostName = hostname;
nixpkgs.hostPlatform = system; nixpkgs.hostPlatform = system;
}) })
(flatten ( (flatten (
concatLists [ concatLists [
# configuration for the host, passed as an argument.
(singleton ./${hostname}/default.nix) (singleton ./${hostname}/default.nix)
# common configuration, which all hosts share.
(singleton ./common.nix) (singleton ./common.nix)
# Import all files called module.nix from my modules directory.
( (
filter (hasSuffix "module.nix") ( filter (hasSuffix "module.nix") (
map toString (listFilesRecursive ../modules) map toString (listFilesRecursive ../modules)

View file

@ -4,11 +4,14 @@
pkgs, pkgs,
... ...
}: let }: let
cfg = config.modules.services.greetd; inherit (lib.meta) getExe;
uwsmEnabled = config.modules.services.uwsm.enable; inherit (lib.modules) mkIf;
inherit (lib.options) mkOption mkEnableOption; inherit (lib.options) mkOption mkEnableOption;
inherit (lib.types) str listOf; inherit (lib.types) str listOf;
inherit (lib.modules) mkIf;
inherit (config.meta.mainUser) username;
cfg = config.modules.services.greetd;
uwsmEnabled = config.modules.services.uwsm.enable;
in { in {
options.modules.services.greetd = { options.modules.services.greetd = {
enable = mkEnableOption "greetd"; enable = mkEnableOption "greetd";
@ -25,24 +28,31 @@ in {
type = str; type = str;
default = default =
if uwsmEnabled if uwsmEnabled
then "uwsm start Hyprland" then "${getExe config.programs.uwsm.package} start Hyprland"
else "Hyprland"; else "Hyprland";
}; };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.greetd = { services.greetd = let
enable = true; session = {
package = pkgs.greetd;
settings.default_session = {
command = '' command = ''
${pkgs.greetd.tuigreet}/bin/tuigreet \ ${pkgs.greetd.tuigreet}/bin/tuigreet \
-c \"${cfg.session}\" \ -c \"${cfg.session}\" \
-r -r
-t --time-format "DD.MM.YYYY" -t --time-format "DD.MM.YYYY"
--asteriks''; --asteriks'';
# command = "${getExe config.programs.uwsm.package} start hyprland-uwsm.desktop";
# user = username;
}; };
in {
enable = true;
package = pkgs.greetd;
vt = 7; vt = 7;
settings = {
default_session = session;
initial_session = session;
};
}; };
}; };
} }

View file

@ -6,6 +6,17 @@ in {
]; ];
networking = { networking = {
enableIPv6 = true; enableIPv6 = true;
# INFO: This disables wpa_supplicant,
# I use nenetworkmanager instead.
wireless.enable = false;
dhcpcd = {
# faster boot times
wait = "background";
extraConfig = "noarp";
};
nameservers = [ nameservers = [
# quad9 DNS # quad9 DNS
"9.9.9.9" "9.9.9.9"
@ -14,8 +25,16 @@ in {
}; };
services.resolved = { services.resolved = {
enable = true; enable = true;
dnssec = "false";
# quad9 dns # quad9 dns
fallbackDns = ["9.9.9.9" "2620::fe::fe"]; fallbackDns = ["9.9.9.9" "2620::fe::fe"];
}; };
users.users.${username}.extraGroups = ["networkmanager"]; users.users.${username}.extraGroups = ["networkmanager"];
systemd = {
network = {
enable = true;
wait-online.anyInterface = true;
};
};
} }

View file

@ -1,15 +1,17 @@
{ {
config, config,
lib,
pkgs, pkgs,
... ...
}: let }: let
# inherit (config.modules.style) cursor; # inherit (config.modules.style) cursor;
inherit (builtins) toString;
in { in {
programs.hyprland.settings = { programs.hyprland.settings = {
# Hyprland settings # Hyprland settings
# Programs which get executed at Hyprland start. # Programs which get executed at Hyprland start.
exec-once = [ exec-once = [
"uwsm finalize"
"hyprctl setcursor BreezeX-RosePine-Linux 32" "hyprctl setcursor BreezeX-RosePine-Linux 32"
"[workspace special:keepassxc; silent;tile] ${pkgs.keepassxc}/bin/keepassxc" "[workspace special:keepassxc; silent;tile] ${pkgs.keepassxc}/bin/keepassxc"
@ -22,6 +24,7 @@ in {
"${pkgs.wlsunset}/bin/wlsunset -S 06:00 -s 20:00" "${pkgs.wlsunset}/bin/wlsunset -S 06:00 -s 20:00"
"${pkgs.lxqt.lxqt-policykit}/bin/lxqt-policykit-agent" "${pkgs.lxqt.lxqt-policykit}/bin/lxqt-policykit-agent"
"hyprctl dispatch split-workspace 1" "hyprctl dispatch split-workspace 1"
]; ];
}; };
} }