bump and bump fixes

This commit is contained in:
notgne2 2026-07-10 16:17:24 -07:00
parent 0ec0e30c98
commit 2648a90126
No known key found for this signature in database
4 changed files with 52 additions and 53 deletions

View file

@ -22,7 +22,12 @@ all: inputs: {
security.rtkit.enable = lib.mkDefault true; security.rtkit.enable = lib.mkDefault true;
services.earlyoom.enable = lib.mkDefault true; systemd.oomd = {
enable = true;
enableSystemSlice = true;
enableRootSlice = true;
enableUserSlices = true;
};
programs.mosh.enable = lib.mkDefault true; programs.mosh.enable = lib.mkDefault true;

View file

@ -7,29 +7,17 @@
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils";
}; };
rycee = { rycee = {
url = "gitlab:rycee/nur-expressions"; url = "gitlab:rycee/nur-expressions";
flake = false; flake = false;
}; };
plasma-manager = {
url = "github:pjones/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
# quickshell = {
# url = "github:outfoxxed/quickshell";
# inputs.nixpkgs.follows = "nixpkgs";
# };
noctalia = { noctalia = {
url = "github:noctalia-dev/noctalia-shell"; url = "github:noctalia-dev/noctalia/cachix";
inputs.nixpkgs.follows = "nixpkgs";
}; };
niri = { niri = {
url = "github:sodiboo/niri-flake"; url = "github:sodiboo/niri-flake";
inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-index-database = { nix-index-database = {
@ -39,8 +27,8 @@
}; };
nixConfig = { nixConfig = {
extra-substituters = ["https://niri.cachix.org"]; extra-substituters = ["https://niri.cachix.org" "https://noctalia.cachix.org"];
extra-trusted-public-keys = ["niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="]; extra-trusted-public-keys = ["niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4="];
}; };
outputs = { outputs = {

View file

@ -53,7 +53,7 @@ in {
settings = { settings = {
general = { general = {
lock_cmd = "noctalia-shell ipc call lockScreen lock"; lock_cmd = "noctalia msg session lock";
before_sleep_cmd = "loginctl lock-session"; before_sleep_cmd = "loginctl lock-session";
after_sleep_cmd = "hyperctl dispatch dpms on"; after_sleep_cmd = "hyperctl dispatch dpms on";
}; };
@ -92,7 +92,7 @@ in {
Install.WantedBy = [config.wayland.systemd.target]; Install.WantedBy = [config.wayland.systemd.target];
Service = { Service = {
ExecStart = "${inputs.noctalia.packages.${pkgs.system}.default}/bin/noctalia-shell"; ExecStart = "${inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/noctalia";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 5; RestartSec = 5;
}; };
@ -111,7 +111,7 @@ in {
path = lib.getExe pkgs.xwayland-satellite-unstable; path = lib.getExe pkgs.xwayland-satellite-unstable;
}; };
# spawn-at-startup = [ # spawn-at-startup = [
# {argv = ["noctalia-shell"];} # {argv = ["noctalia"];}
# ]; # ];
clipboard.disable-primary = true; clipboard.disable-primary = true;
input = { input = {
@ -129,24 +129,24 @@ in {
# "$mod SHIFT, F, fullscreen, 1" # "$mod SHIFT, F, fullscreen, 1"
# "$mod, Space, togglefloating" # "$mod, Space, togglefloating"
# "$mod SHIFT, SPACE, exec, hyprctl switchxkblayout all next" # "$mod SHIFT, SPACE, exec, hyprctl switchxkblayout all next"
"Mod+d".action.spawn = ["noctalia-shell" "ipc" "call" "launcher" "toggle"]; "Mod+d".action.spawn = ["noctalia" "msg" "panel-open" "launcher"];
"Print".action.spawn-sh = "grim - | satty -f -"; "Print".action.spawn-sh = "grim - | satty -f -";
"Mod+c".action.spawn = ["noctalia-shell" "ipc" "call" "launcher" "clipboard"]; "Mod+c".action.spawn = ["noctalia" "msg" "panel-open" "clipboard"];
"Mod+Minus".action.spawn = ["noctalia-shell" "ipc" "call" "volume" "decrease"]; "Mod+Minus".action.spawn = ["noctalia" "msg" "volume-down"];
"Mod+Equal".action.spawn = ["noctalia-shell" "ipc" "call" "volume" "increase"]; "Mod+Equal".action.spawn = ["noctalia" "msg" "volume-up"];
"XF86AudioLowerVolume".action.spawn = ["noctalia-shell" "ipc" "call" "volume" "decrease"]; "XF86AudioLowerVolume".action.spawn = ["noctalia" "msg" "volume-down"];
"XF86AudioRaiseVolume".action.spawn = ["noctalia-shell" "ipc" "call" "volume" "increase"]; "XF86AudioRaiseVolume".action.spawn = ["noctalia" "msg" "volume-up"];
"XF86AudioMute".action.spawn = ["noctalia-shell" "ipc" "call" "volume" "mute"]; "XF86AudioMute".action.spawn = ["noctalia" "msg" "volume-mute"];
"XF86AudioMicMute".action.spawn = ["noctalia-shell" "ipc" "call" "volume" "muteInput"]; "XF86AudioMicMute".action.spawn = ["noctalia" "msg" "mic-mute"];
"XF86MonBrightnessDown".action.spawn = ["noctalia-shell" "ipc" "call" "brightness" "decrease"]; "XF86MonBrightnessDown".action.spawn = ["noctalia" "msg" "brightness-down"];
"XF86MonBrightnessUp".action.spawn = ["noctalia-shell" "ipc" "call" "brightness" "increase"]; "XF86MonBrightnessUp".action.spawn = ["noctalia" "msg" "brightness-up"];
"Mod+Semicolon".action.spawn = ["noctalia-shell" "ipc" "call" "brightness" "decrease"]; "Mod+Semicolon".action.spawn = ["noctalia" "msg" "brightness-down"];
"Mod+Apostrophe".action.spawn = ["noctalia-shell" "ipc" "call" "brightness" "increase"]; "Mod+Apostrophe".action.spawn = ["noctalia" "msg" "brightness-up"];
# Previous/next but change the shuffle/random state before action (and change back afterwards) # Previous/next but change the shuffle/random state before action (and change back afterwards)
"Mod+Shift+Bracketright".action.spawn-sh = "${pkgs.playerctl}/bin/playerctl shuffle Toggle && ${pkgs.playerctl}/bin/playerctl next && ${pkgs.playerctl}/bin/playerctl shuffle Toggle"; "Mod+Shift+Bracketright".action.spawn-sh = "${pkgs.playerctl}/bin/playerctl shuffle Toggle && ${pkgs.playerctl}/bin/playerctl next && ${pkgs.playerctl}/bin/playerctl shuffle Toggle";
@ -155,23 +155,23 @@ in {
"Shift+XF86AudioPrev".action.spawn-sh = "${pkgs.playerctl}/bin/playerctl shuffle Toggle && ${pkgs.playerctl}/bin/playerctl pref && ${pkgs.playerctl}/bin/playerctl shuffle Toggle"; "Shift+XF86AudioPrev".action.spawn-sh = "${pkgs.playerctl}/bin/playerctl shuffle Toggle && ${pkgs.playerctl}/bin/playerctl pref && ${pkgs.playerctl}/bin/playerctl shuffle Toggle";
# Previous/next # Previous/next
"Mod+Bracketright".action.spawn = ["noctalia-shell" "ipc" "call" "media" "next"]; "Mod+Bracketright".action.spawn = ["noctalia" "msg" "media" "next"];
"Mod+Bracketleft".action.spawn = ["noctalia-shell" "ipc" "call" "media" "previous"]; "Mod+Bracketleft".action.spawn = ["noctalia" "msg" "media" "previous"];
"XF86AudioNext".action.spawn = ["noctalia-shell" "ipc" "call" "media" "next"]; "XF86AudioNext".action.spawn = ["noctalia" "msg" "media" "next"];
"XF86AudioPrev".action.spawn = ["noctalia-shell" "ipc" "call" "media" "previous"]; "XF86AudioPrev".action.spawn = ["noctalia" "msg" "media" "previous"];
# Seek forward/back # Seek forward/back
"Mod+Control+bracketleft".action.spawn = ["noctalia-shell" "ipc" "call" "media" "seekRelative" "-5"]; "Mod+Control+bracketleft".action.spawn = ["noctalia" "msg" "media" "seekRelative" "-5"];
"Mod+Control+bracketright".action.spawn = ["noctalia-shell" "ipc" "call" "media" "seekRelative" "5"]; "Mod+Control+bracketright".action.spawn = ["noctalia" "msg" "media" "seekRelative" "5"];
"Control+XF86AudioPrev".action.spawn = ["noctalia-shell" "ipc" "call" "media" "seekRelative" "-5"]; "Control+XF86AudioPrev".action.spawn = ["noctalia" "msg" "media" "seekRelative" "-5"];
"Control+XF86AudioNext".action.spawn = ["noctalia-shell" "ipc" "call" "media" "seekRelative" "5"]; "Control+XF86AudioNext".action.spawn = ["noctalia" "msg" "media" "seekRelative" "5"];
# Toggle play/pause # Toggle play/pause
"XF86AudioPlay".action.spawn = ["noctalia-shell" "ipc" "call" "media" "playPause"]; "XF86AudioPlay".action.spawn = ["noctalia" "msg" "media" "toggle"];
"XF86AudioPause".action.spawn = ["noctalia-shell" "ipc" "call" "media" "playPause"]; "XF86AudioPause".action.spawn = ["noctalia" "msg" "media" "toggle"];
"Mod+Backslash".action.spawn = ["noctalia-shell" "ipc" "call" "media" "playPause"]; "Mod+Backslash".action.spawn = ["noctalia" "msg" "media" "toggle"];
"Control+Alt+l".action.spawn = ["noctalia-shell" "ipc" "call" "lockScreen" "lock"]; "Control+Alt+l".action.spawn = ["noctalia" "msg" "session" "lock"];
"Mod+Shift+Slash".action = config.lib.niri.actions.show-hotkey-overlay; "Mod+Shift+Slash".action = config.lib.niri.actions.show-hotkey-overlay;
@ -260,7 +260,7 @@ in {
}; };
}; };
programs.noctalia-shell = { programs.noctalia= {
enable = true; enable = true;
settings = { settings = {
appLauncher = { appLauncher = {
@ -385,11 +385,11 @@ in {
keyutils keyutils
maim maim
slop slop
xorg.xhost xhost
sway-contrib.grimshot sway-contrib.grimshot
grim grim
inputs.noctalia.packages.${pkgs.system}.default inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default
]; ];
programs.satty = { programs.satty = {

View file

@ -78,7 +78,7 @@ in {
withPython3 = true; withPython3 = true;
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
direnv-vim direnv-vim
fugitive vim-fugitive
vim-nix vim-nix
camelcasemotion camelcasemotion
vim-indent-object vim-indent-object
@ -144,17 +144,23 @@ in {
}; };
enable = true; enable = true;
lfs.enable = true; lfs.enable = true;
userName = "notgne2";
userEmail = "gen2@gen2.space";
ignores = [".envrc"]; ignores = [".envrc"];
extraConfig.push.autoSetupRemote = true; settings = {
user = {
email = "gen2@gen2.space";
name = "notgne2";
};
push.autoSetupRemote = true;
};
}; };
} }
// (lib.optionalAttrs (options.programs ? nixcord) { // (lib.optionalAttrs (options.programs ? nixcord) {
nixcord = { nixcord = {
package = pkgs.vencord; discord = {
enable = false;
discord.enable = false; package = pkgs.vencord;
};
vesktop = { vesktop = {
enable = true; enable = true;