Add kitty, obs, and scripts skeleton code

Also refactors some flake.nix code to not use dictionaries

flake.lock

@@ -2,14 +2,16 @@
   "nodes": {
     "ags": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1710523796,
+        "lastModified": 1712250145,
-        "narHash": "sha256-VlzW+B/6Ifk+BRy1leU0GHuQ4KqlQXLO/pRRCCHcvDQ=",
+        "narHash": "sha256-8WTGn7It2kZfAmN97Epi3g/Su/w3Hbw/T4dWxE7OrBw=",
         "owner": "Aylur",
         "repo": "ags",
-        "rev": "5dec6c7f37be13781144a7964e75cc00c7d7045f",
+        "rev": "d589077199ec8a055ef936bf8a1f051b7a0c7e34",
         "type": "github"
       },
       "original": {
@@ -25,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710532761,
+        "lastModified": 1712462372,
-        "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
+        "narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
+        "rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9",
         "type": "github"
       },
       "original": {
@@ -40,7 +42,10 @@
     },
     "hyprcursor": {
       "inputs": {
-        "hyprlang": "hyprlang",
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
@@ -51,11 +56,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710257359,
+        "lastModified": 1712434681,
-        "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=",
+        "narHash": "sha256-qwmR2p1oc48Bj7gUDvb1oGL19Rjs2PmEmk4ChV01A5o=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974",
+        "rev": "818d8c4b69e0997483d60b75f701fe14b561a7a3",
         "type": "github"
       },
       "original": {
@@ -68,18 +73,20 @@
       "inputs": {
         "hyprcursor": "hyprcursor",
         "hyprland-protocols": "hyprland-protocols",
-        "hyprlang": "hyprlang_2",
+        "hyprlang": "hyprlang",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
-        "systems": "systems_2",
+          "nixpkgs"
+        ],
+        "systems": "systems",
         "wlroots": "wlroots",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1710611769,
+        "lastModified": 1712528342,
-        "narHash": "sha256-gM4cDw45J8mBmM0aR5Ko/zMAA8UWnQhc4uZ5Ydvc4uo=",
+        "narHash": "sha256-5tRzlHnhk28M2ClRshRAEANGE/GF9A1Cl36OXAmi+Ig=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "0e87a08e15c023325b64920d9e1159f38a090695",
+        "rev": "43b96f03b5af60586a864ea64e8c71b11ea6eb85",
         "type": "github"
       },
       "original": {
@@ -95,11 +102,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710415616,
+        "lastModified": 1712505318,
-        "narHash": "sha256-1qVByzzCcKoCmP8ReUSAjKU5V9pfTLHQIM4WI1tvQ9E=",
+        "narHash": "sha256-fzlBLhXUN6y7mzEtcGNRDXxFakBEfaj4Bmj5PuoCNaM=",
         "owner": "hyprwm",
         "repo": "contrib",
-        "rev": "75420d09f93346d9d23d5a1e26b42699f6b66cd6",
+        "rev": "5870244b592c22558b658dbaf94f9e41afb0316f",
         "type": "github"
       },
       "original": {
@@ -134,29 +141,6 @@
       }
     },
     "hyprlang": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "hyprcursor",
-          "nixpkgs"
-        ],
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1709914708,
-        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
-    "hyprlang_2": {
       "inputs": {
         "nixpkgs": [
           "hyprland",
@@ -168,11 +152,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709914708,
+        "lastModified": 1711671891,
-        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
+        "narHash": "sha256-C/Wwsy/RLxHP1axFFl+AnwJRWfd8gxDKKoa8nt8Qk3c=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
+        "rev": "c1402612146ba06606ebf64963a02bc1efe11e74",
         "type": "github"
       },
       "original": {
@@ -183,43 +167,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1708475490,
+        "lastModified": 1712439257,
-        "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
+        "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0e74ca98a74bc7270d28838369593635a5db3260",
+        "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1710272261,
-        "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1710451336,
-        "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d691274a972b3165335d261cc4671335f5c67de9",
         "type": "github"
       },
       "original": {
@@ -234,7 +186,7 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "hyprland-contrib": "hyprland-contrib",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs"
       }
     },
     "systems": {
@@ -252,21 +204,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
     "wlroots": {
       "flake": false,
       "locked": {

flake.nix

@@ -3,30 +3,31 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
-    home-manager = {
+
-      url = "github:nix-community/home-manager";
+    home-manager.url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    };
+
     hyprland.url = "github:hyprwm/Hyprland";
-    hyprland-contrib = {
+    hyprland.inputs.nixpkgs.follows = "nixpkgs";
-      url = "github:hyprwm/contrib";
+
-      inputs.nixpkgs.follows = "nixpkgs";
+    hyprland-contrib.url = "github:hyprwm/contrib";
-    };
+    hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs";
+
     ags.url = "github:Aylur/ags";
+    ags.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { nixpkgs, home-manager, hyprland, ... }@inputs:
+  outputs = { nixpkgs, home-manager, hyprland, ... }@inputs: let
-    let
+    system = "x86_64-linux";
-      system = "x86_64-linux";
+    pkgs = nixpkgs.legacyPackages.${system};
-      pkgs = nixpkgs.legacyPackages.${system};
+  in {
-    in {
+    homeConfigurations."pan" = home-manager.lib.homeManagerConfiguration {
-      homeConfigurations."pan" = home-manager.lib.homeManagerConfiguration {
+      inherit pkgs;
-        inherit pkgs;
+      extraSpecialArgs = { inherit inputs; };
-        extraSpecialArgs = { inherit inputs; };
+      modules = [
-        modules = [
+        hyprland.homeManagerModules.default
-          hyprland.homeManagerModules.default
+        ./home.nix
-          ./home.nix
+      ];
-        ];
-      };
     };
+  };
 }

home.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, xdg, ... }:
+{ config, pkgs, ... }:
 
 {
   nixpkgs.config.allowUnfree = true;
@@ -8,6 +8,7 @@
   imports = [
     # ./programs/dunst
     # ./programs/eww
+    # ./programs/spotify
     ./programs/ags
     ./programs/alacritty
     ./programs/discord
@@ -19,12 +20,14 @@
     ./programs/nnn
     ./programs/nvim
     ./programs/rofi
-    ./programs/spotify
     ./programs/ssh
     ./programs/wal
     ./programs/xdg
     ./programs/xonsh
+    ./programs/obs
+    ./programs/kitty
 
+    # ./services/scripts
     ./services/timers
   ];
 
@@ -41,6 +44,7 @@
     ani-cli # Easy anime player
     lutgen # LUT generator
     prismlauncher # Minecraft launcher
+    unzip # Unzip utility
 
     texlive.combined.scheme-full # Latex
 
@@ -67,5 +71,5 @@
   programs.man.generateCaches = false;
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
-  home.stateVersion = "23.05"; # don't change lol, u know why
+  home.stateVersion = "23.05";
 }

programs/kitty/default.nix

@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+
+{
+  programs.kitty = {
+    enable = true;
+    settings = {
+      font_family = "Cascadia Code";
+      font_size = 18;
+      enable_audio_bell = "no";
+    };
+  };
+}

programs/obs/default.nix

@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+{
+  programs.obs-studio = {
+    enable = true;
+    plugins = with pkgs.obs-studio-plugins; [
+      wlrobs
+      obs-backgroundremoval
+      obs-pipewire-audio-capture
+    ];
+  };
+}

services/scripts/default.nix

@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+let
+  select = import ./select.nix { inherit pkgs; };
+in
+{
+  home.packages = [
+    select
+  ];
+}

services/scripts/select.nix

@@ -0,0 +1,15 @@
+{ pkgs }:
+
+pkgs.writeShellApplication {
+  name = "select";
+
+  runtimeInputs = [ fzf rofi ];
+
+  text = ''
+    if [ ${PPID} -ne 1 ]; then
+      echo -e $1 | fzf
+    else
+      echo -e $1 | rofi -dmenu -p $2
+    fi
+  '';
+}