diff --git a/common/user-facing.nix b/common/user-facing.nix index 5c90cbf..bc608e5 100644 --- a/common/user-facing.nix +++ b/common/user-facing.nix @@ -5,11 +5,10 @@ ./exwm.nix ]; - # Enable sound with pipewire. - hardware.pulseaudio.enable = false; security.rtkit.enable = true; - services = { + services = { + # Enable sound with pipewire. pipewire = { enable = true; alsa.enable = true; @@ -21,6 +20,7 @@ # no need to redefine it in your config for now) # media-session.enable = true; }; + pulseaudio.enable = false; }; services.xserver = { @@ -28,7 +28,7 @@ enable = true; # Enable the KDE Plasma Desktop Environment. - desktopManager.plasma5.enable = true; + desktopManager.plasma6.enable = true; # Enable sddm and startx displayManager = { @@ -91,10 +91,10 @@ docker pcmanfm - libsForQt5.dolphin - libsForQt5.dolphin-plugins - libsForQt5.ffmpegthumbs - libsForQt5.kdegraphics-thumbnailers + kdePackages.dolphin + kdePackages.dolphin-plugins + kdePackages.ffmpegthumbs + kdePackages.kdegraphics-thumbnailers p7zip unzip diff --git a/flake.lock b/flake.lock index 9dc0f62..6849d36 100644 --- a/flake.lock +++ b/flake.lock @@ -63,16 +63,16 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1753592768, + "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "fc3add429f21450359369af74c2375cb34a2d204", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -117,16 +117,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750330365, - "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=", + "lastModified": 1754767907, + "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d883b6213afa179b58ba8bace834f1419707d0ad", + "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -192,16 +192,16 @@ }, "update": { "locked": { - "lastModified": 1746957726, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1754767907, + "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 4d9a232..a9ce27c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,14 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; - update.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + update.url = "github:nixos/nixpkgs/nixos-25.05"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; emacs-overlay = { @@ -62,7 +62,7 @@ ]; }; - NixGate = nixpkgs.lib.nixosSystem { + NixGate = pkgs.lib.nixosSystem { inherit system; specialArgs = { inherit inputs; }; modules = [ @@ -71,7 +71,7 @@ ]; }; - NixSentinel = nixpkgs.lib.nixosSystem { + NixSentinel = pkgs.lib.nixosSystem { inherit system; specialArgs = { inherit inputs; }; modules = [ @@ -84,7 +84,7 @@ # system = "x86_64-linux"; # modules = [ ./hosts/NixFrame/configuration.nix ]; # }; - }; + }; packages."${system}" = { mps-debug = pkgs.mps-debug; diff --git a/hosts/NixDawn/configuration.nix b/hosts/NixDawn/configuration.nix index 0499d30..04fbe5b 100644 --- a/hosts/NixDawn/configuration.nix +++ b/hosts/NixDawn/configuration.nix @@ -36,11 +36,11 @@ description = "Benson Chu"; extraGroups = [ "networkmanager" "wheel" ]; packages = with pkgs; [ - kate + kdePackages.kate + kdePackages.dolphin + kdePackages.breeze-icons steam moonlight-qt - dolphin - breeze-icons xautolock unstable.mqtt-explorer musescore @@ -147,8 +147,6 @@ supercollider-with-sc3-plugins ]; - hardware.gkraken.enable = true; - networking.firewall = { enable = true; allowedTCPPortRanges = [ diff --git a/hosts/NixFrame/configuration.nix b/hosts/NixFrame/configuration.nix index 0d02b68..cd5bfec 100644 --- a/hosts/NixFrame/configuration.nix +++ b/hosts/NixFrame/configuration.nix @@ -47,7 +47,7 @@ description = "Benson Chu"; extraGroups = [ "networkmanager" "wheel" ]; packages = with pkgs; [ - kate + kdePackages.kate steam ]; };