Skip to content

Commit

Permalink
fix: cleanup old/broken packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Lehmanator committed Jul 12, 2024
1 parent d909884 commit 06bd03f
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 78 deletions.
1 change: 1 addition & 0 deletions common/profiles/nix/nixpkgs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
electron_24 = pkgs.electron_26; # Electron v24 is end-of-life, forcing upgrade
electron_25 = pkgs.electron_26; # Electron v25 is end-of-life, forcing upgrade
};
permittedInsecurePackages = ["python3.12-youtube-dl-2021.12.17"];
};

#environment.sessionVariables.NIXPKGS_ALLOW_UNFREE = lib.mkIf config.nixpkgs.config.allowUnfree "1" ;
Expand Down
13 changes: 2 additions & 11 deletions hm/profiles/gnome/apps/gnome-calculator/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
{ self, inputs,
config, lib, pkgs,
...
}:
{
# --- App ---
home.packages = [
pkgs.gnome.gnome-calculator
];

# --- Settings ---
{ config, lib, pkgs, ... }: {
home.packages = [ pkgs.gnome-calculator ];
dconf.settings."org/gnome/calculator" = {
#button-mode = "programming";
show-thousands = true;
Expand Down
1 change: 0 additions & 1 deletion hm/profiles/gnome/apps/multimedia.nix
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
# --- Photos -------------------------------------------
# --- Capture ---
#pkgs.cobang # # QR code scanner (build failing as of 1/15/23: dep=python3.11-kiss-headers-2.4.3)
pkgs.gnome.cheese # # GNOME camera app (old)
pkgs.gnome-decoder # # GNOME QR code scanner & creator
pkgs.megapixels # # GNOME camera app (mobile)
pkgs.snapshot # # GNOME camera app (new)
Expand Down
45 changes: 7 additions & 38 deletions hm/profiles/gnome/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
{ self
, modulesPath
, system
, inputs
, outputs
, config
, lib
, pkgs
, ...
}:
{ config, lib, pkgs, ... }:
let
cfg = config.services.xserver;
gnomeProfile = "default";
Expand Down Expand Up @@ -69,46 +60,24 @@ in
../desktop
../desktop/gtk.nix
../desktop/wayland.nix
#../desktop/touchpad.nix


#./admin.nix
#./dev.nix

#./edit-audio.nix
#./edit-images.nix
#./edit-video.nix

#./emu-android.nix
#./emu-windows.nix

#./chat.nix
#./games.nix

./keyring.nix
./mobile.nix
./styles.nix

#./view-audio.nix
#./view-images.nix
#./view-video.nix

#../apps # Desktop Environment agnostic apps
./apps # GNOME-specific apps
./extensions # GNOME Shell Extensions
];

home.packages = with pkgs; [
gnome.gnome-boxes
gnome.simple-scan
gnome.totem
gnome.vinagre

gnome.gnome-autoar
gnome.gnome-boxes
gnome.gnome-dictionary
gnome.gnome-font-viewer # Includes thumbnailer
gnome.gnome-packagekit
gnome.gnome-tweaks
gnome-autoar
gnome-dictionary
gnome-font-viewer # Includes thumbnailer
gnome-packagekit
gnome-tweaks

gnome-connections
#gnome-decoder
Expand Down
2 changes: 0 additions & 2 deletions hm/profiles/languages/rust.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,9 @@
pkgs.cargo-clone # Cargo subcommand to fetch source code of a Rust crate
pkgs.cargo-deadlinks # Cargo subcommand to check rust documentation for broken links
pkgs.cargo-deb # A cargo subcommand that generates Debian packages from information in Cargo.toml
pkgs.cargo-deps # Cargo subcommand for building dependency graphs of Rust projects
pkgs.cargo-docset # Cargo subcommand to generate a Dash/Zeal docset for your Rust packages
pkgs.cargo-duplicates # A cargo subcommand for displaying when different versions of a same dependency are pulled in
pkgs.cargo-feature # Cargo plugin to manage dependency features
pkgs.cargo-graph # A cargo subcommand for creating GraphViz DOT files and dependency graphs
pkgs.cargo-hack # Cargo subcommand to provide various options useful for testing and continuous integration
pkgs.cargo-i18n # Rust Cargo sub-command and libraries to extract and build localization resources to embed in your application/library
pkgs.cargo-info # Cargo subcommand to show crates info from crates.io
Expand Down
1 change: 0 additions & 1 deletion hm/profiles/shell/common/fzf.nix
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
home = {
packages = [
pkgs.sysz # systemd fzf UI # TODO: Conditionally load for Linux systems
pkgs.ytfzf # FZF UI to search & watch YouTube videos
#pkgs.fzf-obc # Completion script adding FZF over all known bash completion functions
];
# TODO: Move to sysz
Expand Down
11 changes: 1 addition & 10 deletions nixos/profiles/desktop/de/gnome/extensions/appearance.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{ config
, lib
, pkgs
, ...
}:
{
imports = [
];

{ config, lib, pkgs, ... }: {
environment.systemPackages = with pkgs.gnomeExtensions; [
blur-my-shell # # Blur GNOME UI elements
burn-my-windows # # Change window open/close animations
Expand All @@ -17,6 +9,5 @@
material-you-color-theming # # Material You palette from wallpaper applied to adwaita (breaks light/dark theme)
rounded-window-corners # # Round window corners (fix non-adwaita app inconsistency) (11/23: GNOME45 incompat)
snowy # # Snow effect on your desktop
transparent-shell # # Transparent top bar, dash, workspace view
];
}
16 changes: 5 additions & 11 deletions nixos/profiles/desktop/gtk.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
{ inputs
, config
, lib
, pkgs
, user
, ...
}:
# Default settings for GTK-based desktops
{
{ config, lib, pkgs, user, ... }: {
# Default settings for GTK-based desktops

environment.systemPackages = [
#pkgs.livecaptions # Build failing as of 1/15/24: failing dep=python3.11-onnx-1.15.0
pkgs.plotinus
pkgs.gcr
pkgs.gcr_4
pkgs.adw-gtk3
pkgs.gnome.adwaita-icon-theme
pkgs.gnome.gnome-themes-extra
pkgs.adwaita-icon-theme
pkgs.gnome-themes-extra
pkgs.simp1e-cursors
#pkgs.nur.repos.federicoschonborn.morewaita
];
Expand Down
2 changes: 0 additions & 2 deletions shells/rust.nix
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,9 @@
pkgs.cargo-clone # Cargo subcommand to fetch source code of a Rust crate
pkgs.cargo-deadlinks # Cargo subcommand to check rust documentation for broken links
pkgs.cargo-deb # A cargo subcommand that generates Debian packages from information in Cargo.toml
pkgs.cargo-deps # Cargo subcommand for building dependency graphs of Rust projects
pkgs.cargo-docset # Cargo subcommand to generate a Dash/Zeal docset for your Rust packages
pkgs.cargo-duplicates # A cargo subcommand for displaying when different versions of a same dependency are pulled in
pkgs.cargo-feature # Cargo plugin to manage dependency features
pkgs.cargo-graph # A cargo subcommand for creating GraphViz DOT files and dependency graphs
pkgs.cargo-hack # Cargo subcommand to provide various options useful for testing and continuous integration
pkgs.cargo-hf2 # Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders
pkgs.cargo-i18n # Rust Cargo sub-command and libraries to extract and build localization resources to embed in your application/library
Expand Down
2 changes: 0 additions & 2 deletions shells/sql.nix
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,9 @@
pkgs.cargo-clone # Cargo subcommand to fetch source code of a Rust crate
pkgs.cargo-deadlinks # Cargo subcommand to check rust documentation for broken links
pkgs.cargo-deb # A cargo subcommand that generates Debian packages from information in Cargo.toml
pkgs.cargo-deps # Cargo subcommand for building dependency graphs of Rust projects
pkgs.cargo-docset # Cargo subcommand to generate a Dash/Zeal docset for your Rust packages
pkgs.cargo-duplicates # A cargo subcommand for displaying when different versions of a same dependency are pulled in
pkgs.cargo-feature # Cargo plugin to manage dependency features
pkgs.cargo-graph # A cargo subcommand for creating GraphViz DOT files and dependency graphs
pkgs.cargo-hack # Cargo subcommand to provide various options useful for testing and continuous integration
pkgs.cargo-hf2 # Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders
pkgs.cargo-i18n # Rust Cargo sub-command and libraries to extract and build localization resources to embed in your application/library
Expand Down

0 comments on commit 06bd03f

Please sign in to comment.