diff --git a/flake.lock b/flake.lock index 3ba6cfd..781fc09 100644 --- a/flake.lock +++ b/flake.lock @@ -188,11 +188,11 @@ ] }, "locked": { - "lastModified": 1778009629, - "narHash": "sha256-nUoQtf4Zq7DRYJrfv904hjrxjAlWVP6a1pNNFKx3FCg=", + "lastModified": 1778144356, + "narHash": "sha256-dGM+QCstz/DyLB68+JK5GWyMx4QSqmOJEVgZmy63d/g=", "owner": "nix-community", "repo": "home-manager", - "rev": "00ed86e58bb6979a7921859fd1615d19382eac5c", + "rev": "e4419d3123b780d5f4c0bceeace450424387638c", "type": "github" }, "original": { @@ -301,11 +301,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1777995176, - "narHash": "sha256-iq9W7sFoKFNFt0UAxRnnLVkbvNT+nJWsZQFNcWh/fCU=", + "lastModified": 1778199997, + "narHash": "sha256-vmCYnK7/iRQGWj+s0l3+cf/IVoUcCTrlFtgUCTwRdjU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a531c2ed6bb4cd4eb2c6cb51838cb07a37226377", + "rev": "de9f8dc9831d921cd1ee30d5d14f45f0e345a8ca", "type": "github" }, "original": { @@ -561,11 +561,11 @@ ] }, "locked": { - "lastModified": 1777492286, - "narHash": "sha256-PwuoEJQcjSKJNP5T55qhfDwIP0tw5zxEhfu8GDfKfeg=", + "lastModified": 1778179779, + "narHash": "sha256-Ri6rVf54CRD3aISHLhSY6H4tBScVjm9ebkv7rF2lcZM=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "ec5c0c709706bad5b82f667fd8758eae442577ce", + "rev": "3e170e5ad010602671f5f25b327e8bdb8fdd532c", "type": "github" }, "original": { @@ -656,11 +656,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1778058822, - "narHash": "sha256-iWK6mx+b9UeIrLCRC3tQMluI9TU093Q/q78/8LW7IHk=", + "lastModified": 1778202527, + "narHash": "sha256-Yn0A4iYFtVNYIf1IXfT1R7gYNbJ5UEqvExii2aK4VAY=", "owner": "kaylorben", "repo": "nixcord", - "rev": "a88a9e39026c8456c9cbb130a794a37c358ef07d", + "rev": "471c6da493cb642bbc941a4bc5c10c22595ed013", "type": "github" }, "original": { diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix index 7cb3c8c..efa1760 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/desktop/hyprland/default.nix @@ -66,6 +66,11 @@ in "XCURSOR_SIZE,24" ]; + debug = { + disable_logs = false; + enable_stdout_logs = false; + }; + monitor = [ "DP-1, 1920x1080@60, 1920x0, 1" "HDMI-A-2, 1920x1080@60, 0x0, 1" @@ -73,8 +78,8 @@ in input = { kb_layout = "de"; - kb_variant = "mac"; - kb_options = "apple:fn_lock"; + kb_variant = ""; + kb_options = ""; repeat_rate = 50; repeat_delay = 300; @@ -113,7 +118,6 @@ in enabled = false; range = 16; render_power = 4; - ignore_window = true; color = "$green"; color_inactive = "$red"; }; @@ -146,7 +150,6 @@ in # ]; dwindle = { - pseudotile = "yes"; preserve_split = "yes"; }; @@ -169,10 +172,10 @@ in vrr = 0; }; - device = { - name = "usb-optical-mouse-"; - sensitivity = 0; - }; + #device = { + # name = "usb-optical-mouse-"; + # sensitivity = 0; + #}; #deprecated # windowrulev2 = [ # "suppressevent maximize, class:.*" diff --git a/hosts/cyper-controller/configuration.nix b/hosts/cyper-controller/configuration.nix index 975d6ea..228ecc5 100644 --- a/hosts/cyper-controller/configuration.nix +++ b/hosts/cyper-controller/configuration.nix @@ -42,6 +42,5 @@ }; efi.canTouchEfiVariables = true; }; - system.stateVersion = "26.05"; } diff --git a/hosts/cyper-desktop/configuration.nix b/hosts/cyper-desktop/configuration.nix index 0bfe984..9f68e4a 100644 --- a/hosts/cyper-desktop/configuration.nix +++ b/hosts/cyper-desktop/configuration.nix @@ -1,3 +1,4 @@ +{ ... }: { imports = [ ./hardware-configuration.nix ]; @@ -32,5 +33,16 @@ efi.canTouchEfiVariables = true; }; + services.desktopManager.plasma6.enable = false; + services.displayManager.sddm = { + enable = false; + wayland.enable = true; + }; + + environment.pathsToLink = [ + "/share/applications" + "/share/xdg-desktop-portal" + ]; + system.stateVersion = "26.05"; } diff --git a/nixos/default.nix b/nixos/default.nix index d3fa149..a3d6c6f 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -18,7 +18,7 @@ ./regreet.nix ./plymouth.nix ./audio.nix - ./webcam.nix + # ./webcam.nix ./virt.nix ./catppuccin.nix ]; @@ -95,7 +95,7 @@ // lib.optionalAttrs (!isServer) { dconf.enable = true; hyprland = { - enable = true; + enable = false; package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; }; steam.enable = true; @@ -159,6 +159,7 @@ "video" "audio" "libvirtd" + "input" ]; }; } diff --git a/nixos/regreet.nix b/nixos/regreet.nix index d24a3a3..4fe0a85 100644 --- a/nixos/regreet.nix +++ b/nixos/regreet.nix @@ -1,5 +1,6 @@ { lib, + pkgs, ... }: { @@ -13,7 +14,7 @@ }; programs.regreet = { - enable = true; + enable = false; cageArgs = [ "-s" @@ -63,4 +64,18 @@ }; }; }; + + services.greetd = { + enable = true; + settings = { + default_session = { + command = "${pkgs.tuigreet}/bin/tuigreet --cmd start-hyprland"; + user = "greeter"; + }; + initial_session = { + command = "Hyprland"; + user = "phil"; + }; + }; + }; }