Merge pull request #27 from tsandrini/various_updates

Firefox & various package updates
tsandrini · Mar 5, 2024 · f3ed259 · f3ed259
2 parents 220ba6d + fdfe92b
commit f3ed259
Show file tree

Hide file tree

Showing 16 changed files with 124 additions and 128 deletions.
diff --git a/.envrc b/.envrc
@@ -3,7 +3,7 @@ if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
 fi
 
 watch_file parts/shells/dev.nix
-if ! use flake .#dev --impure
+if ! use flake .#dev --impure --accept-flake-config
 then
   echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2
 fi
diff --git a/.github/workflows/check-on-merge.yml b/.github/workflows/check-on-merge.yml
@@ -8,6 +8,7 @@ on:
 
 jobs:
   check:
+    if: false # TODO insufficient CI disk space to run the job unfortunately
     runs-on: "ubuntu-latest"
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/flakehub.yml b/.github/workflows/flakehub.yml
@@ -1,10 +1,12 @@
 name: "FlakeHub"
+
 on:
   push:
     branches:
-      - "null"
+      - "main"
 jobs:
   flakehub-publish:
+    if: false # TODO flakehub push fails due to impurities, resolve this
     runs-on: "ubuntu-latest"
     permissions:
       id-token: "write"

diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -4,7 +4,7 @@ name: Deploy static content to Pages
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: ["null"] # disable for now
+    branches: ["main"] # disable for now
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -23,14 +23,12 @@ concurrency:
 
 jobs:
   build-and-deploy:
+    if: false # TODO docs derivation currently not maintained
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Complete nix setup
-        uses: DeterminateSystems/nix-installer-action@main
+      - uses: actions/checkout@v4
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Build docs using Nix
         run: nix build .#docs

diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 [![flake check](https://github.com/tsandrini/tensorfiles/actions/workflows/check-on-merge.yml/badge.svg)](https://github.com/tsandrini/tensorfiles/actions/workflows/check-on-merge.yml)
 [![FlakeHub](https://github.com/tsandrini/tensorfiles/actions/workflows/flakehub.yml/badge.svg)](https://github.com/tsandrini/tensorfiles/actions/workflows/flakehub.yml)
+[![update-flake-lock](https://github.com/tsandrini/tensorfiles/actions/workflows/update-flake-lock.yml/badge.svg)](https://github.com/tsandrini/tensorfiles/actions/workflows/update-flake-lock.yml)
+[![Deploy static content to Pages](https://github.com/tsandrini/tensorfiles/actions/workflows/pages.yml/badge.svg)](https://github.com/tsandrini/tensorfiles/actions/workflows/pages.yml)
 
 ## Table of Contents
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -35,11 +35,6 @@
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    nh = {
-      url = "github:viperML/nh";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -67,18 +62,6 @@
       url = "github:nix-community/nixpkgs-wayland";
       # nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs";
     };
-    # hyprland = {
-    #   url = "github:hyprwm/Hyprland";
-    #   #inputs.nixpkgs.follows = "nixpkgs";
-    # };
-    # anyrun = {
-    #   url = "github:Kirottu/anyrun";
-    #   #inputs.nixpkgs.follows = "nixpkgs";
-    # };
-    # ags = {
-    #   url = "github:Aylur/ags";
-    #   #inputs.nixpkgs.follows = "nixpkgs";
-    # };
 
     kitty-scrollback-nvim = {
       url = "github:mikesmithgh/kitty-scrollback.nvim";
@@ -103,6 +86,19 @@
     };
 
     nix-gaming.url = "github:fufexan/nix-gaming";
+
+    # hyprland = {
+    #   url = "github:hyprwm/Hyprland";
+    #   #inputs.nixpkgs.follows = "nixpkgs";
+    # };
+    # anyrun = {
+    #   url = "github:Kirottu/anyrun";
+    #   #inputs.nixpkgs.follows = "nixpkgs";
+    # };
+    # ags = {
+    #   url = "github:Aylur/ags";
+    #   #inputs.nixpkgs.follows = "nixpkgs";
+    # };
   };
 
   # Here you can add additional binary cache substituers that you trust.
@@ -114,7 +110,6 @@
       "https://nix-community.cachix.org/"
       "https://devenv.cachix.org"
       "https://nixpkgs-wayland.cachix.org"
-      "https://viperml.cachix.org"
       "https://nix-gaming.cachix.org"
       # "https://hyprland.cachix.org"
       # "https://anyrun.cachix.org"
@@ -124,7 +119,6 @@
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
       "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
-      "viperml.cachix.org-1:qZhKBMTfmcLL+OG6fj/hzsMEedgKvZVFRRAhq7j8Vh8="
       "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
       # "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
       # "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="

diff --git a/parts/homes/tsandrini@jetbundle/default.nix b/parts/homes/tsandrini@jetbundle/default.nix
@@ -12,16 +12,12 @@
 # 888   88888888 888  888 "Y8888b. 888  888 888     888    888 888 88888888 "Y8888b.
 # Y88b. Y8b.     888  888      X88 Y88..88P 888     888    888 888 Y8b.          X88
 #  "Y888 "Y8888  888  888  88888P'  "Y88P"  888     888    888 888  "Y8888   88888P'
-{
-  pkgs,
-  inputs,
-  system,
-  ...
-}: {
+{pkgs, ...}: {
   tensorfiles.hm = {
     profiles.graphical-xmonad.enable = true;
     # enable patches since we arent on NixOS
     hardware.nixGL.programPatches.enable = true;
+    hardware.nixGL.enable = true;
 
     # security.agenix.enable = true;
     programs.pywal.enable = true;
@@ -45,35 +41,72 @@
   };
 
   home.packages = with pkgs; [
-    beeper
-    armcord
-    anki
-    shfmt
-    libreoffice
-    neofetch
-    pavucontrol
-    # spotify
-    texlive.combined.scheme-medium
-    zotero
-    lapack
+    thunderbird # A full-featured e-mail client
+    beeper # Universal chat app.
+    armcord # Lightweight, alternative desktop client for Discord
+    anki # Spaced repetition flashcard program
+    libreoffice # Comprehensive, professional-quality productivity suite, a variant of openoffice.org
+    texlive.combined.scheme-medium # TeX Live environment
+    zotero # Collect, organize, cite, and share your research sources
+    lapack # openblas with just the LAPACK C and FORTRAN ABI
+    ungoogled-chromium # An open source web browser from Google, with dependencies on Google web services removed
+    zoom-us # Player for Z-Code, TADS and HUGO stories or games
 
-    # TODO these are normally part of the nixos/minimal profile
-    htop
-    wget
-    curl
-    jq
+    slack # Desktop client for Slack
+    signal-desktop # Private, simple, and secure messenger
+
+    todoist # Todoist CLI Client
+    todoist-electron # The official Todoist electron app
+
+    mpv # General-purpose media player, fork of MPlayer and mplayer2
+    zathura # A highly customizable and functional PDF viewer
+
+    # NOTE: the packages below are typically part of a NixOS base installation
+    # under root, hardware related utils should probably be installed manually
+    # using the default package manager of the system instead of home-manager,
+    # so those are omitted
+
+    # --- BASE UTILS ---
+    htop # An interactive process viewer
+    jq # A lightweight and flexible command-line JSON processor
     killall
-    openssl
-    vim
-    calcurse
-    w3m
-    exfat
-    dosfstools
-    udisks
-    pciutils
-    iotop
-    unrar
-    usbutils
-    inputs.nh.packages.${system}.default
+    vim # The most popular clone of the VI editor
+    calcurse # A calendar and scheduling application for the command line
+    w3m # A text-mode web browser
+    neofetch # A fast, highly customizable system info script
+
+    # ARCHIVING UTILS --
+    atool # Archive command line helper
+    gzip # GNU zip compression program
+    lz4 # Extremely fast compression algorithm
+    lzip # A lossless data compressor based on the LZMA algorithm
+    lzop # Fast file compressor
+    p7zip # A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)
+    rar # Utility for RAR archives
+    # unrar # Utility for RAR archives # NOTE collision with rar
+    rzip # Compression program
+    unzip # An extraction utility for archives compressed in .zip format
+    xz # A general-purpose data compression software, successor of LZMA
+    zip # Compressor/archiver for creating and modifying zipfiles
+    zstd # Zstandard real-time compression algorithm
+
+    # -- MISC --
+    sqlite # A self-contained, serverless, zero-configuration, transactional SQL database engine
+    sqlitebrowser # DB Browser for SQLite
+    libarchive # Multi-format archive and compression library
+    libbtbb # Bluetooth baseband decoding library
+
+    # -- NIX UTILS --
+    nix-index # A files database for nixpkgs
+    nix-du # A tool to determine which gc-roots take space in your nix store
+    nix-tree # Interactively browse a Nix store paths dependencies
+    nix-health # Check the health of your Nix setup
+    nix-update # Swiss-knife for updating nix packages
+    # nix-serve # A utility for sharing a Nix store as a binary cache # NOTE conflict with serve-ng
+    nix-serve-ng # A drop-in replacement for nix-serve that's faster and more stable
+    nix-prefetch-scripts # Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes
+    nix-output-monitor # Processes output of Nix commands to show helpful and pretty information
+    nh # Yet another nix cli helper
+    disko # Declarative disk partitioning and formatting using nix
   ];
 }
diff --git a/parts/modules/home-manager/profiles/graphical-xmonad.nix b/parts/modules/home-manager/profiles/graphical-xmonad.nix
@@ -37,8 +37,6 @@ in {
       tensorfiles.hm = {
         profiles.headless.enable = _ true;
 
-        hardware.nixGL.enable = _ true;
-
         misc.gtk.enable = _ true;
 
         programs = {

diff --git a/parts/modules/home-manager/programs/browsers/firefox/default.nix b/parts/modules/home-manager/programs/browsers/firefox/default.nix
@@ -104,13 +104,12 @@ in {
 
               # ~ Utils
               keepassxc-browser # Official browser plugin for the KeePassXC password manager
-              tree-style-tab # Show tabs like a tree.
-              tab-unload-for-tree-style-tab # Tab unload options for Tree Style Tab.
               tridactyl # Vim, but in your browser. Replace Firefox’s control mechanism with one modelled on Vim.
               behave # A monitoring browser extension for pages acting as bad boys
               header-editor # Manage browser’s requests, include modify the request headers and response headers, redirect requests, cancel requests
               pywalfox # Dynamic theming of Firefox using your Pywal colors
               enhancer-for-youtube # Take control of YouTube and boost your user experience!
+              sidebery # Vertical tabs tree and bookmarks in sidebar with advanced containers configuration, grouping and many other features.
 
               # DEV related
               vue-js-devtools # DevTools extension for debugging Vue.js applications.

diff --git a/parts/modules/nixos/default.nix b/parts/modules/nixos/default.nix
@@ -29,7 +29,7 @@ in {
     profiles_base = importApply ./profiles/base.nix {inherit localFlake;};
     profiles_graphical-plasma = importApply ./profiles/graphical-plasma.nix {inherit localFlake inputs;};
     profiles_graphical-startx-home-manager = importApply ./profiles/graphical-startx-home-manager.nix {inherit localFlake;};
-    profiles_headless = importApply ./profiles/headless.nix {inherit localFlake inputs;};
+    profiles_headless = importApply ./profiles/headless.nix {inherit localFlake;};
     profiles_minimal = importApply ./profiles/minimal.nix {inherit localFlake;};
 
     # -- programs --

diff --git a/parts/modules/nixos/misc/nix.nix b/parts/modules/nixos/misc/nix.nix
@@ -52,7 +52,6 @@ in {
             "https://nix-community.cachix.org/"
             "https://devenv.cachix.org"
             "https://nixpkgs-wayland.cachix.org"
-            "https://viperml.cachix.org"
             "https://nix-gaming.cachix.org"
             # "https://hyprland.cachix.org"
             # "https://anyrun.cachix.org"
@@ -62,7 +61,6 @@ in {
             "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
             "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
             "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
-            "viperml.cachix.org-1:qZhKBMTfmcLL+OG6fj/hzsMEedgKvZVFRRAhq7j8Vh8="
             "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
             # "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
             # "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="

diff --git a/parts/modules/nixos/profiles/headless.nix b/parts/modules/nixos/profiles/headless.nix
@@ -12,14 +12,9 @@
 # 888   88888888 888  888 "Y8888b. 888  888 888     888    888 888 88888888 "Y8888b.
 # Y88b. Y8b.     888  888      X88 Y88..88P 888     888    888 888 Y8b.          X88
 #  "Y888 "Y8888  888  888  88888P'  "Y88P"  888     888    888 888  "Y8888   88888P'
-{
-  localFlake,
-  inputs,
-}: {
+{localFlake}: {
   config,
   lib,
-  pkgs,
-  system,
   ...
 }:
 with builtins;
@@ -57,10 +52,6 @@ in {
           };
         };
       };
-
-      environment.systemPackages = with pkgs; [
-        inputs.nh.packages.${system}.default
-      ];
     }
     # |----------------------------------------------------------------------| #
   ]);

diff --git a/parts/modules/nixos/profiles/minimal.nix b/parts/modules/nixos/profiles/minimal.nix
@@ -102,7 +102,7 @@ in {
         lzop # Fast file compressor
         p7zip # A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)
         rar # Utility for RAR archives
-        unrar # Utility for RAR archives
+        # unrar # Utility for RAR archives # NOTE collision with rar
         rzip # Compression program
         unzip # An extraction utility for archives compressed in .zip format
         xz # A general-purpose data compression software, successor of LZMA
@@ -117,14 +117,17 @@ in {
 
         # -- NIX UTILS --
         nix-index # A files database for nixpkgs
+        nix-ld # Run unpatched dynamic binaries on NixOS
         nix-du # A tool to determine which gc-roots take space in your nix store
         nix-tree # Interactively browse a Nix store paths dependencies
         nix-health # Check the health of your Nix setup
         nix-update # Swiss-knife for updating nix packages
-        nix-serve # A utility for sharing a Nix store as a binary cache
+        # nix-serve # A utility for sharing a Nix store as a binary cache # NOTE conflict with serve-ng
         nix-serve-ng # A drop-in replacement for nix-serve that's faster and more stable
         nix-prefetch-scripts # Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes
         nix-output-monitor # Processes output of Nix commands to show helpful and pretty information
+        nh # Yet another nix cli helper
+        disko # Declarative disk partitioning and formatting using nix
       ];
     }
     # |----------------------------------------------------------------------| #
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ on: @@
     jobs:
       check:
+        if: false # TODO insufficient CI disk space to run the job unfortunately
         runs-on: "ubuntu-latest"
         steps:
           - uses: actions/checkout@v4
@@ Expand Down @@