Compare commits

...

4 commits

10 changed files with 46 additions and 20 deletions

View file

@ -5,3 +5,7 @@ extend-ignore-re = ['[a-fA-F0-9]{6}']
[default.extend-words] [default.extend-words]
doas = "doas" doas = "doas"
edn = "edn" edn = "edn"
[type.images]
extend-glob = ["*.png"]
check-file = false

18
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713077896, "lastModified": 1714515075,
"narHash": "sha256-Noot8H0EZEAFRQWyGxh9ryvhK96xpIqKbh78X447JWs=", "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "630a0992b3627c64e34f179fab68e3d48c6991c0", "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712963716, "lastModified": 1714253743,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -37,11 +37,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1713113175, "lastModified": 1714596740,
"narHash": "sha256-E/WxD3Nh4kd3AYYLk8UyMnkUm9AMT3zUk/rBI4Qjk04=", "narHash": "sha256-V3ZR38xu3JSUrg04wMTp0fzDSP+ogNJOOU5ckreCzLQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "90060445d9ee7b731c147b2caa53dc45d557bce9", "rev": "c8456769a0904ac761020a76bf0bb72a92c27c7c",
"type": "github" "type": "github"
}, },
"original": { "original": {

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

View file

@ -25,6 +25,8 @@
desktop.sway = { desktop.sway = {
enable = true; enable = true;
kanshi = true; kanshi = true;
wallpapers.lockscreen = "${./files/lockscreen.png}";
wallpapers.desktop = "${./files/wallpaper.png} center #000000";
waybar = { waybar = {
laptop = true; laptop = true;
gpuThermal = { gpuThermal = {

View file

@ -1,4 +1,6 @@
_: { _:
{
## Specific host home manager configuration
wayland.windowManager.sway.config = { wayland.windowManager.sway.config = {
input = { input = {
"1:1:AT_Translated_Set_2_keyboard" = { "1:1:AT_Translated_Set_2_keyboard" = {
@ -13,11 +15,5 @@ _: {
"pointer_accel" = "0.3"; "pointer_accel" = "0.3";
}; };
}; };
output = {
"*" = {
bg = "~/medias/images/wallpapers/wallpaper.png center #000000";
};
};
}; };
} }

View file

@ -13,6 +13,19 @@ in
description = "configure laptop mode"; description = "configure laptop mode";
}; };
wallpapers = {
lockscreen = mkOption {
type = types.str;
default = "";
description = "path for lockscreen wallpaper";
};
desktop = mkOption {
type = types.str;
default = "";
description = "path for desktop wallpaper";
};
};
waybar = { waybar = {
laptop = mkOption { laptop = mkOption {
type = types.bool; type = types.bool;
@ -130,7 +143,7 @@ in
qt = { qt = {
enable = true; enable = true;
platformTheme = "gnome"; platformTheme.name = "adwaita";
style.name = "adwaita-dark"; style.name = "adwaita-dark";
}; };
xdg = { xdg = {

View file

@ -1,5 +1,8 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
with lib; with lib;
let
cfg = config.modules.desktop.sway;
in
{ {
config = mkIf config.modules.desktop.sway.enable { config = mkIf config.modules.desktop.sway.enable {
wayland.windowManager.sway = { wayland.windowManager.sway = {
@ -20,6 +23,11 @@ with lib;
xkb_variant = "altgr-intl"; xkb_variant = "altgr-intl";
}; };
}; };
output = {
"*" = {
bg = "${cfg.wallpapers.desktop}";
};
};
seat = { seat = {
"*".hide_cursor = "when-typing enable"; "*".hide_cursor = "when-typing enable";
}; };

View file

@ -1,11 +1,14 @@
{ config, lib, ... }: { config, lib, ... }:
with lib; with lib;
let
cfg = config.modules.desktop.sway;
in
{ {
config = mkIf config.modules.desktop.sway.enable { config = mkIf config.modules.desktop.sway.enable {
programs.swaylock = { programs.swaylock = {
enable = true; enable = true;
settings = { settings = {
image = "~/medias/images/wallpapers/lockscreen.png"; image = "${cfg.wallpapers.lockscreen}";
scaling = "center"; scaling = "center";
color = "000000"; color = "000000";
indicator-radius = 70; indicator-radius = 70;

View file

@ -55,8 +55,8 @@
../hosts/${hostname}/home-config.nix ../hosts/${hostname}/home-config.nix
../modules/home-manager/default.nix ../modules/home-manager/default.nix
] ++ lib.optional ( ] ++ lib.optional (
builtins.pathExists ../home-manager/hosts/${hostname}.nix builtins.pathExists ../hosts/${hostname}/includes/home-manager.nix
) ../home-manager/hosts/${hostname}.nix; ) ../hosts/${hostname}/includes/home-manager.nix;
}; };
}; };