Compare commits
4 commits
24b7435c7b
...
f7a71896d2
| Author | SHA1 | Date | |
|---|---|---|---|
| f7a71896d2 | |||
| b8c954350c | |||
| c3100e4cfb | |||
| 54f112a4f9 |
7 changed files with 38 additions and 24 deletions
|
|
@ -18,8 +18,6 @@ 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
12
flake.lock
generated
|
|
@ -109,11 +109,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765859973,
|
"lastModified": 1766292113,
|
||||||
"narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=",
|
"narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "7df150f0d3857cf68dae443813b27acfb201b2d8",
|
"rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -189,11 +189,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765838191,
|
"lastModified": 1766201043,
|
||||||
"narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=",
|
"narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6",
|
"rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -29,8 +29,6 @@
|
||||||
ntfs = true;
|
ntfs = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.xserver.windowManager.i3.enable = true;
|
|
||||||
|
|
||||||
services.btrfs = {
|
services.btrfs = {
|
||||||
autoScrub = {
|
autoScrub = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -96,7 +94,7 @@
|
||||||
hardware = {
|
hardware = {
|
||||||
bluetooth = {
|
bluetooth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
powerOnBoot = false;
|
powerOnBoot = true;
|
||||||
};
|
};
|
||||||
nvidia = {
|
nvidia = {
|
||||||
open = true;
|
open = true;
|
||||||
|
|
@ -104,12 +102,8 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
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;
|
||||||
services.displayManager.sddm.wayland.enable = true;
|
my.displayManager.gdm.enable = true;
|
||||||
|
services.desktopManager.gnome.enable = true;
|
||||||
services.power-profiles-daemon.enable = true;
|
services.power-profiles-daemon.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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,9 +21,6 @@
|
||||||
(pkgs)
|
(pkgs)
|
||||||
# some websites only work there :(
|
# some websites only work there :(
|
||||||
chromium
|
chromium
|
||||||
darktable
|
|
||||||
hugin
|
|
||||||
enblend-enfuse
|
|
||||||
# dev
|
# dev
|
||||||
rustup
|
rustup
|
||||||
;
|
;
|
||||||
|
|
|
||||||
|
|
@ -154,6 +154,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# 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;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
{...}: {
|
{...}: {
|
||||||
imports = [
|
imports = [
|
||||||
|
./gdm.nix
|
||||||
./sddm.nix
|
./sddm.nix
|
||||||
./secrets
|
./secrets
|
||||||
./wakeonwlan.nix
|
./wakeonwlan.nix
|
||||||
|
|
|
||||||
23
modules/gdm.nix
Normal file
23
modules/gdm.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
||||||
|
{
|
||||||
|
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;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue