Update nixpkgs-unstable, use built-in swayfx
This commit is contained in:
parent
bd150ad9e8
commit
214b36e2d6
7 changed files with 30 additions and 39 deletions
24
flake.lock
generated
24
flake.lock
generated
|
@ -721,11 +721,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739571712,
|
"lastModified": 1741128660,
|
||||||
"narHash": "sha256-0UdSDV/TBY+GuxXLbrLq3l2Fq02ciyKCIMy4qmnfJXQ=",
|
"narHash": "sha256-GWaZ+KGxWYbOB15CSqktwngq0ccA1l2Ov3aUfl9jeY4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292",
|
"rev": "b1b964ea9348aef08cab514fa88e9c99def6fd63",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1073,11 +1073,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739451785,
|
"lastModified": 1741037377,
|
||||||
"narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=",
|
"narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9",
|
"rev": "02032da4af073d0f6110540c8677f16d4be0117f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1137,11 +1137,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_13": {
|
"nixpkgs_13": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738410390,
|
"lastModified": 1740560979,
|
||||||
"narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
|
"narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
|
"rev": "5135c59491985879812717f4c9fea69604e7f26f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1694,11 +1694,11 @@
|
||||||
"nixpkgs": "nixpkgs_13"
|
"nixpkgs": "nixpkgs_13"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738469108,
|
"lastModified": 1740729275,
|
||||||
"narHash": "sha256-AS4akOUGZP2ELHQKj1IiXuuzU9bpK20ks4dGaCrwOEk=",
|
"narHash": "sha256-/0dJi65+7oBpfEYWrg4jihkEzAf975TVeOk+FpxaW6o=",
|
||||||
"owner": "youwen5",
|
"owner": "youwen5",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "f95fa7b1560b0f2ed8989e6f12f2c7e7e7ee9433",
|
"rev": "17bd241d6a5692848b01737f595824a707de855a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -38,10 +38,6 @@
|
||||||
# ---
|
# ---
|
||||||
# Imported apps
|
# Imported apps
|
||||||
youmubot.url = "github:natsukagami/youmubot";
|
youmubot.url = "github:natsukagami/youmubot";
|
||||||
# swayfx = {
|
|
||||||
# url = github:WillPower3309/swayfx;
|
|
||||||
# inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
# };
|
|
||||||
mpd-mpris = {
|
mpd-mpris = {
|
||||||
url = "github:natsukagami/mpd-mpris";
|
url = "github:natsukagami/mpd-mpris";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
|
@ -40,9 +40,11 @@
|
||||||
linux.graphical.defaults.webBrowser.package = pkgs.zen-browser-bin;
|
linux.graphical.defaults.webBrowser.package = pkgs.zen-browser-bin;
|
||||||
linux.graphical.defaults.webBrowser.desktopFile = "zen.desktop";
|
linux.graphical.defaults.webBrowser.desktopFile = "zen.desktop";
|
||||||
programs.my-niri.enable = true;
|
programs.my-niri.enable = true;
|
||||||
|
programs.my-niri.enableLaptop = false;
|
||||||
programs.my-sway.enable = true;
|
programs.my-sway.enable = true;
|
||||||
programs.my-sway.fontSize = 15.0;
|
programs.my-sway.fontSize = 15.0;
|
||||||
programs.my-sway.enableLaptop = true;
|
programs.my-sway.enableLaptop = false;
|
||||||
|
programs.my-waybar.fontSize = 15.0;
|
||||||
programs.my-waybar.enableMpd = true;
|
programs.my-waybar.enableMpd = true;
|
||||||
# Keyboard options
|
# Keyboard options
|
||||||
wayland.windowManager.sway.config.input."type:keyboard".xkb_layout = "jp";
|
wayland.windowManager.sway.config.input."type:keyboard".xkb_layout = "jp";
|
||||||
|
|
|
@ -70,9 +70,14 @@ in
|
||||||
systemd.user.services.swaync.Install.WantedBy = [ "niri.service" ];
|
systemd.user.services.swaync.Install.WantedBy = [ "niri.service" ];
|
||||||
systemd.user.services.swaync.Unit.After = [ "niri.service" ];
|
systemd.user.services.swaync.Unit.After = [ "niri.service" ];
|
||||||
systemd.user.targets.tray.Unit.After = [ "niri.service" ];
|
systemd.user.targets.tray.Unit.After = [ "niri.service" ];
|
||||||
|
systemd.user.targets.xwayland.Unit.After = [ "niri.service" ];
|
||||||
|
|
||||||
|
programs.my-waybar = {
|
||||||
|
enable = true;
|
||||||
|
enableLaptopBars = lib.mkDefault cfg.enableLaptop;
|
||||||
|
};
|
||||||
systemd.user.services.waybar.Unit.After = [ "niri.service" ];
|
systemd.user.services.waybar.Unit.After = [ "niri.service" ];
|
||||||
systemd.user.services.waybar.Install.WantedBy = [ "niri.service" ];
|
systemd.user.services.waybar.Install.WantedBy = [ "niri.service" ];
|
||||||
systemd.user.targets.xwayland.Unit.After = [ "niri.service" ];
|
|
||||||
|
|
||||||
# xwayland-satellite
|
# xwayland-satellite
|
||||||
systemd.user.services.niri-xwayland-satellite = lib.mkIf cfg.enable {
|
systemd.user.services.niri-xwayland-satellite = lib.mkIf cfg.enable {
|
||||||
|
|
|
@ -45,12 +45,15 @@ let
|
||||||
${pkgs.grim}/bin/grim -g (${pkgs.slurp}/bin/slurp) - | ${pkgs.swappy}/bin/swappy -f -
|
${pkgs.grim}/bin/grim -g (${pkgs.slurp}/bin/slurp) - | ${pkgs.swappy}/bin/swappy -f -
|
||||||
'';
|
'';
|
||||||
playerctl = "${pkgs.playerctl}/bin/playerctl";
|
playerctl = "${pkgs.playerctl}/bin/playerctl";
|
||||||
|
|
||||||
|
terminalCmd = lib.getExe config.linux.graphical.defaults.terminal.package;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# imports = [ ./ibus.nix ];
|
# imports = [ ./ibus.nix ];
|
||||||
|
|
||||||
options.programs.my-sway = {
|
options.programs.my-sway = {
|
||||||
enable = mkEnableOption "Enable the sway configuration";
|
enable = mkEnableOption "Enable the sway configuration";
|
||||||
|
package = mkPackageOption pkgs "swayfx" { };
|
||||||
fontSize = mkOption {
|
fontSize = mkOption {
|
||||||
type = types.float;
|
type = types.float;
|
||||||
description = "The default font size";
|
description = "The default font size";
|
||||||
|
@ -65,11 +68,6 @@ in
|
||||||
description = "Path to the wallpaper to be used";
|
description = "Path to the wallpaper to be used";
|
||||||
default = config.linux.graphical.wallpaper;
|
default = config.linux.graphical.wallpaper;
|
||||||
};
|
};
|
||||||
terminal = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
description = "The command to the terminal emulator to be used";
|
|
||||||
default = lib.getExe config.linux.graphical.defaults.terminal.package;
|
|
||||||
};
|
|
||||||
browser = mkOption {
|
browser = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
description = "The command for the browser";
|
description = "The command for the browser";
|
||||||
|
@ -102,12 +100,12 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
fontSize = mkDefault cfg.fontSize;
|
fontSize = mkDefault cfg.fontSize;
|
||||||
enableLaptopBars = mkDefault cfg.enableLaptop;
|
enableLaptopBars = mkDefault cfg.enableLaptop;
|
||||||
terminal = mkDefault cfg.terminal;
|
|
||||||
};
|
};
|
||||||
config.systemd.user.services.swaync.Install.WantedBy = mkIf cfg.enable [ "sway-session.target" ];
|
config.systemd.user.services.swaync.Install.WantedBy = mkIf cfg.enable [ "sway-session.target" ];
|
||||||
|
|
||||||
config.wayland.windowManager.sway = mkIf cfg.enable {
|
config.wayland.windowManager.sway = mkIf cfg.enable {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = cfg.package;
|
||||||
systemd.enable = true;
|
systemd.enable = true;
|
||||||
systemd.variables = options.wayland.windowManager.sway.systemd.variables.default ++ [
|
systemd.variables = options.wayland.windowManager.sway.systemd.variables.default ++ [
|
||||||
"PATH" # for portals
|
"PATH" # for portals
|
||||||
|
@ -144,7 +142,7 @@ in
|
||||||
### Programs
|
### Programs
|
||||||
#
|
#
|
||||||
# Terminal
|
# Terminal
|
||||||
terminal = cfg.terminal;
|
terminal = terminalCmd;
|
||||||
menu = "${pkgs.dmenu}/bin/dmenu_path | ${pkgs.bemenu}/bin/bemenu | ${pkgs.findutils}/bin/xargs swaymsg exec --";
|
menu = "${pkgs.dmenu}/bin/dmenu_path | ${pkgs.bemenu}/bin/bemenu | ${pkgs.findutils}/bin/xargs swaymsg exec --";
|
||||||
# Startup
|
# Startup
|
||||||
startup = [
|
startup = [
|
||||||
|
|
|
@ -12,7 +12,7 @@ in
|
||||||
terminal = lib.mkOption {
|
terminal = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
description = "The command to the terminal emulator to be used";
|
description = "The command to the terminal emulator to be used";
|
||||||
default = "${config.programs.kitty.package}/bin/kitty";
|
default = "${lib.getExe config.linux.graphical.defaults.terminal.package}";
|
||||||
};
|
};
|
||||||
|
|
||||||
enableLaptopBars = lib.mkOption {
|
enableLaptopBars = lib.mkOption {
|
||||||
|
@ -181,9 +181,10 @@ in
|
||||||
"network" = {
|
"network" = {
|
||||||
# interface = wlp2s0 # (Optional) To force the use of this interface
|
# interface = wlp2s0 # (Optional) To force the use of this interface
|
||||||
format-wifi = "{essid} ({signalStrength}%) ";
|
format-wifi = "{essid} ({signalStrength}%) ";
|
||||||
format-ethernet = "{ifname}: {ipaddr}/{cidr} ";
|
format-ethernet = "{ifname} ";
|
||||||
format-disconnected = "Disconnected ⚠";
|
format-disconnected = "Disconnected ⚠";
|
||||||
interval = 7;
|
interval = 7;
|
||||||
|
on-click = "${cfg.terminal} ${lib.getExe' pkgs.iwd "iwctl"}";
|
||||||
};
|
};
|
||||||
"bluetooth" = {
|
"bluetooth" = {
|
||||||
format = " {status}";
|
format = " {status}";
|
||||||
|
|
13
overlay.nix
13
overlay.nix
|
@ -11,7 +11,7 @@ let
|
||||||
typst-lsp = final.unstable.typst-lsp;
|
typst-lsp = final.unstable.typst-lsp;
|
||||||
};
|
};
|
||||||
overlay-imported = final: prev: {
|
overlay-imported = final: prev: {
|
||||||
sway = prev.sway.override { sway-unwrapped = final.swayfx-unwrapped; };
|
# sway = prev.sway.override { sway-unwrapped = final.swayfx-unwrapped; };
|
||||||
deploy-rs = inputs.deploy-rs.packages.default;
|
deploy-rs = inputs.deploy-rs.packages.default;
|
||||||
dtth-phanpy = inputs.dtth-phanpy.packages.${final.system}.default;
|
dtth-phanpy = inputs.dtth-phanpy.packages.${final.system}.default;
|
||||||
matrix-conduit = inputs.conduit.packages.${final.system}.default;
|
matrix-conduit = inputs.conduit.packages.${final.system}.default;
|
||||||
|
@ -58,15 +58,6 @@ let
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
swayfx-unwrapped = prev.swayfx-unwrapped.overrideAttrs (attrs: {
|
|
||||||
patches = (attrs.patches or [ ]) ++ [
|
|
||||||
(final.fetchurl {
|
|
||||||
url = "https://patch-diff.githubusercontent.com/raw/WillPower3309/swayfx/pull/315.patch";
|
|
||||||
hash = "sha256-zamOLHUjlzRs8PytPTAzEsdzgVtK+HVziHgrhwPcB+E=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
});
|
|
||||||
|
|
||||||
librewolf = (prev.librewolf.override {
|
librewolf = (prev.librewolf.override {
|
||||||
nativeMessagingHosts = with final; [ kdePackages.plasma-browser-integration ];
|
nativeMessagingHosts = with final; [ kdePackages.plasma-browser-integration ];
|
||||||
});
|
});
|
||||||
|
@ -131,8 +122,6 @@ let
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
[
|
[
|
||||||
# inputs.swayfx.inputs.scenefx.overlays.override
|
|
||||||
# inputs.swayfx.overlays.override
|
|
||||||
inputs.mpd-mpris.overlays.default
|
inputs.mpd-mpris.overlays.default
|
||||||
inputs.rust-overlay.overlays.default
|
inputs.rust-overlay.overlays.default
|
||||||
inputs.youmubot.overlays.default
|
inputs.youmubot.overlays.default
|
||||||
|
|
Loading…
Add table
Reference in a new issue