diff --git a/flake.lock b/flake.lock index 9bae294..0be8cfe 100644 --- a/flake.lock +++ b/flake.lock @@ -51,6 +51,24 @@ "type": "github" } }, + "dolphin-overlay": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1743892246, + "narHash": "sha256-AHeavUWjnDPT/hffE5hM8RIew+mZJSSr9tUEiSvZW30=", + "owner": "rumboon", + "repo": "dolphin-overlay", + "rev": "55fec3268972876890d6081d3d76a701c37c01d7", + "type": "github" + }, + "original": { + "owner": "rumboon", + "repo": "dolphin-overlay", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -202,7 +220,7 @@ "honkai-railway-grub-theme": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1775016235, @@ -288,7 +306,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_2", "xdph": "xdph" @@ -570,7 +588,7 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -646,7 +664,7 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { @@ -743,6 +761,21 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1743890059, + "narHash": "sha256-QQLhHHGNtAW8qRpseb40zqZlhZUeRRUg2SGmXjfE+so=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "58a813438464b5295170efe38d8bd5f40fcc1d23", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1774709303, "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", @@ -758,22 +791,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_4": { "locked": { "lastModified": 1775423009, @@ -791,6 +808,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1773222311, "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=", @@ -806,7 +839,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1775305101, "narHash": "sha256-/74n1oQPtKG52Yw41cbToxspxHbYz6O3vi+XEw16Qe8=", @@ -895,6 +928,7 @@ "root": { "inputs": { "catppuccin": "catppuccin", + "dolphin-overlay": "dolphin-overlay", "home-manager": "home-manager", "honkai-railway-grub-theme": "honkai-railway-grub-theme", "hyprland": "hyprland", @@ -902,7 +936,7 @@ "nix-index-database": "nix-index-database", "nixcord": "nixcord", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixvim": "nixvim", "unstablepkgs": "unstablepkgs" } diff --git a/flake.nix b/flake.nix index c0b05da..1bf8e4f 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,7 @@ niri.url = "github:sodiboo/niri-flake"; hyprland.url = "github:hyprwm/Hyprland"; nixcord.url = "github:FlameFlag/nixcord"; + dolphin-overlay.url = "github:rumboon/dolphin-overlay"; honkai-railway-grub-theme.url = "github:voidlhf/StarRailGrubThemes/4a84e576bb544afbdfc76dbe40ffc50a5c2b16de"; diff --git a/home/asakiyuki/modules/programs.nix b/home/asakiyuki/modules/programs.nix index d33d5f3..286c652 100644 --- a/home/asakiyuki/modules/programs.nix +++ b/home/asakiyuki/modules/programs.nix @@ -3,8 +3,8 @@ (../../../modules/features/home/ghostty.nix) (../../../modules/features/home/kitty.nix) (../../../modules/features/home/browsers.nix) + (../../../modules/features/home/neovide.nix) - (../../../modules/features/home/dolphin.nix) (../../../modules/features/home/bash.nix) (../../../modules/features/home/starship.nix) (../../../modules/features/home/tmux.nix) diff --git a/host/desktop/default.nix b/host/desktop/default.nix index fe2136b..47c867a 100644 --- a/host/desktop/default.nix +++ b/host/desktop/default.nix @@ -27,5 +27,6 @@ ]; xdg.menus.enable = true; + services.dbus.enable = true; } diff --git a/modules/features/home/dolphin.nix b/modules/features/home/dolphin.nix deleted file mode 100644 index 59baf27..0000000 --- a/modules/features/home/dolphin.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ ... }: { - programs.dolphin.enable = true; -} \ No newline at end of file diff --git a/modules/features/home/neovide.nix b/modules/features/home/neovide.nix new file mode 100644 index 0000000..f4c1b6d --- /dev/null +++ b/modules/features/home/neovide.nix @@ -0,0 +1,6 @@ +{ ... }: { + programs.neovide = { + enable = true; + settings = {}; + }; +} \ No newline at end of file diff --git a/modules/features/system/packages.nix b/modules/features/system/packages.nix index 91b65cd..3512ca4 100644 --- a/modules/features/system/packages.nix +++ b/modules/features/system/packages.nix @@ -48,6 +48,8 @@ in with pkgs; with kdePackages; [ + kservice + dolphin kate qt5compat qtdeclarative diff --git a/overlays/nixpkgs.nix b/overlays/nixpkgs.nix index c3e264f..837a83e 100644 --- a/overlays/nixpkgs.nix +++ b/overlays/nixpkgs.nix @@ -1,3 +1,6 @@ { inputs, ... }: { - nixpkgs.overlays = [ inputs.niri.overlays.niri ]; + nixpkgs.overlays = [ + inputs.niri.overlays.niri + inputs.dolphin-overlay.overlays.default + ]; } \ No newline at end of file