Merge pull request #22 from tomasriveral/desktop

Desktop

flake.lock

@@ -34,11 +34,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1780907625,
+        "lastModified": 1780996864,
-        "narHash": "sha256-YH1LHLhoAlSmXmVz9qhY+QLFWbLVFJWSaPJ3ORr5grQ=",
+        "narHash": "sha256-OIDk3FiSKjYLV4Dvfv6fMeVcV3Dk9+MBBKTORNqMsUg=",
         "owner": "caelestia-dots",
         "repo": "shell",
-        "rev": "66a9f2f220a9cc6a29ce4b66691f0117bdd35704",
+        "rev": "c46593d438a75fce42f28529662b678b79d94693",
         "type": "github"
       },
       "original": {
@@ -246,11 +246,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1780928217,
+        "lastModified": 1780997039,
-        "narHash": "sha256-Cvq31DIGCKet/UFsJd20YIwCoZmX91xQBV5oiR1bU1k=",
+        "narHash": "sha256-8pPXOCZkrySE3zwtix2MYxm9NzzHT/XQr0mHJsf3lis=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2ef2f7e4a2999ffaab2ac987e69f5f8e29ec73cf",
+        "rev": "872eb0174d0d5a1bc37388ff84eea2bca44b1065",
         "type": "github"
       },
       "original": {
@@ -285,11 +285,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1780747962,
+        "lastModified": 1780930886,
-        "narHash": "sha256-IX7G1dlKrOqPOImfbo7ADDfV5yU1+j+MRChI3TL4tAA=",
+        "narHash": "sha256-rppURzHviaQN131F+nLiLdGfcb0uCd9gGP0E5+iw9MI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73",
+        "rev": "8c3cede7ddc26bd659d2d383b5610efbd2c7a16e",
         "type": "github"
       },
       "original": {
@@ -301,11 +301,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1780734595,
+        "lastModified": 1780902259,
-        "narHash": "sha256-DmTfP92QFYRLOGXlMIE54MAgxSJjDWocl3gRNOu72Os=",
+        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9b696460ac78b5ccfc17c854d8c976f20456e943",
+        "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
         "type": "github"
       },
       "original": {
@@ -338,6 +338,30 @@
         "type": "github"
       }
     },
+    "patent": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1780942898,
+        "narHash": "sha256-cP4gUX4YE1kFe+15Zd1CbqL08XytPm1UXZuaXjYLG94=",
+        "owner": "r14dd",
+        "repo": "patent",
+        "rev": "bbad654b6b65264d2ba267b5c87e8be0bd89b78e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "r14dd",
+        "repo": "patent",
+        "type": "github"
+      }
+    },
     "quickshell": {
       "inputs": {
         "nixpkgs": [
@@ -374,7 +398,29 @@
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-notifier": "nixpkgs-notifier",
         "nixpkgs-unstable": "nixpkgs-unstable",
-        "notewrapper": "notewrapper"
+        "notewrapper": "notewrapper",
+        "patent": "patent"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "patent",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1780888890,
+        "narHash": "sha256-MUQPFiskEENaJ2N82TRIqpKlHXGXJJkPfKH6W788oQo=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "7d5f8d75fc195a236b46633d7679139698aeb35f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
       }
     },
     "systems": {

flake.nix

@@ -31,6 +31,11 @@
       inputs.flake-utils.follows = "flake-utils";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
+    patent = {
+      url = "github:r14dd/patent";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
     caelestia-shell = {
       # based on quickshell. See https://github.com/caelestia-dots/shell
       url = "github:caelestia-dots/shell";

modules/applications/browser.nix

@@ -7,7 +7,7 @@
     environment.systemPackages = with pkgs; [
       chromium # used only to flash the firmware on my framework laptop 16 (keyboard.frame.work) as only chromium based browser support webHID.
       pkgs-unstable.tor-browser
-      self.packages.${pkgs.system}.custom-librewolfprofiles
+      self.packages.${pkgs.system}.custom-browserprofiles
     ];
   };
   flake.homeModules.librewolf = _: {

modules/applications/hyprland.nix

@@ -74,7 +74,7 @@
       "$editor" = "nvim";
       "$notes" = "kitty --class \"custom-obsidianvaults\" --name \"Select Obsidian vault\" --hold custom-obsidianvaults";
       "$file" = "dolphin";
-      "$browser" = "kitty --class \"custom-librewolfprofiles\" --name \"Select LibreWolf profile\" --hold custom-librewolfprofiles";
+      "$browser" = "kitty --class \"custom-browserprofiles\" --name \"Select browser profile\" --hold custom-browserprofiles";
       # ▄▀█ █▄░█ █ █▀▄▀█ ▄▀█ ▀█▀ █ █▀█ █▄░█
       # █▀█ █░▀█ █ █░▀░█ █▀█ ░█░ █ █▄█ █░▀█
       animations = {
@@ -487,7 +487,7 @@
         "float on, match:class ^(kitty)$, match:title ^(htop)$"
         "float on, match:class ^(vlc)$"
         "float on, match:class ^(eog)$"
-        "float on, size 400 225, match:class ^(custom-librewolfprofiles)$"
+        "float on, size 400 225, match:class ^(custom-browserprofiles)$"
         "float on, size 1050 200, match:class ^(custom-changeAudioOutput)$"
         "float on, size 400 175, match:class ^(custom-obsidianvaults)$"
         "float on, size 600 600, match:initial_class ^(custom-pomodoro)$"

modules/packages/custom-browserprofiles.nix

@@ -1,18 +1,19 @@
 _: {
   perSystem = {pkgs, ...}: {
     # fzf librewolf profile selector
-    packages.custom-librewolfprofiles = pkgs.writeShellApplication {
+    packages.custom-browserprofiles = pkgs.writeShellApplication {
-      name = "custom-librewolfprofiles";
+      name = "custom-browserprofiles";
       runtimeInputs = with pkgs; [
         zsh
         fzf
+        tor-browser
       ];
       text = ''
         # List of profiles
-        profiles=("work" "other" "private window")
+        profiles=("work" "other" "private window" "tor-browser")
 
         # Use fzf to select
-        selected=$(printf "%s\n" "''${profiles[@]}" | fzf --height 6 --reverse --prompt="Select LibreWolf profile:")
+        selected=$(printf "%s\n" "''${profiles[@]}" | fzf --height 6 --reverse --prompt="Select browser profile:")
 
         # If user cancels, exit
         [[ -z "$selected" ]] && exit 0
@@ -20,10 +21,12 @@ _: {
         # Launch LibreWolf detached, keeping environment
         if [[ "$selected" == "private window" ]]; then
           setsid  librewolf --private-window --no-remote >/dev/null 2>&1 &
-              pkill -f "kitty.*Select LibreWolf profile"
+              pkill -f "kitty.*Select browser profile"
+        elif [[ "$selected" == "tor-browser" ]]; then
+          setsid tor-browser >/dev/null 2>&1 & pkill -f "kitty.*Select browser profile"
         else
           setsid  librewolf -P "$selected" --no-remote >/dev/null 2>&1 &
-              pkill -f "kitty.*Select LibreWolf profile"
+              pkill -f "kitty.*Select browser profile"
         fi
 
         # Exit the kitty terminal after selection

modules/utilities/development.nix

@@ -35,6 +35,7 @@
       gnupg
       pinentry-curses
       inputs.nixpkgs-notifier.packages.${pkgs.system}.default
+      inputs.patent.packages.${pkgs.system}.default
     ];
   };
   flake.homeModules.development = _: {

modules/utilities/nixGitCherryPicker.nix

@@ -1,5 +1,25 @@
 {inputs, ...}: {
+<<<<<<< desktop
+  flake.homeModules.nix-git-cherry-picker-laptop = {pkgs, ...}: {
+    home.packages = [
+      inputs.nix-git-cherry-picker.packages.${pkgs.system}.default
+    ];
+    home.file.".config/nix-git-cherry-picker/config.json" = {
+      enable = true;
+      text = ''
+        {
+          "localBranch": "laptop",
+          "remoteBranch": "desktop",
+          "nixConfigPath": "/home/tomasr/nixos/"
+        }
+      '';
+      force = true;
+    };
+  };
+  flake.homeModules.nix-git-cherry-picker-desktop = {pkgs, ...}: {
+=======
   flake.homeModules.nixGitCherryPicker-laptop = {pkgs, ...}: {
+>>>>>>> main
     home.packages = [
       inputs.nix-git-cherry-picker.packages.${pkgs.system}.default
     ];