nixos/flake.nix

@@ -5,17 +5,13 @@
     nixpkgs.url = "nixpkgs/nixos-24.11";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
 
-    devshell = {
-      url = "github:numtide/devshell";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     flake-utils.url = "github:numtide/flake-utils";
     home-manager = {
       url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     openconnect-sso = {
-      url = github:ThinkChaos/openconnect-sso/fix/nix-flake;
+      url = "github:ThinkChaos/openconnect-sso/fix/nix-flake";
       inputs = {
         flake-utils.follows = "utils";
         nixpkgs.follows = "nixpkgs";
@@ -29,14 +25,18 @@
       url = "github:gytis-ivaskevicius/flake-utils-plus";
       inputs.flake-utils.follows = "flake-utils";
     };
+    zen-browser = {
+      url = "github:youwen5/zen-browser-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs@{
     self, nixpkgs, nixpkgs-unstable,
-    devshell, flake-utils, home-manager, openconnect-sso, sops-nix, utils,
+    flake-utils, home-manager, openconnect-sso, sops-nix, utils, zen-browser,
     ... }:
     let
-      system = "x86_64-linux";
+      system = utils.lib.system.x86_64-linux;
 
       unfreePackages = pkg: builtins.elem (nixpkgs.lib.getName pkg) [
         "corefonts"

nixos/users/tdpeuter/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs-unstable, ... }:
+{ config, inputs, lib, pkgs, pkgs-unstable, ... }:
 
 let
   cfg = config.sisyphus.users.tdpeuter;
@@ -33,6 +33,48 @@ in {
       ];
       initialPassword = "ChangeMe";
       shell = pkgs.zsh;
+
+      packages = (with pkgs; [
+        cmdtime               # Zsh plugin
+        icosystem             # Personal icon theme
+        nextcloud-client
+        spotify-adblock
+        brave                 # Internet browser
+        chafa                 # Terminal image viewer
+        duf                   # Df alternative
+        feishin               # Jellyfin music client
+        foot
+        fzf
+        gh                    # GitHub CLI tool
+        glow                  # Terminal Markdown renderer
+        jellyfin-media-player
+        libreoffice-fresh     # Office tools
+        librewolf             # Internet browser
+        mpv                   # Media player
+        nsxiv                 # Lightweight image viewer
+        qalculate-gtk         # Calculator
+        spotify
+        unzip
+        vifm                  # File manager
+        zathura               # PDF viewer
+        zellij                # Tmux + screen alternative
+        zsh
+        zsh-autosuggestions
+        zsh-syntax-highlighting
+
+        # SMB
+        cifs-utils
+        psmisc
+
+        # Linters and LSPs
+        statix      # Nix
+        # TODO Move to devshells
+        # ruff pylint # Python
+      ]) ++ (with pkgs-unstable; [
+        logseq                # Note taking
+      ]) ++ [
+        inputs.zen-browser.packages.${pkgs.system}.default
+      ];
     };
 
     fonts.packages = with pkgs; [
@@ -60,44 +102,9 @@ in {
         homeDirectory = "/home/${user}";
         inherit (config.system) stateVersion;
 
-        packages = (with pkgs; [
+        # packages = (with pkgs; [
-          cmdtime               # Zsh plugin
+        # ]) ++ (with pkgs-unstable; [
-          icosystem             # Personal icon theme
+        # ]);
-          nextcloud-client
-          spotify-adblock
-        ]) ++ (with pkgs-unstable; [
-          brave
-          chafa                 # Terminal image viewer
-          duf                   # Df alternative
-          feishin               # Jellyfin music client
-          foot
-          fzf
-          glow                  # Terminal Markdown renderer
-          jellyfin-media-player
-          libreoffice-fresh     # Office tools
-          # FIXME Waiting for electron version to update, now insecure.
-          # logseq                # Note taking
-          mpv                   # Media player
-          nsxiv                 # Lightweight image viewer
-          qalculate-gtk         # Calculator
-          spotify
-          unzip
-          vifm                  # File manager
-          zathura               # PDF viewer
-          zellij                # Tmux + screen alternative
-          zsh
-          zsh-autosuggestions
-          zsh-syntax-highlighting
-
-          # SMB
-          cifs-utils
-          psmisc
-
-          # Linters and LSPs
-          statix      # Nix
-          # TODO Move to devshells
-          # ruff pylint # Python
-        ]);
 
         pointerCursor = {
           inherit (cursor) package name size;