diff --git a/Shell b/Shell new file mode 160000 index 0000000..568c26d --- /dev/null +++ b/Shell @@ -0,0 +1 @@ +Subproject commit 568c26db076532e7e68d402c644fd07304346b7e diff --git a/flake.lock b/flake.lock index 7bd2a95..f778d9b 100644 --- a/flake.lock +++ b/flake.lock @@ -1711,6 +1711,26 @@ "type": "github" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774422996, + "narHash": "sha256-mWjBJIbiMPCpljAQDk8RYf+92/lYZ5npHe2r2SJ+QWc=", + "owner": "outfoxxed", + "repo": "quickshell", + "rev": "08058326f04e9b5e55c903b3702405a8d3556ac6", + "type": "github" + }, + "original": { + "owner": "outfoxxed", + "repo": "quickshell", + "type": "github" + } + }, "root": { "inputs": { "catppuccin": "catppuccin", @@ -1726,6 +1746,7 @@ "nixpkgs": "nixpkgs_8", "nvf": "nvf", "openclaw": "openclaw", + "quickshell": "quickshell", "spacebar": "spacebar", "tangled": "tangled", "vscode-server": "vscode-server", diff --git a/flake.nix b/flake.nix index bacd54b..031ab4b 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,10 @@ hyprsysteminfo.url = "github:hyprwm/hyprsysteminfo"; ghostty.url = "github:ghostty-org/ghostty"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; + quickshell = { + url = "github:outfoxxed/quickshell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Package tooling disko.url = "github:nix-community/disko"; diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 045a357..f8c3291 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -4,8 +4,7 @@ let userName = "kris"; realName = "Kris"; configRoot = "/etc/nixos"; - homeDir = "/home/${userName}"; - quickshellRoot = "${homeDir}/Projects/DeltaruneQuickshell"; + quickshellRoot = "${configRoot}/Shell"; in { imports = [ diff --git a/hosts/default/packages.nix b/hosts/default/packages.nix index 5864909..1eb34cd 100644 --- a/hosts/default/packages.nix +++ b/hosts/default/packages.nix @@ -47,7 +47,9 @@ inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland }/bin/hyprctl dispatch exec "shimejictl stop"'') - quickshell + inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default + tailscale + bitwarden-desktop kdePackages.qtdeclarative catppuccin-gtk catppuccin