fixes for update

This commit is contained in:
Chris Cochrun 2025-09-26 11:37:59 -05:00
parent 0d0b385188
commit e395b816ab
4 changed files with 4 additions and 43 deletions

24
flake.lock generated
View file

@ -672,29 +672,6 @@
"type": "github" "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": { "poetry2nix": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -747,7 +724,6 @@
"nixos-unstable-small": "nixos-unstable-small", "nixos-unstable-small": "nixos-unstable-small",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-stable": "nixpkgs-stable_3",
"plasma-manager": "plasma-manager",
"quickemu": "quickemu", "quickemu": "quickemu",
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver",
"stylix": "stylix" "stylix": "stylix"

View file

@ -10,11 +10,6 @@
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
plasma-manager = {
url = "github:nix-community/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
stylix = { stylix = {
url = "github:danth/stylix"; url = "github:danth/stylix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -58,8 +53,8 @@
# }; # };
}; };
outputs = inputs@{ nixpkgs, nixpkgs-stable, home-manager, plasma-manager outputs = inputs@{ nixpkgs, nixpkgs-stable, home-manager,
, quickemu, nixos-hardware, emacs, nix-bitcoin #, eww quickemu, nixos-hardware, emacs, nix-bitcoin #, eww
, simple-nixos-mailserver, anipy-cli, darkly, niri, , simple-nixos-mailserver, anipy-cli, darkly, niri,
# ags, # ags,
stylix, ... }: stylix, ... }:
@ -130,20 +125,14 @@
modules = [ modules = [
./systems/syl/configuration.nix ./systems/syl/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
# hyprland.nixosModules.default
# stylix.nixosModules.stylix
niri.nixosModules.niri niri.nixosModules.niri
nixos-hardware.nixosModules.framework-11th-gen-intel nixos-hardware.nixosModules.framework-11th-gen-intel
# nixos-cosmic.nixosModules.default
# libre-presenter.defaultPackage
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.chris = import ./home/home.nix; home-manager.users.chris = import ./home/home.nix;
home-manager.backupFileExtension = "bck"; home-manager.backupFileExtension = "bck";
home-manager.sharedModules =
[ plasma-manager.homeManagerModules.plasma-manager ];
} }
]; ];
}; };
@ -154,10 +143,7 @@
modules = [ modules = [
./systems/kaladin/configuration.nix ./systems/kaladin/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
# hyprland.nixosModules.default
# stylix.nixosModules.stylix
niri.nixosModules.niri niri.nixosModules.niri
# nixos-cosmic.nixosModules.default
nixos-hardware.nixosModules.common-gpu-amd nixos-hardware.nixosModules.common-gpu-amd
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;

View file

@ -101,7 +101,7 @@ in
"Super+Alt+Space".action.spawn = "${pkgs.cosmic-launcher}/bin/cosmic-launcher"; "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+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+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+I".action.spawn = ["alacritty" "--class" "btm" "-e" "btm"];
"Super+Alt+B".action.spawn = ["alacritty" "--class" "bluetui" "-e" "bluetui"]; "Super+Alt+B".action.spawn = ["alacritty" "--class" "bluetui" "-e" "bluetui"];
"Super+Alt+W".action.spawn = ["alacritty" "--class" "impala" "-e" "impala"]; "Super+Alt+W".action.spawn = ["alacritty" "--class" "impala" "-e" "impala"];

View file

@ -57,7 +57,6 @@
ttyper ttyper
audacity audacity
kdePackages.kwallet-pam kdePackages.kwallet-pam
nm-tray
# nyxt # nyxt
sbcl sbcl
openjdk openjdk
@ -81,7 +80,7 @@
kdePackages.plasma-browser-integration kdePackages.plasma-browser-integration
alacritty alacritty
libnotify libnotify
rofi-wayland rofi
wf-recorder wf-recorder
waybar waybar
tridactyl-native tridactyl-native