diff --git a/common/profiles/nix/nixpkgs.nix b/common/profiles/nix/nixpkgs.nix index 1f7aca9a..7e126dd5 100644 --- a/common/profiles/nix/nixpkgs.nix +++ b/common/profiles/nix/nixpkgs.nix @@ -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" ; diff --git a/hm/profiles/gnome/apps/gnome-calculator/default.nix b/hm/profiles/gnome/apps/gnome-calculator/default.nix index 11fef52f..8f728478 100644 --- a/hm/profiles/gnome/apps/gnome-calculator/default.nix +++ b/hm/profiles/gnome/apps/gnome-calculator/default.nix @@ -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; diff --git a/hm/profiles/gnome/apps/multimedia.nix b/hm/profiles/gnome/apps/multimedia.nix index 3b45151b..a93cf067 100644 --- a/hm/profiles/gnome/apps/multimedia.nix +++ b/hm/profiles/gnome/apps/multimedia.nix @@ -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) diff --git a/hm/profiles/gnome/default.nix b/hm/profiles/gnome/default.nix index c84e6f9c..6fdbd93a 100644 --- a/hm/profiles/gnome/default.nix +++ b/hm/profiles/gnome/default.nix @@ -1,13 +1,4 @@ -{ self -, modulesPath -, system -, inputs -, outputs -, config -, lib -, pkgs -, ... -}: +{ config, lib, pkgs, ... }: let cfg = config.services.xserver; gnomeProfile = "default"; @@ -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 diff --git a/hm/profiles/languages/rust.nix b/hm/profiles/languages/rust.nix index d1ec404a..3e747ffe 100644 --- a/hm/profiles/languages/rust.nix +++ b/hm/profiles/languages/rust.nix @@ -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 diff --git a/hm/profiles/shell/common/fzf.nix b/hm/profiles/shell/common/fzf.nix index ba0f727f..e92a8153 100644 --- a/hm/profiles/shell/common/fzf.nix +++ b/hm/profiles/shell/common/fzf.nix @@ -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 diff --git a/nixos/profiles/desktop/de/gnome/extensions/appearance.nix b/nixos/profiles/desktop/de/gnome/extensions/appearance.nix index de09766a..1a65de08 100644 --- a/nixos/profiles/desktop/de/gnome/extensions/appearance.nix +++ b/nixos/profiles/desktop/de/gnome/extensions/appearance.nix @@ -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 @@ -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 ]; } diff --git a/nixos/profiles/desktop/gtk.nix b/nixos/profiles/desktop/gtk.nix index dd2ac115..1fc082f4 100644 --- a/nixos/profiles/desktop/gtk.nix +++ b/nixos/profiles/desktop/gtk.nix @@ -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 ]; diff --git a/shells/rust.nix b/shells/rust.nix index 03103a58..d5b8b3e3 100644 --- a/shells/rust.nix +++ b/shells/rust.nix @@ -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 diff --git a/shells/sql.nix b/shells/sql.nix index 03103a58..d5b8b3e3 100644 --- a/shells/sql.nix +++ b/shells/sql.nix @@ -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