Changed: Programms

flake.nix

@@ -23,6 +23,12 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     hyprland.url = "github:hyprwm/Hyprland";
+    
+    /*nixvim = {
+        url = "github:nix-community/nixvim/nixos-24.11";
+        inputs.nixpkgs.follows = "nixpkgs";
+    };*/
+
     catppuccin.url = "github:catppuccin/nix";
 
     home-manager.url = "github:nix-community/home-manager/release-24.11";

home/hyprland/hyprland.nix

@@ -7,7 +7,7 @@ let
     theme = "-theme $HOME/.config/rofi/catppuccin-default.rasi";
     menu = "rofi -show drun ${theme}";
     filebrowser = "rofi -show filebrowser ${theme}";
-    power = "~/.config/rofi/powermenu/type-6/powermenu.sh";
+    power = "rofi -show p -modi p:rofi-power-menu";
 in 
 {
     home.packages = with pkgs; [
@@ -174,6 +174,15 @@ in
 
         windowrulev2 = "suppressevent maximize, class:.*";
         
+        windowrule = [
+            "opacity 0.0 override, class:^(xwaylandvideobridge)$"
+            "noanim, class:^(xwaylandvideobridge)$"
+            "noinitialfocus, class:^(xwaylandvideobridge)$"
+            "maxsize 1 1, class:^(xwaylandvideobridge)$"
+            "noblur, class:^(xwaylandvideobridge)$"
+            "nofocus, class:^(xwaylandvideobridge)$"
+        ];
+
         exec-once = [
             "waybar &"
             "hyprpaper &"

home/hyprland/rofi/default.nix

@@ -3,6 +3,10 @@
   config,
   ...
 }: {
+    home.packages = with pkgs; [
+        rofi-power-menu
+    ];
+
     programs.rofi = {
         enable = true;
         cycle = false;

home/hyprland/waybar/configs/weather.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!nix-shell python3 -p "python3.withPackages (ps: with ps; [requests])"
 
 import datetime
 import json
@@ -6,8 +6,6 @@ import requests
 import statistics
 import sys
 
-
-
 # TODO
 # - snowfall data
 # - weather warnings

home/hyprland/waybar/double-monitor.nix

@@ -127,7 +127,6 @@
                 ];
 
                 modules-center = [
-                    "custom/weather"
                 ];
                 
                 modules-right = [
@@ -143,7 +142,7 @@
                 };
 
 		"custom/weather" = {
-                    exec = "python3 ~/.config/waybar/weather.py waybar";
+                    exec = "~/.config/waybar/weather.py waybar";
                     restart-interval = 900;
                     return-type = "json";
                 };

hosts/m920q/default.nix

@@ -5,8 +5,7 @@
 { config, pkgs, lib, ... }:
 
 {
-  imports =
+    imports = [
-    [
         ../../modules/system.nix
         ../../modules/nix-settings.nix
         ../../modules/vpn.nix
@@ -20,10 +19,10 @@
         ../../modules/regreet/regreet.nix
         ../../modules/plymouth.nix
         ../../modules/file_managers/spacefm.nix
-	../../modules/python.nix
         ../../modules/appimage.nix
         ../../modules/qemu.nix
-	../../modules/geary.nix
+        ../../modules/thunderbird.nix
+        ../../modules/canon_eos_550d.nix
 # Include the results of the hardware scan.
         ./hardware-configuration.nix
     ];

modules/canon_eos_550d.nix

@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+{
+
+    services.udev.extraRules = ''
+        ACTION=="add", \
+        SUBSYSTEM=="usb", \
+        ATTR{idVendor}=="04a9", \
+        ATTR{idProduct}=="31ea", \
+    '';
+#        RUN+="systemctl restart webcam"
+
+    systemd.services.webcam = {
+        enable = true;
+        script = ''
+            ${pkgs.gphoto2}/bin/gphoto2 --stdout --capture-movie |
+            ${pkgs.ffmpeg}/bin/ffmpeg \
+                -i - \
+                -vcodec rawvideo \
+                -pix_fmt yuv420p \
+                -f v4l2 \
+                /dev/video0
+        '';
+        #wantedBy = [ "multi-user.target" ];
+    };
+}

modules/python.nix

@@ -1,13 +0,0 @@
-{ pkgs, ...}:
-{
-
-    environment.systemPackages = with pkgs; [
-        (python3.withPackages (python-pkgs: with python-pkgs; [
-            pandas
-            requests
-            numpy
-            scipy
-        ]))
-    ];
-
-}

modules/start-webcam.nix

@@ -0,0 +1,4 @@
+with import <nixpkgs> { };
+writeShellScriptBin = "start-webcam" ''
+    systemctl restart webcam
+'';

modules/system.nix

@@ -32,6 +32,8 @@
         pciutils # lspci
         usbutils # lsusb
         lshw
+        nvme-cli
+        smartmontools
 
         # Graphics
         libGL

users/phil/home.nix

@@ -20,7 +20,6 @@
     ../../home/programs/media/obs.nix
     ../../home/programs/media/spotify/spotify.nix
 
-    ../../home/programs/productivity/notesnook.nix 
     ../../home/programs/productivity/blender.nix
     ../../home/programs/productivity/slicer.nix
     ../../home/programs/productivity/okular.nix
@@ -31,6 +30,7 @@
     ../../home/programs/social/zapzap.nix
 
     ../../home/programs/web/firefox.nix
+    ../../home/programs/web/chromium.nix
 
     # Games
     ../../home/programs/games/itch.nix