mirror of
https://github.com/danbulant/dotfiles
synced 2026-07-07 12:11:31 +00:00
Compare commits
No commits in common. "8b4ec77e937b6b87dfa3b41e77a4cdfd7d5a31dd" and "51d7fe8633ba211a04e18f29ff3af598fc44a2ef" have entirely different histories.
8b4ec77e93
...
51d7fe8633
3 changed files with 55 additions and 20 deletions
|
|
@ -454,7 +454,7 @@ bind = CTRL+ALT,2,pass,^(com\.obsproject\.Studio)$
|
||||||
#windowrulev2=opacity 0.9,class:Code
|
#windowrulev2=opacity 0.9,class:Code
|
||||||
#windowrulev2=opacity 0.9,class:Spotify
|
#windowrulev2=opacity 0.9,class:Spotify
|
||||||
|
|
||||||
#windowrulev2 = suppress_event maximize,class:^(vesktop)$
|
windowrulev2 = suppress_event maximize,class:^(vesktop)$
|
||||||
|
|
||||||
#windowrulev2=workspace 10,class:Code # Open Code on secondary monitor
|
#windowrulev2=workspace 10,class:Code # Open Code on secondary monitor
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,10 +6,15 @@
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
options,
|
options,
|
||||||
|
nixpkgs-unstable,
|
||||||
lib,
|
lib,
|
||||||
dms,
|
dms,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
let
|
||||||
|
unstable-pkgs = nixpkgs-unstable.legacyPackages.x86_64-linux; # import nixpkgs-unstable.nixosModules.readOnlyPkgs {};
|
||||||
|
# unstable-pkgs = hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
||||||
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
dms.nixosModules.greeter
|
dms.nixosModules.greeter
|
||||||
|
|
@ -109,13 +114,17 @@
|
||||||
LC_TIME = "en_GB.UTF-8";
|
LC_TIME = "en_GB.UTF-8";
|
||||||
};
|
};
|
||||||
services.displayManager.sddm.enable = true;
|
services.displayManager.sddm.enable = true;
|
||||||
|
services.displayManager.sddm.wayland.enable = true;
|
||||||
services.desktopManager.plasma6 = {
|
services.desktopManager.plasma6 = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
# services.desktopManager.gnome.enable = true;
|
# services.desktopManager.gnome.enable = true;
|
||||||
services.xserver.xkb = {
|
services.xserver = {
|
||||||
layout = "us";
|
enable = false;
|
||||||
variant = "";
|
xkb = {
|
||||||
|
layout = "us";
|
||||||
|
variant = "";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
|
|
@ -433,6 +442,22 @@
|
||||||
))
|
))
|
||||||
];
|
];
|
||||||
|
|
||||||
|
environment.variables =
|
||||||
|
let
|
||||||
|
qtVersions = with pkgs; [
|
||||||
|
qt5
|
||||||
|
qt6
|
||||||
|
];
|
||||||
|
in
|
||||||
|
{
|
||||||
|
QT_PLUGIN_PATH = map (qt: "/${qt.qtbase.qtPluginPrefix}") qtVersions;
|
||||||
|
QML2_IMPORT_PATH =
|
||||||
|
map (qt: "/${qt.qtbase.qtQmlPrefix}") qtVersions
|
||||||
|
++ (with unstable-pkgs; [
|
||||||
|
"${quickshell}/lib/qt-6/qml/"
|
||||||
|
]);
|
||||||
|
};
|
||||||
|
|
||||||
nixpkgs.config = {
|
nixpkgs.config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
cudaSupport = true;
|
cudaSupport = true;
|
||||||
|
|
|
||||||
|
|
@ -26,9 +26,7 @@ let
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
activitywatchPackages =
|
activitywatchPackages = pkgs.qt6Packages.callPackage "${pkgs.path}/pkgs/applications/office/activitywatch" { };
|
||||||
pkgs.qt6Packages.callPackage "${pkgs.path}/pkgs/applications/office/activitywatch"
|
|
||||||
{ };
|
|
||||||
activitywatchFixed = pkgs.activitywatch.override {
|
activitywatchFixed = pkgs.activitywatch.override {
|
||||||
aw-server-rust = pkgs.aw-server-rust.overrideAttrs (oldAttrs: {
|
aw-server-rust = pkgs.aw-server-rust.overrideAttrs (oldAttrs: {
|
||||||
env = (oldAttrs.env or { }) // {
|
env = (oldAttrs.env or { }) // {
|
||||||
|
|
@ -38,16 +36,31 @@ let
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
codexbarWrapped = pkgs.writeShellApplication {
|
||||||
vesktopWrapped = pkgs.vesktop.overrideAttrs (oldAttrs: {
|
name = "codexbar";
|
||||||
nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ];
|
runtimeInputs = [ pkgs.bubblewrap ];
|
||||||
postFixup = (oldAttrs.postFixup or "") + ''
|
text = ''
|
||||||
wrapProgram $out/bin/vesktop \
|
exec bwrap \
|
||||||
--prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath [ pkgs.pipewire ]}" \
|
--die-with-parent \
|
||||||
--add-flags "--ozone-platform=wayland --enable-features=WebRTCPipeWireCapturer,WaylandWindowDecorations"
|
--bind / / \
|
||||||
|
--dev-bind /dev /dev \
|
||||||
|
--proc /proc \
|
||||||
|
--tmpfs /usr \
|
||||||
|
--dir /usr/bin \
|
||||||
|
--ro-bind ${pkgs.which}/bin/which /usr/bin/which \
|
||||||
|
-- \
|
||||||
|
${codexbar.packages.${pkgs.system}.default}/bin/codexbar "$@"
|
||||||
'';
|
'';
|
||||||
});
|
};
|
||||||
|
vesktopWrapped = pkgs.symlinkJoin {
|
||||||
|
name = "vesktop-pipewire";
|
||||||
|
paths = [ pkgs.vesktop ];
|
||||||
|
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||||
|
postBuild = ''
|
||||||
|
wrapProgram $out/bin/vesktop \
|
||||||
|
--add-flags "--enable-features=WebRTCPipeWireCapturer,WaylandWindowDecorations"
|
||||||
|
'';
|
||||||
|
};
|
||||||
# system = stdenv.hostPlatform.system;
|
# system = stdenv.hostPlatform.system;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
@ -66,7 +79,7 @@ in
|
||||||
firefox
|
firefox
|
||||||
unrar
|
unrar
|
||||||
wine
|
wine
|
||||||
codexbar.packages.${pkgs.system}.default
|
codexbarWrapped
|
||||||
codex
|
codex
|
||||||
jellyfin-desktop
|
jellyfin-desktop
|
||||||
(kdePackages.qt6ct.overrideAttrs (oldAttrs: {
|
(kdePackages.qt6ct.overrideAttrs (oldAttrs: {
|
||||||
|
|
@ -418,9 +431,6 @@ in
|
||||||
];
|
];
|
||||||
zen-browser = {
|
zen-browser = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPrefs = ''
|
|
||||||
user_pref("media.webrtc.camera.allow-pipewire", true);
|
|
||||||
'';
|
|
||||||
extraPrefsFiles = [
|
extraPrefsFiles = [
|
||||||
# (builtins.fetchurl {
|
# (builtins.fetchurl {
|
||||||
# url = "https://raw.githubusercontent.com/MrOtherGuy/fx-autoconfig/master/program/config.js";
|
# url = "https://raw.githubusercontent.com/MrOtherGuy/fx-autoconfig/master/program/config.js";
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue