diff --git a/flake.lock b/flake.lock index e609c6f..4e11684 100644 --- a/flake.lock +++ b/flake.lock @@ -672,29 +672,6 @@ "type": "github" } }, - "plasma-manager": { - "inputs": { - "home-manager": [ - "home-manager" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1758185783, - "narHash": "sha256-6fX2CG8PzdBNwJGBISnf/nVHUVMZdCsekT1mP672Uh8=", - "owner": "nix-community", - "repo": "plasma-manager", - "rev": "6a7d78cebd9a0f84a508bec9bc47ac504c5f51f4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "plasma-manager", - "type": "github" - } - }, "poetry2nix": { "inputs": { "flake-utils": "flake-utils", @@ -747,7 +724,6 @@ "nixos-unstable-small": "nixos-unstable-small", "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_3", - "plasma-manager": "plasma-manager", "quickemu": "quickemu", "simple-nixos-mailserver": "simple-nixos-mailserver", "stylix": "stylix" diff --git a/flake.nix b/flake.nix index ebe2986..947a4c2 100644 --- a/flake.nix +++ b/flake.nix @@ -10,11 +10,6 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; - plasma-manager = { - url = "github:nix-community/plasma-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; - }; stylix = { url = "github:danth/stylix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -58,8 +53,8 @@ # }; }; - outputs = inputs@{ nixpkgs, nixpkgs-stable, home-manager, plasma-manager - , quickemu, nixos-hardware, emacs, nix-bitcoin #, eww + outputs = inputs@{ nixpkgs, nixpkgs-stable, home-manager, + quickemu, nixos-hardware, emacs, nix-bitcoin #, eww , simple-nixos-mailserver, anipy-cli, darkly, niri, # ags, stylix, ... }: @@ -130,20 +125,14 @@ modules = [ ./systems/syl/configuration.nix home-manager.nixosModules.home-manager - # hyprland.nixosModules.default - # stylix.nixosModules.stylix niri.nixosModules.niri nixos-hardware.nixosModules.framework-11th-gen-intel - # nixos-cosmic.nixosModules.default - # libre-presenter.defaultPackage { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.users.chris = import ./home/home.nix; home-manager.backupFileExtension = "bck"; - home-manager.sharedModules = - [ plasma-manager.homeManagerModules.plasma-manager ]; } ]; }; @@ -154,10 +143,7 @@ modules = [ ./systems/kaladin/configuration.nix home-manager.nixosModules.home-manager - # hyprland.nixosModules.default - # stylix.nixosModules.stylix niri.nixosModules.niri - # nixos-cosmic.nixosModules.default nixos-hardware.nixosModules.common-gpu-amd { home-manager.useGlobalPkgs = true; diff --git a/home/modules/niri.nix b/home/modules/niri.nix index b586666..148930c 100644 --- a/home/modules/niri.nix +++ b/home/modules/niri.nix @@ -101,7 +101,7 @@ in "Super+Alt+Space".action.spawn = "${pkgs.cosmic-launcher}/bin/cosmic-launcher"; "Super+Space".action.spawn = ["${pkgs.fish}/bin/fish" "-c" "rofi -no-lazy-grab -modi combi -show combi -combi-modi drun,run"]; "Super+Shift+W".action.spawn = "rofi -i -show window"; - "Super+V".action = spawn ["${pkgs.fish}/bin/fish" "-c" "${pkgs.cliphist}/bin/cliphist list | ${pkgs.rofi-wayland}/bin/rofi -p '󱃔 ' -dmenu | ${pkgs.cliphist}/bin/cliphist decode | ${pkgs.wl-clipboard}/bin/wl-copy"]; + "Super+V".action = spawn ["${pkgs.fish}/bin/fish" "-c" "${pkgs.cliphist}/bin/cliphist list | ${pkgs.rofi}/bin/rofi -p '󱃔 ' -dmenu | ${pkgs.cliphist}/bin/cliphist decode | ${pkgs.wl-clipboard}/bin/wl-copy"]; "Super+I".action.spawn = ["alacritty" "--class" "btm" "-e" "btm"]; "Super+Alt+B".action.spawn = ["alacritty" "--class" "bluetui" "-e" "bluetui"]; "Super+Alt+W".action.spawn = ["alacritty" "--class" "impala" "-e" "impala"]; diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 47a4c81..f834a5d 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -57,7 +57,6 @@ ttyper audacity kdePackages.kwallet-pam - nm-tray # nyxt sbcl openjdk @@ -81,7 +80,7 @@ kdePackages.plasma-browser-integration alacritty libnotify - rofi-wayland + rofi wf-recorder waybar tridactyl-native