diff --git a/configuration.nix b/configuration.nix index f757095..80a573b 100755 --- a/configuration.nix +++ b/configuration.nix @@ -92,6 +92,10 @@ in }; security.rtkit.enable = true; + security.polkit = { + enable = true; + #package = pkgs.polkit_gnome; + }; environment.sessionVariables = { ZDOTDIR = "$HOME/.config/zsh"; }; diff --git a/dots/hyprland.nix b/dots/hyprland.nix index 8748d17..5c11752 100755 --- a/dots/hyprland.nix +++ b/dots/hyprland.nix @@ -42,6 +42,7 @@ in "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" "fcitx5 -d" "foot -s" + "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" ] ++ lib.optionals (config.home.username == "work") [ "thunderbird" @@ -177,6 +178,8 @@ in (lib.mkIf (systemName == "laptop") "ie") (lib.mkIf (systemName == "pc") "us") ]; + repeat_rate = 40; + repeat_delay = 500; #kb_variant = #kb_model = #kb_options = @@ -252,6 +255,9 @@ in # Scroll through existing workspaces with mainMod + scroll "${mod}, mouse_down, workspace, e+1" "${mod}, mouse_up, workspace, e-1" + # 8BitDo keyboard big red b Button + "${mod} SHIFT, F1, exec, scrcpy --video-source=camera -m3000 --camera-facing=back --v4l2-sink=/dev/video1 --no-video-playback --no-audio" + ]; bindm = [ @@ -274,6 +280,9 @@ in ", XF86AudioPlay, exec, playerctl play-pause " ", XF86AudioPrev, exec, playerctl previous " ]; + binds = [ + + ]; # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more # See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules diff --git a/dots/zsh.nix b/dots/zsh.nix index 4a34021..d6134ad 100755 --- a/dots/zsh.nix +++ b/dots/zsh.nix @@ -20,6 +20,7 @@ path = "$XDG_DATA_HOME/zsh/history"; }; sessionVariables = { + LD_LIBRARY_PATH = "/run/current-system/sw/share/nix-ld/lib"; HISTSIZE = 3000; SAVEHIST = 3000; CARGO_HOME = "$XDG_DATA_HOME/cargo"; @@ -80,4 +81,3 @@ ''; }; } - diff --git a/flake.lock b/flake.lock index 1a1cec1..1ae153f 100644 --- a/flake.lock +++ b/flake.lock @@ -122,6 +122,21 @@ } }, "flake-compat": { + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -135,7 +150,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_2": { + "flake-compat_3": { "locked": { "lastModified": 1747046372, "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", @@ -298,11 +313,11 @@ ] }, "locked": { - "lastModified": 1750730235, - "narHash": "sha256-rZErlxiV7ssvI8t7sPrKU+fRigNc2KvoKZG3gtUtK50=", + "lastModified": 1751239699, + "narHash": "sha256-zA1uUdAq3c26fHm26xMWMuF5COhI18EzaH7az/P2OWM=", "owner": "nix-community", "repo": "home-manager", - "rev": "d07e9cceb4994ed64a22b9b36f8b76923e87ac38", + "rev": "f6deff178cc4d6049d30785dbfc831e6c6e3a219", "type": "github" }, "original": { @@ -363,11 +378,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750735687, - "narHash": "sha256-pscxcZpLGcEEJGVjFAM7X77cARABc7M+zVyUN6qsEmU=", + "lastModified": 1751232679, + "narHash": "sha256-ljpyZxr5cHjJEXItXCoJVXJ+fiHTW1Ft0fPgEY72K5A=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a581a91b7406a0b9039ef22e37e5166bd3b1a139", + "rev": "d9b7ff985e454c1b3d2af1c5d09e799ecd38902d", "type": "github" }, "original": { @@ -396,11 +411,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1750684365, - "narHash": "sha256-BqtoSRCgmutJXnQFZs+KFMNvp3LuX6POIHjXIxWdlTE=", + "lastModified": 1750791124, + "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=", "owner": "YaLTeR", "repo": "niri", - "rev": "4c02f3bba451747c3f337f4c131b0c7f9ef41bb7", + "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c", "type": "github" }, "original": { @@ -409,6 +424,28 @@ "type": "github" } }, + "nix-alien": { + "inputs": { + "flake-compat": "flake-compat", + "nix-index-database": "nix-index-database", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749976779, + "narHash": "sha256-Mjb4qsu+Fma1cXe1lGo0GqisvsiUeW0LfacziI7C7oM=", + "owner": "thiagokokada", + "repo": "nix-alien", + "rev": "f8716e36f8864e2f50663fde364ddd8dce5d937f", + "type": "github" + }, + "original": { + "owner": "thiagokokada", + "repo": "nix-alien", + "type": "github" + } + }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -428,18 +465,39 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nix-alien", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749960154, + "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "424a40050cdc5f494ec45e46462d288f08c64475", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-index-database", + "type": "github" + } + }, "nixcord": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1750728484, - "narHash": "sha256-DdVB1KLJNpzC1aYqpywAZn84PQ7hU2s5Llxpf/Nw7ls=", + "lastModified": 1751098667, + "narHash": "sha256-ca6U8x1WRmgpX83Cz90MWvI8JeB4ScR0MiPiOepNpXA=", "owner": "kaylorben", "repo": "nixcord", - "rev": "a4f3b2eae0efd7b8b1dcae8ef92dac5a6ce221a6", + "rev": "574d28d8d6320908f1be56ce160947946125ccb6", "type": "github" }, "original": { @@ -450,11 +508,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1751011381, + "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", "type": "github" }, "original": { @@ -496,11 +554,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1750622754, - "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", + "lastModified": 1750969886, + "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", + "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", "type": "github" }, "original": { @@ -528,11 +586,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1751011381, + "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", "type": "github" }, "original": { @@ -627,11 +685,11 @@ ] }, "locked": { - "lastModified": 1750535835, - "narHash": "sha256-XnVSY70rW3DsMdftazi0xr0rMGnyclBlG7sSTLwktI4=", + "lastModified": 1751022554, + "narHash": "sha256-+REvWf68WLbwacOsjs4CmJauE2vF+sPh++Jcxn3wSeQ=", "ref": "refs/heads/master", - "rev": "20c3da01f1b2bc038582eee831e4f5055b4f71ff", - "revCount": 594, + "rev": "1d02292fbf24c41f947cf72dd7de57f6dedf2173", + "revCount": 598, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -645,6 +703,7 @@ "anyrun": "anyrun", "home-manager": "home-manager", "niri": "niri", + "nix-alien": "nix-alien", "nix-colors": "nix-colors", "nixcord": "nixcord", "nixpkgs": "nixpkgs_3", @@ -661,7 +720,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", @@ -676,11 +735,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750688934, - "narHash": "sha256-nOWOzcB/U9QE8MZ5NV1eRwrsWnsqtcPA88v0SKwKmxA=", + "lastModified": 1751145558, + "narHash": "sha256-OPlbpH64jzIspYqvJB96tnN9V9HBlAxROS5ijQwtN70=", "owner": "nix-community", "repo": "stylix", - "rev": "67a6479c1aa95210a346a227743f074b82471432", + "rev": "3a09d3f5cb940fa4142a2f3415b508a8be92b721", "type": "github" }, "original": { @@ -842,11 +901,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1750686869, - "narHash": "sha256-FS/rYXd96VBtKNJRTV2xTpTk8CgrYP+lFsFj0+VKgoY=", + "lastModified": 1751228685, + "narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "117af56a83e2d1d25016fbd504a2a040babe586a", + "rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b", "type": "github" }, "original": { @@ -861,11 +920,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1750649182, - "narHash": "sha256-beNAQ63SY8HxBsFdMGv/fdLzjQMYgifMh1DcmaIzMjo=", + "lastModified": 1751224527, + "narHash": "sha256-Mihe18dBS7y13//qPn2LVnSMZdZXI1vvnpKpRCmJcfw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c0785a69fe3988b4ef44c74575f4a2f698f91f32", + "rev": "ee2ecf872fe6b7aa14ec90796ba610eeafdd17da", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e73d53c..414fa71 100755 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,10 @@ url = "git+https://git.outfoxxed.me/outfoxxed/nix-qml-support"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-alien = { + url = "github:thiagokokada/nix-alien"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -37,7 +41,7 @@ let system = "x86_64-linux"; #Avalable options are ["niri" "river" "hyprland" "all"] - window_manager = "niri"; + window_manager = "hyprland"; in { nixosConfigurations = { diff --git a/home/homePkgs.nix b/home/homePkgs.nix index 9e61e97..fca14cc 100755 --- a/home/homePkgs.nix +++ b/home/homePkgs.nix @@ -10,7 +10,7 @@ in #hyprlock = pkgs.callPackage ../../universal/personalPKGS/hyprlock.nix {}; #hypridle = pkgs.callPackage ../../universal/personalPKGS/hypridle.nix {}; { - + programs.nix-index.enable = true; programs.lazygit.enable = true; qt.enable = true; @@ -108,6 +108,15 @@ in }; services.kdeconnect.enable = true; + # programs.obs-studio = { + # enable = true; + # plugins = with pkgs.obs-studio-plugins; [ + # wlrobs + # obs-backgroundremoval + # obs-pipewire-audio-capture + # ]; + # }; + home.packages = with pkgs; [ # # Adds the 'hello' command to your environment. It prints a friendly @@ -136,7 +145,6 @@ in rustc macchina hyprpaper - obs-studio #xwaylandvideobridge duf grim @@ -200,9 +208,6 @@ in thunderbird libnotify localsend - wmctrl - xdotool - libinput-gestures - touchegg + android-tools ]; } diff --git a/system/boot.nix b/system/boot.nix index c096d46..8115653 100755 --- a/system/boot.nix +++ b/system/boot.nix @@ -25,7 +25,9 @@ ]) ]; - kernelPackages = pkgs.linuxPackages_zen; + kernelPackages = pkgs.linuxPackages_latest; + kernelModules = [ "v4l2loopback" ]; + extraModulePackages = [ pkgs.linuxPackages_latest.v4l2loopback ]; kernelParams = lib.mkMerge [ (lib.mkIf (systemName == "laptop") [ "ipv6e=1" @@ -36,6 +38,9 @@ "ipv6e=1" ]) ]; + extraModprobeConfig = '' + options v4l2loopback devices=2 video_nr=1,0 card_label="OBS Cam","phone cam" exclusive_caps=1,1 + ''; plymouth = { enable = true; diff --git a/system/nixOSPkgs.nix b/system/nixOSPkgs.nix index 18df2bf..d2ad39f 100755 --- a/system/nixOSPkgs.nix +++ b/system/nixOSPkgs.nix @@ -1,6 +1,7 @@ { config, lib, + inputs, pkgs, pkgs-stable, ... @@ -94,10 +95,42 @@ in programs.nix-ld.enable = true; programs.nix-ld.libraries = with pkgs; [ # add libraries here + alsa-lib libGL + glibc + glib + fontconfig + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXfixes + xorg.libXrender + xorg.libXrandr + xorg.libXtst + xorg_sys_opengl + xorg.libXi + xorg.libxshmfence + xorg.libxkbfile + xorg.libxcb + xorg.xcbutilwm + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xcb-util-cursor + libgbm + libxkbcommon + freetype + dbus + krb5 + nss + zotero + nspr + gtk3 + libappindicator-gtk3 + mesa + vulkan-loader ]; - #backlight tool programs.light.enable = true; @@ -139,5 +172,6 @@ in kdePackages.qt6ct ripgrep xwayland-satellite + inputs.nix-alien.packages.${pkgs.system}.nix-alien ]; } diff --git a/system/services.nix b/system/services.nix index c6d4be7..b99a3fa 100755 --- a/system/services.nix +++ b/system/services.nix @@ -165,7 +165,7 @@ # List services that you want to enable: services.emacs = { enable = true; - package = pkgs.emacs30-pgtk; # replace with emacs-gtk, or a version provided by the community overlay if desired. + package = pkgs.emacs-gtk; # replace with emacs-gtk, or a version provided by the community overlay if desired. }; services.sunshine = lib.mkIf (systemName == "pc") { enable = true;