swarsel/.dotfiles
1
0
Fork 0
mirror of https://github.com/Swarsel/.dotfiles.git synced 2025-12-06 09:07:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: SwayFX and Syncthingtray

Browse source 
Circumvents an upstream error that fails the sandbox for SwayFX due to
always requiring DRM device

Fix floating syncthingtray windows not showing due to recent versions
not setting app_id correctly
This commit is contained in:
Swarsel 2024-05-28 23:43:11 +02:00
parent ca08aef2ad
commit 85c3c8b69f
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
10 changed files with 259 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Nix.org
View file

@ -120,7 +120,8 @@ This is where the theme for the whole OS is defined. This noweb-ref section cann
{ command = "nextcloud --background";} { command = "nextcloud --background";}
# { command = "spotify";} # { command = "spotify";}
{ command = "discord --start-minimized";} { command = "discord --start-minimized";}
{ command = "element-desktop --hidden";} # { command = "element-desktop --hidden";}
{ command = "element-desktop --hidden -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";}
{ command = "ANKI_WAYLAND=1 anki";} { command = "ANKI_WAYLAND=1 anki";}
{ command = "OBSIDIAN_USE_WAYLAND=1 obsidian";} { command = "OBSIDIAN_USE_WAYLAND=1 obsidian";}
{ command = "nm-applet";} { command = "nm-applet";}
@ -220,6 +221,7 @@ This is where the theme for the whole OS is defined. This noweb-ref section cann
nixpkgs-mautrix-signal, nixpkgs-mautrix-signal,
nix-gaming, nix-gaming,
nixos-hardware, nixos-hardware,
nix-alien,
#+end_src #+end_src
@ -290,6 +292,11 @@ This is where the theme for the whole OS is defined. This noweb-ref section cann
url = github:NixOS/nixos-hardware/master; url = github:NixOS/nixos-hardware/master;
}; };
# dynamic library loading
nix-alien = {
url = github:thiagokokada/nix-alien;
};
#+end_src #+end_src
*** let *** let
@ -320,6 +327,14 @@ This is where the theme for the whole OS is defined. This noweb-ref section cann
# NixOS modules that can only be used on NixOS systems # NixOS modules that can only be used on NixOS systems
nixModules = [ stylix.nixosModules.stylix nixModules = [ stylix.nixosModules.stylix
./profiles/common/nixos.nix ./profiles/common/nixos.nix
# dynamic library loading
({ self, system, ... }: {
environment.systemPackages = with self.inputs.nix-alien.packages.${system}; [
nix-alien
];
# needed for `nix-alien-ld`
programs.nix-ld.enable = true;
})
]; ];
# Home-Manager modules wanted on non-NixOS systems # Home-Manager modules wanted on non-NixOS systems
@ -4705,6 +4720,7 @@ Also, I define some useful shell scripts here.
transmission transmission
mktorrent mktorrent
hexchat hexchat
hugo
# kyria # kyria
qmk qmk
@ -5183,7 +5199,7 @@ TODO: Non-NixOS machines (=sp3) should not use these by default, but instead the
element = { element = {
name = "Element Matrix Client"; name = "Element Matrix Client";
genericName = "Element"; genericName = "Element";
exec = "element-desktop"; exec = "element-desktop -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";
terminal = false; terminal = false;
categories = [ "Application"]; categories = [ "Application"];
}; };
@ -6323,8 +6339,9 @@ I am currently using SwayFX, which adds some nice effects to sway, like rounded
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
# package = pkgs.swayfx; checkConfig = false; # delete this line once SwayFX is fixed upstream
package = pkgs.sway; package = pkgs.swayfx;
# package = pkgs.sway;
systemd.enable = true; systemd.enable = true;
systemd.xdgAutostart = true; systemd.xdgAutostart = true;
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
@ -6452,6 +6469,7 @@ I am currently using SwayFX, which adds some nice effects to sway, like rounded
{app_id = "blueman";} {app_id = "blueman";}
{app_id = "pavucontrol";} {app_id = "pavucontrol";}
{app_id = "syncthingtray";} {app_id = "syncthingtray";}
{title = "Syncthing Tray";}
{app_id = "SchildiChat";} {app_id = "SchildiChat";}
{app_id = "Element";} {app_id = "Element";}
{app_id = "com.nextcloud.desktopclient.nextcloud";} {app_id = "com.nextcloud.desktopclient.nextcloud";}
@ -6513,13 +6531,13 @@ I am currently using SwayFX, which adds some nice effects to sway, like rounded
title="spotifytui"; title="spotifytui";
}; };
} }
{ # {
command = "resize set width 60 ppt height 60 ppt, sticky enable, move container to scratchpad"; # command = "resize set width 60 ppt height 60 ppt, sticky enable, move container to scratchpad";
criteria = { # criteria = {
app_id="^$"; # app_id="^$";
class="^$"; # class="^$";
}; # };
} # }
{ {
command = "resize set width 60 ppt height 60 ppt, sticky enable, move container to scratchpad"; command = "resize set width 60 ppt height 60 ppt, sticky enable, move container to scratchpad";
@ -6598,7 +6616,7 @@ I am currently using SwayFX, which adds some nice effects to sway, like rounded
exec systemctl --user import-environment exec systemctl --user import-environment
${swayfxSettingsOff} ${swayfxSettings}
"; ";
}; };

250
flake.lock generated
View file

@ -144,11 +144,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1715101438, "lastModified": 1716342612,
"narHash": "sha256-xd5lymHwykYlqCPap6m7QG71Xuv0ShMjulQOLT8Hg6A=", "narHash": "sha256-D8Zj8ftu5Zpgkb3wbQoxsRfJ9cGJxDdauFtuPHenD8E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "2fd9e33a0e73cd390f35ecefe89ec9e271e4c2cb", "rev": "6eb679f5e75b80580e8d3fa1594369e128b37911",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -174,6 +174,21 @@
} }
}, },
"flake-compat_2": { "flake-compat_2": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@ -215,11 +230,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1714641030, "lastModified": 1715865404,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -265,6 +280,24 @@
} }
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -320,16 +353,16 @@
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1698794309, "lastModified": 1713702291,
"narHash": "sha256-/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=", "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "a7c169c6c29cf02a4c392fa0acbbc5f5072823e7", "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "GNOME", "owner": "GNOME",
"ref": "45.1", "ref": "46.1",
"repo": "gnome-shell", "repo": "gnome-shell",
"type": "github" "type": "github"
} }
@ -341,11 +374,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715077503, "lastModified": 1715930644,
"narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6e277d9566de9976f47228dd8c580b97488734d4", "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -384,11 +417,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711915616, "lastModified": 1714981474,
"narHash": "sha256-co6LoFA+j6BZEeJNSR8nZ4oOort5qYPskjrDHBaJgmo=", "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "820be197ccf3adaad9a8856ef255c13b6cc561a6", "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -421,6 +454,47 @@
"type": "github" "type": "github"
} }
}, },
"nix-alien": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3",
"nix-filter": "nix-filter",
"nix-index-database": "nix-index-database",
"nixpkgs": [
"nix-alien",
"nix-index-database",
"nixpkgs"
]
},
"locked": {
"lastModified": 1715754082,
"narHash": "sha256-2hAydsdMk6QmDar+16ryyn+pVksxudwC5vRiatJbysM=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "ea6ebda03c5537eebbb93af57ca6f2c2979981be",
"type": "github"
},
"original": {
"owner": "thiagokokada",
"repo": "nix-alien",
"type": "github"
}
},
"nix-filter": {
"locked": {
"lastModified": 1710156097,
"narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "3342559a24e85fc164b295c3444e8a139924675b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-formatter-pack": { "nix-formatter-pack": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -447,14 +521,14 @@
"nix-gaming": { "nix-gaming": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1714872073, "lastModified": 1716340597,
"narHash": "sha256-Gybo6MqJ2tva9vMaSxOgie8uVObiP0LxD2FMokiR0X4=", "narHash": "sha256-OlN/h6w4Hf5YP4ZPdqzxix3eSPCwYqInUMvsTIERB8M=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "b85b9c3afa1bfee0150580eb76c52e572a85a6a9", "rev": "36d3115d7707e0f99b42e89ed7bb9ad88ad102e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -463,6 +537,24 @@
"type": "github" "type": "github"
} }
}, },
"nix-index-database": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1715483403,
"narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "f9027322f48b427da23746aa359a6510dfcd0228",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nix-on-droid": { "nix-on-droid": {
"inputs": { "inputs": {
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
@ -490,8 +582,8 @@
}, },
"nixgl": { "nixgl": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1713543440, "lastModified": 1713543440,
@ -530,11 +622,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713783234, "lastModified": 1716210724,
"narHash": "sha256-3yh0nqI1avYUmmtqqTW3EVfwaLE+9ytRWxsA5aWtmyI=", "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "722b512eb7e6915882f39fff0e4c9dd44f42b77e", "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -545,11 +637,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1715010655, "lastModified": 1716173274,
"narHash": "sha256-FmdhvR/hgBkPDvIv/HOEIQsSMaVXh8wvTrnep8dF3Jc=", "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d1659c9eb8af718118fb4bbe2c86797c8b8623eb", "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -621,11 +713,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1714971268, "lastModified": 1716218643,
"narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -653,11 +745,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1714858427, "lastModified": 1716061101,
"narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=", "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76", "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -669,11 +761,27 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1714809261, "lastModified": 1715266358,
"narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f1010e0469db743d14519a1efd37e23f8513d714",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1716062047,
"narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d32560238207b8e26d88b265207b216ee46b8450", "rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -683,7 +791,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1660551188, "lastModified": 1660551188,
"narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=",
@ -698,13 +806,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1714906307, "lastModified": 1716293225,
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -714,13 +822,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1714809261, "lastModified": 1716062047,
"narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d32560238207b8e26d88b265207b216ee46b8450", "rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -730,13 +838,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1713596654, "lastModified": 1714912032,
"narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be", "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -796,11 +904,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1715119845, "lastModified": 1716346130,
"narHash": "sha256-F95GvBNyRS0FBiSO/y9MrFJ8Xbwl4D88/iyLgaAfa2M=", "narHash": "sha256-o4Tk7LpBgtJxf4eZQojpd0FR1mWNyy+mlzrouAvIzQ0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e771528ea78a7dd751904f909790956f2b0fde66", "rev": "d69724e2c7a808d107407f38f99c56fa50394df4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -866,12 +974,13 @@
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"home-manager": "home-manager", "home-manager": "home-manager",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"nix-alien": "nix-alien",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nix-on-droid": "nix-on-droid", "nix-on-droid": "nix-on-droid",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_5",
"nixpkgs-mautrix-signal": "nixpkgs-mautrix-signal", "nixpkgs-mautrix-signal": "nixpkgs-mautrix-signal",
"nur": "nur", "nur": "nur",
"pia": "pia", "pia": "pia",
@ -906,15 +1015,15 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_6",
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1715035358, "lastModified": 1716244104,
"narHash": "sha256-RY6kqhpCPa/q3vbqt3iYRyjO3hJz9KZnshMjbpPon8o=", "narHash": "sha256-XXbqfkyWe0d0O+zqRQWi2oXi6wYDmTzXedFkBRwx1VI=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "893e3df091f6838f4f9d71c61ab079d5c5dedbd1", "rev": "fddd52460e3332eedd8a0043af5675338a5b3e0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -932,17 +1041,17 @@
"base16-kitty": "base16-kitty", "base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux", "base16-tmux": "base16-tmux",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_3",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_3", "home-manager": "home-manager_3",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1715108364, "lastModified": 1716206302,
"narHash": "sha256-6AlOCZCSEpdHEpRQ8pwaGkbfSHVx11+e1+1CMp8+Huc=", "narHash": "sha256-5Qc3aQGVyPEOuN82zVamStaV81HebHvLjk3fGfpyCPY=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "8f7abd2252d0d773ca202cf2c190b47d439f045d", "rev": "81df8443556335016d6f0bc22630a95776a56d8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -981,6 +1090,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,

14
flake.nix
View file

@ -68,6 +68,11 @@
url = github:NixOS/nixos-hardware/master; url = github:NixOS/nixos-hardware/master;
}; };
# dynamic library loading
nix-alien = {
url = github:thiagokokada/nix-alien;
};
}; };
outputs = inputs@{ outputs = inputs@{
@ -87,6 +92,7 @@
nixpkgs-mautrix-signal, nixpkgs-mautrix-signal,
nix-gaming, nix-gaming,
nixos-hardware, nixos-hardware,
nix-alien,
... ...
}: let }: let
@ -116,6 +122,14 @@
# NixOS modules that can only be used on NixOS systems # NixOS modules that can only be used on NixOS systems
nixModules = [ stylix.nixosModules.stylix nixModules = [ stylix.nixosModules.stylix
./profiles/common/nixos.nix ./profiles/common/nixos.nix
# dynamic library loading
({ self, system, ... }: {
environment.systemPackages = with self.inputs.nix-alien.packages.${system}; [
nix-alien
];
# needed for `nix-alien-ld`
programs.nix-ld.enable = true;
})
]; ];
# Home-Manager modules wanted on non-NixOS systems # Home-Manager modules wanted on non-NixOS systems

3
profiles/TEMPLATE/home.nix
View file

@ -128,7 +128,8 @@
{ command = "nextcloud --background";} { command = "nextcloud --background";}
# { command = "spotify";} # { command = "spotify";}
{ command = "discord --start-minimized";} { command = "discord --start-minimized";}
{ command = "element-desktop --hidden";} # { command = "element-desktop --hidden";}
{ command = "element-desktop --hidden -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";}
{ command = "ANKI_WAYLAND=1 anki";} { command = "ANKI_WAYLAND=1 anki";}
{ command = "OBSIDIAN_USE_WAYLAND=1 obsidian";} { command = "OBSIDIAN_USE_WAYLAND=1 obsidian";}
{ command = "nm-applet";} { command = "nm-applet";}

25
profiles/common/home.nix
View file

@ -44,6 +44,7 @@
transmission transmission
mktorrent mktorrent
hexchat hexchat
hugo
# kyria # kyria
qmk qmk
@ -483,7 +484,7 @@ xdg.desktopEntries = {
element = { element = {
name = "Element Matrix Client"; name = "Element Matrix Client";
genericName = "Element"; genericName = "Element";
exec = "element-desktop"; exec = "element-desktop -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";
terminal = false; terminal = false;
categories = [ "Application"]; categories = [ "Application"];
}; };
@ -1518,8 +1519,9 @@ group-by=category
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
# package = pkgs.swayfx; checkConfig = false; # delete this line once SwayFX is fixed upstream
package = pkgs.sway; package = pkgs.swayfx;
# package = pkgs.sway;
systemd.enable = true; systemd.enable = true;
systemd.xdgAutostart = true; systemd.xdgAutostart = true;
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
@ -1647,6 +1649,7 @@ wayland.windowManager.sway = {
{app_id = "blueman";} {app_id = "blueman";}
{app_id = "pavucontrol";} {app_id = "pavucontrol";}
{app_id = "syncthingtray";} {app_id = "syncthingtray";}
{title = "Syncthing Tray";}
{app_id = "SchildiChat";} {app_id = "SchildiChat";}
{app_id = "Element";} {app_id = "Element";}
{app_id = "com.nextcloud.desktopclient.nextcloud";} {app_id = "com.nextcloud.desktopclient.nextcloud";}
@ -1708,13 +1711,13 @@ wayland.windowManager.sway = {
title="spotifytui"; title="spotifytui";
}; };
} }
{ # {
command = "resize set width 60 ppt height 60 ppt, sticky enable, move container to scratchpad"; # command = "resize set width 60 ppt height 60 ppt, sticky enable, move container to scratchpad";
criteria = { # criteria = {
app_id="^$"; # app_id="^$";
class="^$"; # class="^$";
}; # };
} # }
{ {
command = "resize set width 60 ppt height 60 ppt, sticky enable, move container to scratchpad"; command = "resize set width 60 ppt height 60 ppt, sticky enable, move container to scratchpad";
@ -1793,7 +1796,7 @@ wayland.windowManager.sway = {
exec systemctl --user import-environment exec systemctl --user import-environment
${swayfxSettingsOff} ${swayfxSettings}
"; ";
}; };

3
profiles/fourside/home.nix
View file

@ -104,7 +104,8 @@
{ command = "nextcloud --background";} { command = "nextcloud --background";}
# { command = "spotify";} # { command = "spotify";}
{ command = "discord --start-minimized";} { command = "discord --start-minimized";}
{ command = "element-desktop --hidden";} # { command = "element-desktop --hidden";}
{ command = "element-desktop --hidden -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";}
{ command = "ANKI_WAYLAND=1 anki";} { command = "ANKI_WAYLAND=1 anki";}
{ command = "OBSIDIAN_USE_WAYLAND=1 obsidian";} { command = "OBSIDIAN_USE_WAYLAND=1 obsidian";}
{ command = "nm-applet";} { command = "nm-applet";}

3
profiles/onett/home.nix
View file

@ -117,7 +117,8 @@
{ command = "nextcloud --background";} { command = "nextcloud --background";}
# { command = "spotify";} # { command = "spotify";}
{ command = "discord --start-minimized";} { command = "discord --start-minimized";}
{ command = "element-desktop --hidden";} # { command = "element-desktop --hidden";}
{ command = "element-desktop --hidden -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";}
{ command = "ANKI_WAYLAND=1 anki";} { command = "ANKI_WAYLAND=1 anki";}
{ command = "OBSIDIAN_USE_WAYLAND=1 obsidian";} { command = "OBSIDIAN_USE_WAYLAND=1 obsidian";}
{ command = "nm-applet";} { command = "nm-applet";}

3
profiles/stand/home.nix
View file

@ -84,7 +84,8 @@
{ command = "nextcloud --background";} { command = "nextcloud --background";}
# { command = "spotify";} # { command = "spotify";}
{ command = "discord --start-minimized";} { command = "discord --start-minimized";}
{ command = "element-desktop --hidden";} # { command = "element-desktop --hidden";}
{ command = "element-desktop --hidden -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";}
{ command = "ANKI_WAYLAND=1 anki";} { command = "ANKI_WAYLAND=1 anki";}
{ command = "OBSIDIAN_USE_WAYLAND=1 obsidian";} { command = "OBSIDIAN_USE_WAYLAND=1 obsidian";}
{ command = "nm-applet";} { command = "nm-applet";}

3
profiles/threed/home.nix
View file

@ -91,7 +91,8 @@
{ command = "nextcloud --background";} { command = "nextcloud --background";}
# { command = "spotify";} # { command = "spotify";}
{ command = "discord --start-minimized";} { command = "discord --start-minimized";}
{ command = "element-desktop --hidden";} # { command = "element-desktop --hidden";}
{ command = "element-desktop --hidden -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";}
{ command = "ANKI_WAYLAND=1 anki";} { command = "ANKI_WAYLAND=1 anki";}
{ command = "OBSIDIAN_USE_WAYLAND=1 obsidian";} { command = "OBSIDIAN_USE_WAYLAND=1 obsidian";}
{ command = "nm-applet";} { command = "nm-applet";}

3
profiles/twoson/home.nix
View file

@ -117,7 +117,8 @@
{ command = "nextcloud --background";} { command = "nextcloud --background";}
# { command = "spotify";} # { command = "spotify";}
{ command = "discord --start-minimized";} { command = "discord --start-minimized";}
{ command = "element-desktop --hidden";} # { command = "element-desktop --hidden";}
{ command = "element-desktop --hidden -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";}
{ command = "ANKI_WAYLAND=1 anki";} { command = "ANKI_WAYLAND=1 anki";}
{ command = "OBSIDIAN_USE_WAYLAND=1 obsidian";} { command = "OBSIDIAN_USE_WAYLAND=1 obsidian";}
{ command = "nm-applet";} { command = "nm-applet";}