diff --git a/devices/binto/default.nix b/devices/binto/default.nix index bf2d38f..5bb3958 100644 --- a/devices/binto/default.nix +++ b/devices/binto/default.nix @@ -4,14 +4,12 @@ ../../modules/ags ../../modules/audio.nix - ../../modules/greetd ../../modules/hyprland ../../modules/kmscon.nix ../../modules/printer.nix ../../modules/proton-bridge.nix ../../modules/tailscale.nix - ./modules/desktop.nix ./modules/gpu-replay.nix ./modules/nix-gaming.nix ./modules/nvidia.nix diff --git a/devices/binto/hardware-configuration.nix b/devices/binto/hardware-configuration.nix index f21ac7f..35d6b30 100644 --- a/devices/binto/hardware-configuration.nix +++ b/devices/binto/hardware-configuration.nix @@ -67,6 +67,9 @@ virtualisation = { libvirtd.enable = true; }; + environment.systemPackages = with pkgs; [ + qemu + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/devices/binto/modules/desktop.nix b/devices/binto/modules/desktop.nix deleted file mode 100644 index 465c1a1..0000000 --- a/devices/binto/modules/desktop.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - pkgs, - config, - ... -}: let - hyprland = - config - .home-manager - .users - .${config.vars.user} - .wayland - .windowManager - .hyprland - .finalPackage; -in { - programs.dconf.enable = true; - - services = { - xserver = { - displayManager = { - sessionPackages = [hyprland]; - }; - - libinput.enable = true; - }; - - greetd = { - settings = { - initial_session = { - command = "${hyprland}/bin/Hyprland"; - user = config.vars.user; - }; - }; - }; - - dbus.enable = true; - gvfs.enable = true; - flatpak.enable = true; - }; - - programs.kdeconnect.enable = true; - - xdg.portal = { - enable = true; - wlr.enable = true; - extraPortals = [ - pkgs.xdg-desktop-portal-gtk - ]; - }; - - environment.systemPackages = with pkgs; [ - qemu - alsa-utils - plasma5Packages.kio-admin - plasma5Packages.ksshaskpass - p7zip # for reshade - kio-admin - ]; -} diff --git a/devices/wim/default.nix b/devices/wim/default.nix index da1ce2a..762ce3f 100644 --- a/devices/wim/default.nix +++ b/devices/wim/default.nix @@ -4,7 +4,6 @@ ../../modules/ags ../../modules/audio.nix - ../../modules/greetd ../../modules/hyprland ../../modules/kmscon.nix ../../modules/plymouth.nix @@ -12,7 +11,6 @@ ../../modules/proton-bridge.nix ../../modules/tailscale.nix - ./modules/desktop.nix ./modules/security.nix ]; diff --git a/devices/wim/hardware-configuration.nix b/devices/wim/hardware-configuration.nix index 5631186..76b0ef6 100644 --- a/devices/wim/hardware-configuration.nix +++ b/devices/wim/hardware-configuration.nix @@ -83,15 +83,22 @@ libvirtd.enable = true; waydroid.enable = true; }; + environment.systemPackages = with pkgs; [ + qemu + ]; # enable brightness control programs.light.enable = true; - services.udev.extraRules = '' - # give permanent path to keyboard XF86* binds - SUBSYSTEMS=="input", ATTRS{id/product}=="0006", ATTRS{id/vendor}=="0000", SYMLINK += "video-bus" + services = { + tlp.enable = true; - # give permanent path to touchpad - SUBSYSTEMS=="input", ATTRS{id/product}=="01e0", ATTRS{id/vendor}=="27c6", ATTRS{name}=="*Touchpad", SYMLINK += "touchpad" - ''; + udev.extraRules = '' + # give permanent path to keyboard XF86* binds + SUBSYSTEMS=="input", ATTRS{id/product}=="0006", ATTRS{id/vendor}=="0000", SYMLINK += "video-bus" + + # give permanent path to touchpad + SUBSYSTEMS=="input", ATTRS{id/product}=="01e0", ATTRS{id/vendor}=="27c6", ATTRS{name}=="*Touchpad", SYMLINK += "touchpad" + ''; + }; } diff --git a/devices/wim/modules/desktop.nix b/devices/wim/modules/desktop.nix deleted file mode 100644 index fabc922..0000000 --- a/devices/wim/modules/desktop.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - pkgs, - config, - ... -}: let - hyprland = - config - .home-manager - .users - .${config.vars.user} - .wayland - .windowManager - .hyprland - .finalPackage; -in { - programs.dconf.enable = true; - - services = { - xserver = { - displayManager = { - sessionPackages = [hyprland]; - }; - - libinput.enable = true; - wacom.enable = true; - }; - - greetd = { - settings = { - initial_session = { - command = "${hyprland}/bin/Hyprland"; - user = "matt"; - }; - }; - }; - - dbus.enable = true; - gvfs.enable = true; - flatpak.enable = true; - tlp.enable = true; - }; - - programs.kdeconnect.enable = true; - - xdg.portal = { - enable = true; - wlr.enable = true; - extraPortals = [ - pkgs.xdg-desktop-portal-gtk - ]; - }; - - environment.systemPackages = with pkgs; [ - qemu - alsa-utils - plasma5Packages.kio-admin - plasma5Packages.ksshaskpass - p7zip # for reshade - kio-admin - ]; -} diff --git a/flake.lock b/flake.lock index 25222e9..85176f7 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1701303668, - "narHash": "sha256-1+hOak/EubcMaLly+dxPXnbFNQcKNLJ5A1dtWOyPsDc=", + "lastModified": 1701617970, + "narHash": "sha256-sazyPlciTd7MlQ5Nz1JDVq1jruG85+BgdjMsTgnF3es=", "owner": "Aylur", "repo": "ags", - "rev": "6249a7199cee7fbab803b3be167ca61952e5884b", + "rev": "a6a1b872c3353dd23829845d03b9a8681ab8568e", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1701404398, - "narHash": "sha256-QGRfQBXQgFsgReMzHyBUo/PQCjJcURo/p5AqKs02Ss0=", + "lastModified": 1701596842, + "narHash": "sha256-QUtozR8Bp/kZ1zlTsnR7rDtFEqEfhmuR93a3tprsEhQ=", "owner": "matt1432", "repo": "nixos-caddy-patched", - "rev": "59a7539ad8c05a00d17c5b59e83270379918d096", + "rev": "7f996b07912ac4ce592de89a4a434da427b0ede9", "type": "github" }, "original": { @@ -314,11 +314,11 @@ ] }, "locked": { - "lastModified": 1701433070, - "narHash": "sha256-Gf9JStfENaUQ7YWFz3V7x/srIwr4nlnVteqaAxtwpgM=", + "lastModified": 1701609479, + "narHash": "sha256-mcEnMz7XB3K57ZX16VXoEkswljSNGXdMuUu5+g8a8R8=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a8545f5e737a6338814a4676dc8e18c7f43fc57", + "rev": "e504e8d01f950776c3a3160ba38c5957a1b89e66", "type": "github" }, "original": { @@ -358,11 +358,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1701528705, - "narHash": "sha256-SJENLaYS4hIuvQMgupKlclGZ5Mz40OvUc2Vu8vFBSow=", + "lastModified": 1701661974, + "narHash": "sha256-oq9CVdLjH70QmgA8FZTqC/rhzCJJRZKbg5Q2jA4xnVw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "80b9b21f9f24b6e8db2fc6f7705cd124f436ffba", + "rev": "68783d904d850df65887adb1bab7eff59943c1ac", "type": "github" }, "original": { @@ -402,11 +402,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1701000511, - "narHash": "sha256-ISihdFB0FlIk5d5tdyqL+61o0by0p1ugA9w5c8qQtFM=", + "lastModified": 1701605351, + "narHash": "sha256-1j6oGWQcfxVn0t/HfWPho8fLD937gPksaBO8DYGYnZQ=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "565fa4f33c785158e3effe4fee3cd9b143d5761d", + "rev": "6c4241b14b80cb7a0219b9222c34f5c782004302", "type": "github" }, "original": { @@ -426,11 +426,11 @@ ] }, "locked": { - "lastModified": 1701561877, - "narHash": "sha256-CoN1OfLWTqJuVY8vhEVtOIfh9tKmD7kVJMR12eN8oy0=", + "lastModified": 1701648247, + "narHash": "sha256-GF3OSTywzGWDy70inb8d7mOdrX2ff5EfCEHIn73QCsQ=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "21fd12540f35e372ff59d126ce0e3360cd44d7eb", + "rev": "f789d546e64ff3575aebe4707631482ecbb68e2c", "type": "github" }, "original": { @@ -449,11 +449,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1701540140, - "narHash": "sha256-STWB5LiEQzDbEtyCF4ISjD13+7cWEFErYK8mEmuQSHQ=", + "lastModified": 1701643367, + "narHash": "sha256-1R/BkHjrmqxQC0rE2kQu8b2L3G1Ap6GfdiiH6LUVeek=", "owner": "neovim", "repo": "neovim", - "rev": "481a3158866638946c91fab28ae5bca97ff1e814", + "rev": "5651c1ff27a1eb59d120637ba5cbd90f08a3f1d2", "type": "github" }, "original": { @@ -508,11 +508,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1701566078, - "narHash": "sha256-PZWUId79Z/2wJiPNwJuiHROxZ9MgTEBJ3GXXV93TbJo=", + "lastModified": 1701611132, + "narHash": "sha256-roFYOQhIrZ0DUlWbughOwHzx/PoEMrK0inJbFeuOySg=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "2bf2652ddb2bc078de3a2cdae01448bf5ae0773d", + "rev": "6a885e460cf8596aa23d6f043aa10219494f1da8", "type": "github" }, "original": { @@ -617,11 +617,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1700959576, - "narHash": "sha256-2hoFXToIiGdPzVKKUEUhNuWAvSb0lOfdCvhHhISvb7I=", + "lastModified": 1701564385, + "narHash": "sha256-um5ce7hnsQ8Do+oKf90zGKVmEqufr4Q6T8zfY9Hon38=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "d00d4561f0601ff5aaacff6d4882513e379ca873", + "rev": "152c00fc19bc45af5dd65bd41d1d020c2ba0b4ca", "type": "github" }, "original": { @@ -638,11 +638,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1701419847, - "narHash": "sha256-gfZobhRzUj6ZX0wt803V8kxyIcI8VftjPmtWVuF9EGo=", + "lastModified": 1701607690, + "narHash": "sha256-kGcVQaFVMUMQdLHGoJp6AN/MFgSXyxTzxAcaf+Xplh4=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "e0768c79657a2487bb28b7486b9f7abfc0761776", + "rev": "409c799f14e63e5b52bd6e578111c45258891eeb", "type": "github" }, "original": { @@ -749,11 +749,11 @@ }, "nur": { "locked": { - "lastModified": 1701584668, - "narHash": "sha256-F7uYa1WHgifZ6uzO65Zkoh8decAKcSxgmllBNjjLPFk=", + "lastModified": 1701668702, + "narHash": "sha256-qa+hxebQ7M/dd5qHzwlrikcBJE2bC680Pg+glmDmrH8=", "owner": "nix-community", "repo": "NUR", - "rev": "e2c94e7b39f3b9f4f82310a8c4168c886d7bd204", + "rev": "d84349cb6c1db90807bdaaaebdec151887603d7b", "type": "github" }, "original": { @@ -787,11 +787,11 @@ ] }, "locked": { - "lastModified": 1701587053, - "narHash": "sha256-Krd8ct+fLrG7crOyPJajT5o7gQEzj9ycBsPUxi3l+rk=", + "lastModified": 1701596451, + "narHash": "sha256-+iuwnWvn3NG14Xz5sOvyCn69yFVA8+KE9XzI44SATgQ=", "owner": "matt1432", "repo": "pihole-flake", - "rev": "5e96597d9eb88647f14cb8bc65aa9eb02bd3bcee", + "rev": "a566ff5b0b9ff6a1a1d342b34438389b68b1cf4e", "type": "github" }, "original": { diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix index ef537a4..17f00b0 100644 --- a/modules/greetd/default.nix +++ b/modules/greetd/default.nix @@ -7,17 +7,19 @@ # Nix stuff optionals = lib.lists.optionals; isNvidia = config.hardware.nvidia.modesetting.enable; + isTouchscreen = config.hardware.sensor.iio.enable; - # Executables' paths - regreetBin = "${lib.getExe config.programs.regreet.package}"; - hyprBin = "${config + hyprland = config .home-manager .users .${config.vars.user} .wayland .windowManager .hyprland - .finalPackage}/bin"; + .finalPackage; + # Executables' paths + hyprBin = "${hyprland}/bin"; + regreetBin = "${lib.getExe config.programs.regreet.package}"; # Show Regreet on all monitors dupeMonitors = pkgs.writeShellScriptBin "dupeMonitors" '' @@ -88,12 +90,28 @@ in { }; }; - services.greetd = { - enable = true; - settings = { - default_session = { - command = "${hyprBin}/Hyprland --config ${hyprConf}"; - user = "greeter"; + services = { + xserver = { + displayManager = { + sessionPackages = [hyprland]; + }; + + libinput.enable = true; + wacom.enable = isTouchscreen; + }; + + greetd = { + enable = true; + settings = { + default_session = { + command = "${hyprBin}/Hyprland --config ${hyprConf}"; + user = "greeter"; + }; + + initial_session = { + command = "${hyprBin}/Hyprland"; + user = config.vars.user; + }; }; }; }; diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index 717e811..c35c095 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -20,6 +20,32 @@ gset = pkgs.gsettings-desktop-schemas; polkit = pkgs.plasma5Packages.polkit-kde-agent; in { + # SYSTEM CONFIG + imports = [../greetd]; + + programs = { + kdeconnect.enable = true; + dconf.enable = true; + }; + + services = { + dbus.enable = true; + gvfs.enable = true; + }; + + xdg.portal = { + enable = true; + wlr.enable = true; + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + ]; + }; + + environment.systemPackages = with pkgs; [ + plasma5Packages.kio-admin + ]; + + # HOME-MANAGER CONFIG home-manager.users.${config.vars.user} = { imports = [ ../../home/theme.nix @@ -197,9 +223,11 @@ in { bluez-tools brightnessctl pulseaudio + alsa-utils gnome.seahorse + p7zip # for reshade - gtklock + gtklock # FIXME: find replacement swww ## libs