flake updates

This commit is contained in:
Matt Nish-Lapidus 2025-03-06 15:10:47 -05:00
parent b994d25b52
commit 760a0f0ac8
7 changed files with 41 additions and 39 deletions

30
flake.lock generated
View file

@ -64,7 +64,9 @@
}, },
"emacs-overlay": { "emacs-overlay": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2", "nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
@ -237,7 +239,7 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"gitignore": "gitignore_2", "gitignore": "gitignore_2",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
@ -759,7 +761,7 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1725758175, "lastModified": 1725758175,
@ -953,22 +955,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1741010256,
"narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1725103162, "lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
@ -984,7 +970,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1719082008, "lastModified": 1719082008,
"narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=",
@ -1000,7 +986,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1741010256, "lastModified": 1741010256,
"narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
@ -1101,7 +1087,7 @@
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nix-rice": "nix-rice", "nix-rice": "nix-rice",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable_4", "nixpkgs-stable": "nixpkgs-stable_4",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"wezterm": "wezterm", "wezterm": "wezterm",

View file

@ -12,7 +12,9 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-flatpak.url = "github:gmodena/nix-flatpak"; # unstable branch nix-flatpak = {
url = "github:gmodena/nix-flatpak"; # unstable branch
};
emacs-lsp-booster = { emacs-lsp-booster = {
url = "github:slotThe/emacs-lsp-booster-flake"; url = "github:slotThe/emacs-lsp-booster-flake";
@ -24,7 +26,10 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
emacs-overlay.url = "github:nix-community/emacs-overlay"; emacs-overlay = {
url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-rice = { nix-rice = {
url = "github:bertof/nix-rice"; url = "github:bertof/nix-rice";

View file

@ -53,4 +53,15 @@ config.enable_tab_bar = false;
config.enable_kitty_keyboard = true config.enable_kitty_keyboard = true
config.skip_close_confirmation_for_processes_named = {
'bash',
'sh',
'zsh',
'fish',
'bluetuith',
'yazi',
'btop++',
'clipse'
}
return config return config

View file

@ -31,8 +31,7 @@
inputs.emacs-lsp-booster.overlays.default inputs.emacs-lsp-booster.overlays.default
(final: prev: { (final: prev: {
wineWowPackages.stagingFull = wineWowPackages.stagingFull = nix-config.pkgs-stable.wineWowPackages.stagingFull.overrideAttrs
nix-config.pkgs-stable.wineWowPackages.stagingFull.overrideAttrs
(old: { (old: {
patches = old.patches ++ [ ../../patches/wine-6006.patch ]; patches = old.patches ++ [ ../../patches/wine-6006.patch ];
waylandSupport = true; waylandSupport = true;

View file

@ -50,7 +50,7 @@
sane-airscan sane-airscan
xsane xsane
nix-config.pkgs-stable.bitwarden-cli bitwarden-cli
bitwarden-desktop bitwarden-desktop
tailscale tailscale
trayscale trayscale
@ -89,7 +89,7 @@
switcheroo switcheroo
nix-config.pkgs-stable.blender blender
davinci-resolve-studio davinci-resolve-studio
steam steam
processing processing
@ -174,7 +174,7 @@
}; };
iconTheme = { iconTheme = {
name = "Colloid"; name = "Colloid";
package = nix-config.pkgs-stable.colloid-icon-theme; package = pkgs.colloid-icon-theme;
}; };
}; };
@ -230,6 +230,10 @@
name = "Steam (nvidia-offload)"; name = "Steam (nvidia-offload)";
exec = "nvidia-offload ${pkgs.steam}/bin/steam"; exec = "nvidia-offload ${pkgs.steam}/bin/steam";
}; };
bluetuith = {
name = "Bluetuith (bluetooth manager)";
exec = "/home/emenel/.local/bin/wezapp bluetuith";
};
}; };
xdg.configFile."halloy/config.toml".source = ../../homes/emenel/dotfiles/dot_config/halloy/config.toml; xdg.configFile."halloy/config.toml".source = ../../homes/emenel/dotfiles/dot_config/halloy/config.toml;

View file

@ -34,6 +34,7 @@
gettext gettext
gnumake gnumake
nix-du nix-du
nix-melt
usbutils usbutils
pciutils pciutils
util-linux util-linux

View file

@ -1,4 +0,0 @@
self: super: {
}