flake.lock

@@ -319,21 +319,6 @@
         "type": "github"
       }
     },
-    "nix-flatpak": {
-      "locked": {
-        "lastModified": 1732304879,
-        "narHash": "sha256-/DOW8VadE//HA6tuV2++NowYWi7Wa/FmJHXRJoTQnfQ=",
-        "owner": "gmodena",
-        "repo": "nix-flatpak",
-        "rev": "c84579946c03c996916be0fb6e1340f444c277af",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gmodena",
-        "repo": "nix-flatpak",
-        "type": "github"
-      }
-    },
     "nix-pre-commit": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -520,7 +505,6 @@
         "catppuccin-vsc": "catppuccin-vsc",
         "compose2nix": "compose2nix",
         "home-manager": "home-manager",
-        "nix-flatpak": "nix-flatpak",
         "nix-vscode-extensions": "nix-vscode-extensions",
         "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",

flake.nix

@@ -6,7 +6,6 @@
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nix-flatpak.url = "github:gmodena/nix-flatpak";
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -45,7 +44,6 @@
             ./nixos/configuration.nix
             ./nixos/development.nix
             ./nixos/environment.nix
-            ./nixos/flatpak.nix
             ./nixos/gaming.nix
             ./nixos/git.nix
             ./nixos/gui-pkgs.nix
@@ -62,7 +60,6 @@
             }
 
             inputs.nixvim.nixosModules.nixvim
-            inputs.nix-flatpak.nixosModules.nix-flatpak
 
             # Catppuccin theme
             inputs.catppuccin.nixosModules.catppuccin

nixos/environment.nix

@@ -1,6 +1,5 @@
 { lib, ... }: {
   environment.variables = {
-    PATH = "$PATH:/etc/nixos/scripts";
     EDITOR = "nvim";
     VISUAL = "code";
 
@@ -17,6 +16,6 @@
   environment.sessionVariables = {
     # Enable Ozone Wayland support in Chromium and Electron applications
     #TODO - This causes issues with VSCode until the November 2024 release.
-    NIXOS_OZONE_WL = lib.mkDefault "";
+    # NIXOS_OZONE_WL = lib.mkDefault "1";
   };
 }

nixos/flatpak.nix

@@ -1,8 +0,0 @@
-{
-    services.flatpak = {
-        enable = true;
-        packages = [
-            { flatpakref = "https://sober.vinegarhq.org/sober.flatpakref"; sha256 = "1pj8y1xhiwgbnhrr3yr3ybpfis9slrl73i0b1lc9q89vhip6ym2l"; }
-        ];
-    };
-}

nixos/script-dependencies.nix

@@ -1,15 +0,0 @@
-let
-  nixpkgs = fetchTarball
-    "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz";
-  pkgs = import nixpkgs {
-    config = { };
-    overlays = [ ];
-  };
-in pkgs.mkShellNoCC {
-  packages = with pkgs; [
-    libnotify
-    python312
-    python312Packages.requests
-    python312Packages.pyperclip
-  ];
-}

scripts/common/common.py

@@ -30,10 +30,10 @@ def notify(
 
 
 def read_secret_file(secret: str) -> str:
-    path = f"/var/secrets/{secret}"
+    path = f"/run/secrets/{secret}"
     if not os.path.exists(path):
-        raise FileNotFoundError(f"Secret file {path} does not exist or cannot be read.")
+        raise FileNotFoundError(f"Secret file {path} does not exist.")
-    with open(f"/var/secrets/{secret}", "r") as f:
+    with open(f"/run/secrets/{secret}", "r") as f:
         secret = f.read().strip()
     if not secret:
         raise ValueError(f"Secret file {path} is empty.")

scripts/spectacle-screenshot.py

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell /etc/nixos/nixos/script-dependencies.nix -i python
+#! nix-shell -i python -p python312 libnotify
 
 import argparse
 import os
@@ -73,7 +73,7 @@ def spectacle_screenshot(
         finally:
             if Path(file_path).exists() and use_temp_file:
                 os.remove(file_path)
-    except BaseException as e:
+    except Exception as e:
         notify(
             application_name="Spectacle",
             title="An error occurred",

scripts/zipline.py

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell /etc/nixos/nixos/script-dependencies.nix -i python
+#! nix-shell -i python -p python312 python312Packages.pyperclip python312Packages.requests libnotify
 
 import argparse
 import mimetypes
@@ -66,7 +66,7 @@ def zipline(
             error_message = response.text
             raise Exception(error_message)
 
-    except BaseException as e:
+    except Exception as e:
         if use_notify_send:
             notify(
                 application_name=application_name,