Compare commits

..

No commits in common. "f7a71896d2353eef84a08858e98c17ffdd5140dc" and "24b7435c7ba6e10310849fbd517372a6d865bd51" have entirely different histories.

7 changed files with 24 additions and 38 deletions

View file

@ -18,6 +18,8 @@ in {
}; };
config = mkIf config.my.gui.enable { config = mkIf config.my.gui.enable {
my.displayManager.sddm.enable = true;
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;

12
flake.lock generated
View file

@ -109,11 +109,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766292113, "lastModified": 1765859973,
"narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=", "narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed", "rev": "7df150f0d3857cf68dae443813b27acfb201b2d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -189,11 +189,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1766201043, "lastModified": 1765838191,
"narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b3aad468604d3e488d627c0b43984eb60e75e782", "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -29,6 +29,8 @@
ntfs = true; ntfs = true;
}; };
services.xserver.windowManager.i3.enable = true;
services.btrfs = { services.btrfs = {
autoScrub = { autoScrub = {
enable = true; enable = true;
@ -94,7 +96,7 @@
hardware = { hardware = {
bluetooth = { bluetooth = {
enable = true; enable = true;
powerOnBoot = true; powerOnBoot = false;
}; };
nvidia = { nvidia = {
open = true; open = true;
@ -102,8 +104,12 @@
}; };
}; };
environment.systemPackages = with pkgs; [foot waybar wofi];
programs.hyprland.enable = true;
programs.hyprlock.enable = true;
programs.waybar.enable = true;
programs.foot.enable = true; programs.foot.enable = true;
my.displayManager.gdm.enable = true; services.displayManager.sddm.wayland.enable = true;
services.desktopManager.gnome.enable = true;
services.power-profiles-daemon.enable = true; services.power-profiles-daemon.enable = true;
} }

View file

@ -8,10 +8,10 @@
# Keyboard settings & i3 settings # Keyboard settings & i3 settings
my.home.x.enable = true; my.home.x.enable = true;
#my.home.x.i3.enable = true; my.home.x.i3.enable = true;
#my.home.x.i3bar.temperature.chip = "k10temp-pci-*"; my.home.x.i3bar.temperature.chip = "k10temp-pci-*";
#my.home.x.i3bar.temperature.inputs = ["Tccd1"]; my.home.x.i3bar.temperature.inputs = ["Tccd1"];
#my.home.x.i3bar.networking.throughput_interfaces = ["enp8s0" "wlp4s0"]; my.home.x.i3bar.networking.throughput_interfaces = ["enp8s0" "wlp4s0"];
my.home.emacs.enable = true; my.home.emacs.enable = true;
my.theme = config.home-manager.users.alarsyo.my.themes.solarizedLight; my.theme = config.home-manager.users.alarsyo.my.themes.solarizedLight;
@ -21,6 +21,9 @@
(pkgs) (pkgs)
# some websites only work there :( # some websites only work there :(
chromium chromium
darktable
hugin
enblend-enfuse
# dev # dev
rustup rustup
; ;

View file

@ -154,7 +154,6 @@
}; };
# Enable the KDE Plasma Desktop Environment. # Enable the KDE Plasma Desktop Environment.
my.displayManager.sddm.enable = true;
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
services.desktopManager.cosmic.enable = true; services.desktopManager.cosmic.enable = true;
services.power-profiles-daemon.enable = true; services.power-profiles-daemon.enable = true;

View file

@ -1,6 +1,5 @@
{...}: { {...}: {
imports = [ imports = [
./gdm.nix
./sddm.nix ./sddm.nix
./secrets ./secrets
./wakeonwlan.nix ./wakeonwlan.nix

View file

@ -1,23 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit
(lib)
mkEnableOption
mkIf
;
cfg = config.my.displayManager.gdm;
in {
options.my.displayManager.gdm.enable = mkEnableOption "GDM setup";
config = mkIf cfg.enable {
services.displayManager.gdm = {
enable = true;
wayland = true;
};
};
}