diff --git a/flake.lock b/flake.lock index 5eb19e6..af20624 100644 --- a/flake.lock +++ b/flake.lock @@ -612,15 +612,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1738025638, - "narHash": "sha256-nU3JpvIeEmcDHzQK4OTD1KXSoL/GOff6j9kuSO4X8eM=", + "lastModified": 1738278499, + "narHash": "sha256-q1SUyXSQ9znHTME53/vPLe+Ga3V1wW3X3gWfa8JsBUM=", "owner": "danth", "repo": "stylix", - "rev": "55418e8fc8d4696af619176a22cefcfac56ad2ef", + "rev": "b00c9f46ae6c27074d24d2db390f0ac5ebcc329f", "type": "github" }, "original": { "owner": "danth", + "ref": "b00c9f46ae6c27074d24d2db390f0ac5ebcc329f", "repo": "stylix", "type": "github" } diff --git a/flake.nix b/flake.nix index 81e961a..f47a5b1 100644 --- a/flake.nix +++ b/flake.nix @@ -48,7 +48,7 @@ inputs.nixpkgs.follows = "nixpkgs-stable"; }; - stylix.url = "github:danth/stylix"; + stylix.url = "github:danth/stylix?ref=b00c9f46ae6c27074d24d2db390f0ac5ebcc329f"; }; diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix index 842e9a1..544f0e8 100644 --- a/hosts/desktops/common/packages.nix +++ b/hosts/desktops/common/packages.nix @@ -63,6 +63,7 @@ in p7zip plasma-panel-colorizer plasticity + prismlauncher protonup quickemu quickgui @@ -84,7 +85,6 @@ in packages = [ "com.github.k4zmu2a.spacecadetpinball" "com.github.tchx84.Flatseal" - "com.modrinth.ModrinthApp" "com.steamgriddb.SGDBoop" "app.zen_browser.zen" "io.github.Foldex.AdwSteamGtk" diff --git a/hosts/desktops/common/services.nix b/hosts/desktops/common/services.nix index 12a64e9..f0ff244 100644 --- a/hosts/desktops/common/services.nix +++ b/hosts/desktops/common/services.nix @@ -1,6 +1,5 @@ { inputs, - config, pkgs, ... }: @@ -9,6 +8,13 @@ services = { printing.enable = true; udev.packages = with pkgs; [ yubikey-personalization ]; + displayManager.sddm = { + enable = true; + wayland = { + enable = true; + compositor = "kwin"; + }; + }; desktopManager.plasma6.enable = true; tailscale.useRoutingFeatures = "client"; nginx = { @@ -23,30 +29,30 @@ jack.enable = true; wireplumber.enable = true; }; - greetd = { - enable = true; - settings = { - default_session.command = - let - xSessions = "${config.services.displayManager.sessionData.desktops}/share/xsessions"; - wlSessions = "${config.services.displayManager.sessionData.desktops}/share/wayland-sessions"; - in - '' - ${pkgs.greetd.tuigreet}/bin/tuigreet \ - --remember \ - --asterisks \ - --time \ - --greeting "NixOS" \ - --sessions ${xSessions}:${wlSessions} - ''; - initial_session = { - command = '' - ${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland &> /dev/null - ''; - user = "user"; - }; - }; - }; + # greetd = { + # enable = true; + # settings = { + # default_session.command = + # let + # xSessions = "${config.services.displayManager.sessionData.desktops}/share/xsessions"; + # wlSessions = "${config.services.displayManager.sessionData.desktops}/share/wayland-sessions"; + # in + # '' + # ${pkgs.greetd.tuigreet}/bin/tuigreet \ + # --remember \ + # --asterisks \ + # --time \ + # --greeting "NixOS" \ + # --sessions ${xSessions}:${wlSessions} + # ''; + # initial_session = { + # command = '' + # ${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland &> /dev/null + # ''; + # user = "user"; + # }; + # }; + # }; }; xdg.portal = { diff --git a/hosts/desktops/common/users.nix b/hosts/desktops/common/users.nix index c62d425..7ed7844 100644 --- a/hosts/desktops/common/users.nix +++ b/hosts/desktops/common/users.nix @@ -6,15 +6,24 @@ NIXOS_OZONE_WL = "1"; # Forces chromium and most electron apps to run in wayland }; - users.users.user = { - description = "William"; - extraGroups = [ - "uaccess" # Needed for HID dev - "dialout" # Needed for arduino dev - "libvirt" - "libvirtd" - "adbusers" - "i2c" - ]; + users.users = { + user = { + description = "William"; + uid = 1000; + extraGroups = [ + "uaccess" # Needed for HID dev + "dialout" # Needed for arduino dev + "libvirt" + "libvirtd" + "adbusers" + "i2c" + ]; + }; + ewans = { + description = "Ewans"; + isNormalUser = true; + uid = 1001; + hashedPassword = "$y$j9T$yHLUDvj6bDIP19dchU.aA/$OY4qeFNtx/GvI.VUYx4LapHiiVwi0MEvs8AT0HN7j58"; + }; }; } diff --git a/hosts/desktops/rotterdam.nix b/hosts/desktops/rotterdam.nix index 9294f82..97cd189 100644 --- a/hosts/desktops/rotterdam.nix +++ b/hosts/desktops/rotterdam.nix @@ -55,7 +55,13 @@ in environment.systemPackages = with pkgs; [ reboot-into-qubes ]; - # hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd ]; + hardware = { + amdgpu = { + opencl.enable = true; + amdvlk.enable = true; + }; + graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd ]; + }; systemd.targets.hibernate.enable = false; # disable non-functional hibernate diff --git a/users/desktops/common/programs.nix b/users/desktops/common/programs.nix index f1e4665..c2b15d6 100644 --- a/users/desktops/common/programs.nix +++ b/users/desktops/common/programs.nix @@ -25,4 +25,13 @@ }; }; }; + + gtk = { + gtk3.extraConfig = { + gtk-decoration-layout = "appmenu:none"; + }; + gtk4.extraConfig = { + gtk-decoration-layout = "appmenu:none"; + }; + }; }