feat: a bunch of misc updates

common/variables.nix

@@ -42,7 +42,7 @@ in
       myAutostartCommands = [ "${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMinBrightness}" ];
     };
     myConfigLocation = "/home/${myUserName}/Development/Nix/nixos-configuration";
-    desktopFontFullName = "BlexMono Nerd Font:style=Regular";
+    desktopFontFullName = "UbuntuMono Nerd Font:style=Regular";
     myAutostartCommands = [
       "${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMaxBrightness}"
       "fcitx5"

flake.lock

@@ -150,6 +150,24 @@
       }
     },
     "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1735774679,
+        "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": [
           "nixvim",
@@ -446,6 +464,27 @@
         "type": "github"
       }
     },
+    "hyprswitch": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_2",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1736298372,
+        "narHash": "sha256-FSl0UFtnQARckhZCBQSCDDkkFYoJrYW8JvkJjo3zy5c=",
+        "owner": "h3rmt",
+        "repo": "hyprswitch",
+        "rev": "d583793c7e45d424161402aa98f59d5099e3fa55",
+        "type": "github"
+      },
+      "original": {
+        "owner": "h3rmt",
+        "ref": "release",
+        "repo": "hyprswitch",
+        "type": "github"
+      }
+    },
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
@@ -536,6 +575,18 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1735774519,
+        "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
+      }
+    },
     "nixpkgs-master": {
       "locked": {
         "lastModified": 1737057197,
@@ -569,6 +620,21 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1735831304,
+        "narHash": "sha256-92A/Zr8UzZzlFYmkgO3HAgX/Cr53eodgNyvJA+Ibkz0=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "0725951bfc4bbc2efff3a537837ca13159b4aec9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1736883708,
         "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
@@ -584,7 +650,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1736798957,
         "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
@@ -604,7 +670,7 @@
       "inputs": {
         "devshell": "devshell",
         "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
+        "flake-parts": "flake-parts_2",
         "git-hooks": "git-hooks",
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
@@ -655,7 +721,8 @@
       "inputs": {
         "home-manager": "home-manager",
         "hyprland-qtutils": "hyprland-qtutils",
-        "nixpkgs": "nixpkgs_2",
+        "hyprswitch": "hyprswitch",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-stable": "nixpkgs-stable",
         "nixvim": "nixvim",
@@ -663,6 +730,27 @@
         "stylix": "stylix"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprswitch",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735784864,
+        "narHash": "sha256-tIl5p3ueaPw7T5T1UXkLc8ISMk6Y8CI/D/rd0msf73I=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "04d5f1836721461b256ec452883362c5edc5288e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "spicetify-nix": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -696,7 +784,7 @@
         "git-hooks": "git-hooks_2",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_3",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "systems": "systems_3",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",

flake.nix

@@ -2,6 +2,7 @@
   description = "Your new nix config";
 
   inputs = {
+    hyprswitch.url = "github:h3rmt/hyprswitch/release";
     # Nixpkgs
     nixpkgs-master.url = "github:nixos/nixpkgs/master";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -15,8 +16,7 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    /*
+    /* lix-module = {
-      lix-module = {
        url =
          "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
        inputs.nixpkgs.follows = "nixpkgs";
@@ -30,14 +30,7 @@
     hyprland-qtutils.url = "github:hyprwm/hyprland-qtutils";
   };
 
-  outputs =
+  outputs = { self, nixpkgs, home-manager, stylix, spicetify-nix, ... }@inputs:
-    { self
-    , nixpkgs
-    , home-manager
-    , stylix
-    , spicetify-nix
-    , ...
-    } @ inputs:
     let
       inherit (self) outputs;
       myHostName = "nixos-msi";
@@ -59,7 +52,8 @@
       # Standalone home-manager configuration entrypoint
       # Available through 'home-manager --flake .#your-username@your-hostname'
       homeConfigurations = {
-        "${stevenUserName}@${myHostName}" = home-manager.lib.homeManagerConfiguration {
+        "${stevenUserName}@${myHostName}" =
+          home-manager.lib.homeManagerConfiguration {
             pkgs =
               nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
             extraSpecialArgs = { inherit inputs outputs; };
@@ -68,6 +62,7 @@
               stylix.homeManagerModules.stylix
               inputs.nixvim.homeManagerModules.nixvim
               spicetify-nix.homeManagerModules.default
+
             ];
           };
       };

home-manager/stvnliu/home.nix

@@ -1,7 +1,4 @@
-{ config
+{ config, pkgs, ... }: {
-, pkgs
-, ...
-}: {
   imports = [
     ./hypr
     ./shells
@@ -13,11 +10,13 @@
     ./ags
     ./xdg.nix
     ./stylix.nix
+    #./dwl
     ./scripts
     ./programs
     ./packages
   ];
 
+  #services.pass-secret-service.enable = true;
   nixpkgs = {
     # You can add overlays here
     overlays = [
@@ -59,6 +58,7 @@
     kdenlive
     obsidian
     heroic
+    rustdesk
   ];
   myAutostartCommands = [
     #"${pkgs.clash-verge-rev}/bin/clash-verge"
@@ -67,18 +67,19 @@
   programs = {
     obs-studio = {
       enable = true;
-      plugins = with pkgs.obs-studio-plugins; [ wlrobs input-overlay ];
+      plugins = with pkgs.obs-studio-plugins; [ wlrobs input-overlay droidcam-obs ];
     };
     home-manager.enable = true;
     firefox = {
       enable = true;
-      package = with pkgs; (firefox-devedition.override {
+      package = with pkgs;
+        (firefox-devedition.override {
           nativeMessagingHosts = [
             (passff-host.overrideAttrs (_old: {
               dontStrip = true;
               patchPhase = ''
                 sed -i 's#COMMAND = "pass"#COMMAND = "${
-                pass.withExtensions (ext: with ext; [pass-otp pass-import])
+                  pass.withExtensions (ext: with ext; [ pass-otp pass-import ])
                 }/bin/pass"#' src/passff.py'';
             }))
           ];

home-manager/stvnliu/hypr/hyprland/binds.nix

@@ -1,10 +1,8 @@
-{ config
+{ config, pkgs, inputs, ... }:
-, pkgs
-, ...
-}:
 let
   terminalCmd = config.defaultApplications.terminal;
-  screenshotLocation = "/home/${config.myUserName}/Screenshots/$(date '+%Y-%m-%d-%H-%M-%S').png";
+  screenshotLocation =
+    "/home/${config.myUserName}/Screenshots/$(date '+%Y-%m-%d-%H-%M-%S').png";
 in
 [
   "$mod SHIFT, L, exec, ${pkgs.wlogout}/bin/wlogout"
@@ -17,7 +15,7 @@ in
   "$mod, S, togglespecialworkspace"
   "$mod SHIFT, S, movetoworkspace, special"
 
-  "$mod, Tab, hyprexpo:expo, toggle"
+  "alt, Tab, exec, ${inputs.hyprswitch.packages.x86_64-linux.default}/bin/hyprswitch gui --mod-key alt --key Tab --close mod-key-release --reverse-key=key=grave && hyprswitch dispatch"
 
   # keysyms for util functions
   # Example volume button that allows press and hold, volume limited to 150%
@@ -30,8 +28,7 @@ in
   "$mod SHIFT, Return, exec, ${terminalCmd} --title=floats ${config.myShells.defaultShell}"
 
   # cmdline utilities
-  /*
+  /* NOTE Replaced by network manager applet
-    NOTE Replaced by network manager applet
       nmtui interface is no longer needed
      TODO Fix floating window rule
   */
@@ -43,31 +40,25 @@ in
   "$mod, J, movefocus, d"
   "$mod, K, movefocus, u"
   "$mod, L, movefocus, r"
-]
+] ++ (if config.services.mpd.enable then
-++ (
+  [ "$mod, M, exec, ${terminalCmd} --title=ncmpc ${pkgs.ncmpcpp}/bin/ncmpcpp" ]
-  if config.services.mpd.enable then [ "$mod, M, exec, ${terminalCmd} --title=ncmpc ${pkgs.ncmpcpp}/bin/ncmpcpp" ] else [ ]
+else
-)
+  [ ]) ++ (if config.services.swaync.enable then
-++ (
+  [ "$mod, N, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t" ]
-  if config.services.swaync.enable
+else
-  then [ "$mod, N, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t" ]
+  [ ]) ++ (
-  else [ ]
-)
-++ (
   # workspaces
   # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
   builtins.concatLists (builtins.genList
     (x:
-      let
+      let ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
-        ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
+      in [
-      in
-      [
         "$mod, ${ws}, workspace, ${toString (x + 1)}"
         "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
       ]) 10)
   # workspaces
   # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
-  /*
+  /* builtins.concatLists (builtins.genList (x:
-     builtins.concatLists (builtins.genList (x:
          let ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
          in [
            "$mod M, ${ws}, workspace, ${toString (x + 10 + 1)}"

home-manager/stvnliu/hypr/hyprland/default.nix

@@ -8,7 +8,7 @@
     package = pkgs.hyprland;
     plugins = with pkgs.hyprlandPlugins;
       [
-        hyprexpo
+        # hyprexpo
         # hyprfocus
         # hycov
       ];
@@ -40,8 +40,11 @@
         repeat_delay = 250;
         accel_profile = "flat";
       };
-      exec-once = config.myAutostartCommands
+      exec-once = config.myAutostartCommands ++ (import ./hypr_autostart.nix {
-        ++ (import ./hypr_autostart.nix { inherit config; inherit pkgs; });
+        inherit config;
+        inherit pkgs;
+        inherit inputs;
+      });
       misc = {
         disable_hyprland_logo = true;
         disable_splash_rendering = true;
@@ -53,6 +56,7 @@
       bind = import ./binds.nix {
         inherit config;
         inherit pkgs;
+        inherit inputs;
       };
       bindm = [
         # mouse movements

home-manager/stvnliu/hypr/hyprland/hypr_autostart.nix

@@ -1,4 +1,4 @@
-{ config, pkgs }:
+{ config, pkgs, inputs }:
 let
   term = config.defaultApplications.terminal;
   shell = config.myShells.defaultShell;
@@ -7,4 +7,6 @@ in
   "${term} --title=autorun ${shell}"
   "${pkgs.mpris-notifier}/bin/mpris-notifier"
   "${pkgs.mpd-discord-rpc}/bin/mpd-discord-rpc"
+  "${pkgs.easyeffects}/bin/easyeffects --gapplication-service"
+  "${inputs.hyprswitch.packages.x86_64-linux.default}/bin/hyprswitch init --show-title --size-factor 5.5 --workspaces-per-row 5"
 ]

home-manager/stvnliu/nixvim/default.nix

@@ -23,6 +23,7 @@
     ./devicons.nix
     ./tagbar.nix
     ./wrapping.nix
+    ./twilight.nix
   ];
   enable = true;
   enableMan = true;

home-manager/stvnliu/nixvim/twilight.nix

@@ -0,0 +1,6 @@
+{ ... }: {
+  plugins = {
+    zen-mode = { enable = true; };
+    twilight = { enable = true; };
+  };
+}

home-manager/stvnliu/packages/default.nix

@@ -8,5 +8,6 @@
     ./pentesting.nix
     ./dev.nix
     ./gaming.nix
+    ./hypr.nix
   ];
 }

home-manager/stvnliu/packages/hypr.nix

@@ -0,0 +1,4 @@
+{ inputs, ... }:
+{
+  home.packages = [ inputs.hyprswitch.packages.x86_64-linux.default ];
+}

home-manager/stvnliu/packages/util-programs.nix

@@ -1,5 +1,6 @@
 { pkgs, ... }: {
-  home.packages = with pkgs; [
+  home.packages = with pkgs;
+    [
       bottom
       libnotify
       tree

home-manager/stvnliu/programs/git.nix

@@ -4,6 +4,7 @@
 }: {
   programs.git = {
     enable = true;
+    lfs.enable = true;
     package = pkgs.gitFull;
     userName = config.myDisplayName;
     userEmail = config.myEmail;

home-manager/stvnliu/stylix.nix

@@ -18,7 +18,7 @@ in
       };
       monospace = {
         name = config.desktopFontFullName;
-        package = pkgs.nerd-fonts.blex-mono;
+        package = pkgs.nerd-fonts.ubuntu-mono;
       };
       sizes = {
         terminal = 16;

nixos/configuration.nix

@@ -1,11 +1,6 @@
 # This is your system's configuration file.
 # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
-{ inputs
+{ inputs, lib, config, pkgs, ... }: {
-, lib
-, config
-, pkgs
-, ...
-}: {
   imports = [
     ../common/variables.nix
     ./greetd.nix
@@ -15,7 +10,10 @@
     ./services/laptop.preset.nix
     ./virtualisation.nix
     ./hardware-configuration.nix
+    ./custom-hosts.nix
   ];
+
+  # Virtual cam settings: see https://wiki.nixos.org/wiki/OBS_Studio#Using_the_Virtual_Camera
   environment.sessionVariables = {
     GDK_SCALE = config.displayScale;
     FLAKE = config.myConfigLocation;
@@ -103,6 +101,10 @@
     gamemode.enable = true;
   };
   boot = {
+    extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
+    extraModprobeConfig = ''
+      options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
+    '';
     kernelPackages = pkgs.linuxPackages_zen;
     supportedFilesystems = [ "ntfs" ];
   };
@@ -121,8 +123,7 @@
     zed-editor
     libsForQt5.qt5.qtquickcontrols2
     libsForQt5.qt5.qtgraphicaleffects
-    /*
+    /* (blender.override {
-      (blender.override {
        cudaSupport = true;
        })
     */
@@ -164,10 +165,8 @@
   };
 
   nix =
-    let
+    let flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
-      flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
+    in {
-    in
-    {
       settings = {
         experimental-features = "nix-command flakes";
         # flake-registry = "";

nixos/custom-hosts.nix

@@ -1,9 +1,18 @@
 { ...
-}: {
+}:
+let
+  rootDomainName = "stvnliu.me";
+  subdomains = [
+    "git"
+    "kellnr"
+    "www"
+    "blog"
+    "files"
+  ];
+in
+{
   networking.extraHosts = ''
     # home IP mapping 
-
+    100.91.33.34 ${rootDomainName} ${builtins.concatStringsSep " " (map (x: x + "." + rootDomainName) subdomains)}
-    192.168.2.1 router.home
-    192.168.2.2 server.home
   '';
 }

nixos/droidcam.nix

@@ -0,0 +1,26 @@
+# /etc/nixos/configuration.nix
+{ config, pkgs, ... }:
+
+{
+  # Virtual cam settings: see https://wiki.nixos.org/wiki/OBS_Studio#Using_the_Virtual_Camera
+  boot.extraModulePackages = with config.boot.kernelPackages; [
+    v4l2loopback
+  ];
+  boot.extraModprobeConfig = ''
+    options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
+  '';
+  security.polkit.enable = true;
+
+  # Install OBS Studio with droidcam-obs
+  users.users.foo = {
+    packages = with pkgs; [
+      # ...
+      (wrapOBS {
+        plugins = with obs-studio-plugins; [
+          droidcam-obs
+        ];
+      })
+      # ...
+    ];
+  };
+}

nixos/virtualisation.nix

@@ -1,10 +1,16 @@
 { config
+, pkgs
 , ...
 }: {
   virtualisation = {
     libvirtd.enable = true;
     waydroid.enable = true;
+    podman = {
+      enable = true;
+      dockerCompat = true;
     };
+  };
+  environment.systemPackages = [ pkgs.distrobox pkgs.distrobox-tui ];
   programs.virt-manager.enable = true;
   #virtualisation.vmware.host.enable = true;
   #virtualisation.virtualbox.host = {