summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock66
-rw-r--r--hm/env/niri/binds.nix2
-rw-r--r--hm/env/niri/niri.nix4
-rw-r--r--hm/soft/media.nix25
-rw-r--r--hm/soft/nixcord.nix213
-rw-r--r--hm/soft/obs.nix9
-rw-r--r--hosts/desktop/configuration.nix4
-rw-r--r--sys/core/bootloader.nix1
-rw-r--r--sys/wm/wm.nix4
9 files changed, 184 insertions, 144 deletions
diff --git a/flake.lock b/flake.lock
index c0d6341..6006a88 100644
--- a/flake.lock
+++ b/flake.lock
@@ -232,11 +232,11 @@
]
},
"locked": {
- "lastModified": 1766282146,
- "narHash": "sha256-0V/nKU93KdYGi+5LB/MVo355obBJw/2z9b2xS3bPJxY=",
+ "lastModified": 1766387499,
+ "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "61fcc9de76b88e55578eb5d79fc80f2b236df707",
+ "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e",
"type": "github"
},
"original": {
@@ -277,11 +277,11 @@
]
},
"locked": {
- "lastModified": 1766361902,
- "narHash": "sha256-UvMyRzpHluglPn7b4wLBCA8DRSiUwzcS9PKhk0bCcmY=",
+ "lastModified": 1766448279,
+ "narHash": "sha256-7exwtYJfU6NbKYOY/NoTUMBQkrhcpi4m5R7QD251J38=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "8d66aa1836d522d7cbfdf7a1f40046010f7cf558",
+ "rev": "809b2b24874a9e92264a0f5dee0e160381165e42",
"type": "github"
},
"original": {
@@ -293,11 +293,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1766349065,
- "narHash": "sha256-FjrwOMqBASOb0lBItQy3HyGPMcLBokzNQ/0oTiI05YA=",
+ "lastModified": 1766445637,
+ "narHash": "sha256-cfQs0hxQO5WuSFjla1+xcC1zyUm+ti+oJ374bVbZrpI=",
"owner": "neovim",
"repo": "neovim",
- "rev": "d1189ea508c888ebf7468be3872c975e4ea264bb",
+ "rev": "49b1a6540f50675a4313fd1e3a88628b46dbe82d",
"type": "github"
},
"original": {
@@ -318,11 +318,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
- "lastModified": 1766368023,
- "narHash": "sha256-Qtgo/ptf+oiPVKP+lnXmrEWCddGOsMJMrwyH/GI04vI=",
+ "lastModified": 1766476201,
+ "narHash": "sha256-lR4K1qtOg9RQYL+Gq19FMXBn3VpDOmRRMFGCqrgVfKs=",
"owner": "sodiboo",
"repo": "niri-flake",
- "rev": "a27b7db4a7e6ea7a613c36ad45f5d9cf201c7603",
+ "rev": "fca6fc926ffa519c1b69350fce6f54debc92991a",
"type": "github"
},
"original": {
@@ -351,11 +351,11 @@
"niri-unstable": {
"flake": false,
"locked": {
- "lastModified": 1766229062,
- "narHash": "sha256-8iBPfiM3w0m7Qrs3PyFyiN+I96ba4owEaSZ9ahgPdqM=",
+ "lastModified": 1766469114,
+ "narHash": "sha256-B5/tCx0IB+asb9IykRFatUH8KBtKENuemQVJCvHu4SU=",
"owner": "YaLTeR",
"repo": "niri",
- "rev": "19e55a2df095d14f9490b79e38193ad4b4e87bb9",
+ "rev": "396097c3ab67a5482a9d7614992c2c603c90e313",
"type": "github"
},
"original": {
@@ -396,11 +396,11 @@
]
},
"locked": {
- "lastModified": 1766332965,
- "narHash": "sha256-A7hWWIFhMPjcf50nNw7Bid4U5E+YT2OKHIs3lWFArus=",
+ "lastModified": 1766476984,
+ "narHash": "sha256-m5V4MhvDet+Pb5RTTo6I7GH2sAVh+H1fWFxZXF0GAUA=",
"owner": "KaylorBen",
"repo": "nixcord",
- "rev": "cc3aa513640220ee0ed624f8dd771a48da6b3d03",
+ "rev": "2677f85e7f66ae2e182ca35d26eb44939908ece3",
"type": "github"
},
"original": {
@@ -458,11 +458,11 @@
},
"nixpkgs-stable_2": {
"locked": {
- "lastModified": 1766014764,
- "narHash": "sha256-+73VffE5GP5fvbib6Hs1Su6LehG+9UV1Kzs90T2gBLA=",
+ "lastModified": 1766399428,
+ "narHash": "sha256-vS6LSOMDOB3s+L6tqw9IGujxnmUAZQnEG+Vi640LayI=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "2b0d2b456e4e8452cf1c16d00118d145f31160f9",
+ "rev": "a6c3a6141ec1b367c58ead3f7f846c772a25f4e5",
"type": "github"
},
"original": {
@@ -474,11 +474,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1766070988,
- "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
+ "lastModified": 1766309749,
+ "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
+ "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
"type": "github"
},
"original": {
@@ -513,11 +513,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1766359807,
- "narHash": "sha256-8V3DSc2lz1UqvxOEZLsHyeFYxsM4Z8fnc0PiHS10Zm0=",
+ "lastModified": 1766443759,
+ "narHash": "sha256-iGDhUPOPyY9NOTNHkhNzZKoz3+OlBNGg451qtvPq/Ic=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "a99d8389c9ec6ca9cf757bd27b6a8c155879696e",
+ "rev": "1787eeda5a2ce35bcd57dbb482718b0d897786ae",
"type": "github"
},
"original": {
@@ -753,11 +753,11 @@
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
- "lastModified": 1766363450,
- "narHash": "sha256-buO37E9GTM4Qh1tvBjpSB/JGWN72EYKMUB/Lt8LrW7w=",
+ "lastModified": 1766429945,
+ "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
- "rev": "bf738fffbb26669d0ba9d7a3ecdba3b47afa8a85",
+ "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e",
"type": "github"
},
"original": {
@@ -775,11 +775,11 @@
"rust-overlay": "rust-overlay_4"
},
"locked": {
- "lastModified": 1766141198,
- "narHash": "sha256-8oZTaxMknO2C/ojPp+ZI5XZi/J7TEeczYp7I4F5x/E8=",
+ "lastModified": 1766376399,
+ "narHash": "sha256-gHUuOYMDMtLsXyi6jbBTc+LCtRh6UZxbuRPKs5B0tnQ=",
"owner": "sxyazi",
"repo": "yazi",
- "rev": "329c5d28f097dc78c10b436e3df2ab5086d382e7",
+ "rev": "2267ac7d9382480123d554f0b06721a21d60f03c",
"type": "github"
},
"original": {
diff --git a/hm/env/niri/binds.nix b/hm/env/niri/binds.nix
index cb0feca..fc452a5 100644
--- a/hm/env/niri/binds.nix
+++ b/hm/env/niri/binds.nix
@@ -87,6 +87,8 @@ in
# --- Window State ---
"Mod+Shift+Q".action = close-window;
+ "Super+Return".action = spawn "obs-cmd" "replay" "save";
+
} // (
# --- Generated Workspace Binds (1-9) ---
builtins.listToAttrs (builtins.concatMap (i: let
diff --git a/hm/env/niri/niri.nix b/hm/env/niri/niri.nix
index eb073e7..cc8899a 100644
--- a/hm/env/niri/niri.nix
+++ b/hm/env/niri/niri.nix
@@ -45,7 +45,7 @@ in
mode = {
width = 2560;
height = 1440;
- refresh = 239.998;
+ # refresh = 239.998;
};
};
};
@@ -82,6 +82,8 @@ in
spawn-at-startup = [
{ command = [ "${lib.getExe pkgs.xwayland-satellite}" ]; }
{ command = [ "awww-daemon" ]; }
+ { command = [ "waybar" ]; }
+ { command = [ "obs" "--disable-missing-files-check" "--startreplaybuffer" ]; }
];
};
home.packages = with pkgs; [
diff --git a/hm/soft/media.nix b/hm/soft/media.nix
index abf3dff..0a17f3e 100644
--- a/hm/soft/media.nix
+++ b/hm/soft/media.nix
@@ -8,8 +8,30 @@ in
programs.mpv = {
enable = true;
config = {
-
+ profile = "gpu-hq";
+ vo = "gpu-next";
+ hwdec = "auto-safe";
+ save-position-on-quit = true;
+ keep-open = "yes";
+ sub-auto = "fuzzy";
+ volume-max = "200";
};
+ scripts = with pkgs.mpvScripts; [
+ webtorrent-mpv-hook
+ visualizer
+ videoclip
+ thumbfast
+ reload
+ mpv-subtitle-lines
+ mpv-notify-send
+ mpv-cheatsheet
+ modernz
+ # modernx
+ memo
+ # builtins.autoload
+ autosubsync-mpv
+ autosub
+ ];
};
programs.yt-dlp = {
enable = true;
@@ -20,6 +42,7 @@ in
syncplay-nogui
ffmpeg
imagemagick
+ exiftool
];
};
}
diff --git a/hm/soft/nixcord.nix b/hm/soft/nixcord.nix
index b0e3396..d31f807 100644
--- a/hm/soft/nixcord.nix
+++ b/hm/soft/nixcord.nix
@@ -7,6 +7,7 @@ in
options.hm.soft.nixcord.enable = lib.mkEnableOption "nixcord configuration";
config = lib.mkIf cfg.enable {
+ home.packages = with pkgs; [ equibop ];
programs.nixcord = {
enable = true;
package = pkgs.discord-krisp;
@@ -17,112 +18,112 @@ in
};
config = {
frameless = true;
- plugins = {
- alwaysExpandRoles = { enable = true; hideArrow = true; };
- alwaysTrust = { enable = true; domain = false; };
- anammox.enable = true;
- betterAudioPlayer.enable = true;
- betterGifAltText.enable = true;
- betterGifPicker.enable = true;
- betterInvites.enable = true;
- betterNotesBox = { enable = true; hide = true; };
- betterQuickReact = { enable = true; columns = 6.0; rows = 1.0; compactMode = true; };
- betterRoleContext.enable = true;
- betterUploadButton.enable = true;
- biggerStreamPreview.enable = true;
- callTimer.enable = true;
- characterCounter = { enable = true; colorEffects = false; };
- cleanChannelName.enable = true;
- clearUrLs.enable = true;
- copyFileContents.enable = true;
- copyStickerLinks.enable = true;
- crashHandler.enable = true;
- customTimestamps.enable = true;
- disableCallIdle.enable = true;
- disableDeepLinks.enable = true;
- dontRoundMyTimestamps.enable = true;
- equicordHelper = { enable = true; noMirroredCamera = true; };
- expressionCloner.enable = true;
- fakeNitro = { enable = true; enableEmojiBypass = false; enableStickerBypass = false; };
- favoriteEmojiFirst.enable = true;
- fixCodeblockGap.enable = true;
- fixFileExtensions.enable = true;
- fixImagesQuality.enable = true;
- fixSpotifyEmbeds.enable = true;
- fixYoutubeEmbeds.enable = true;
- forceOwnerCrown.enable = true;
- friendsSince.enable = true;
- fullSearchContext.enable = true;
- fullUserInChatbox.enable = true;
- gifCollections = { enable = true; preventDuplicates = true; showCopyImageLink = true; };
- gifRoulette = { enable = true; pingOwnerChance = true; };
- guildTagSettings.enable = true;
- homeTyping.enable = true;
- ignoreTerms.enable = true;
- iLoveSpam.enable = true;
- imageFilename.enable = true;
- imageLink.enable = true;
- imageZoom = { enable = true; nearestNeighbour = true; saveZoomValues = true; square = true; };
- imgToGif.enable = true;
- inRole.enable = true;
- inviteDefaults.enable = true;
- memberCount.enable = true;
- mentionAvatars = { enable = true; showAtSymbol = true; };
- messageLinkEmbeds.enable = true;
- messageLogger = { enable = true; ignoreSelf = true; };
- moyai.enable = true;
- musicControls.enable = true;
- neverPausePreviews.enable = true;
- newGuildSettings = { enable = true; messages = 1; };
- newPluginsManager.enable = true;
- noF1.enable = true;
- noMaskedUrlPaste.enable = true;
- noModalAnimation.enable = true;
- noNitroUpsell.enable = true;
- noOnboardingDelay.enable = true;
- noMosaic.enable = true;
- noProfileThemes.enable = true;
- noSystemBadge.enable = true;
- noTypingAnimation.enable = true;
- overrideForumDefaults = { enable = true; defaultLayout = 2; };
- onePingPerDm.enable = true;
- openInApp.enable = true;
- pauseInvitesForever.enable = true;
- permissionFreeWill = { enable = true; lockout = false; };
- permissionsViewer.enable = true;
- pinDMs = { enable = true; canCollapseDmSection = true; };
- pinIcon.enable = true;
- platformIndicators.enable = true;
- quoter.enable = true;
- relationshipNotifier.enable = true;
- roleColorEverywhere.enable = true;
- saveFavoriteGiFs.enable = true;
- sendTimestamps.enable = true;
- serverInfo.enable = true;
- showConnections.enable = true;
- showHiddenChannels = { enable = true; };
- showHiddenThings.enable = true;
- showResourceChannels.enable = true;
- showTimeoutDuration.enable = true;
- spotifyCrack = { enable = true; noSpotifyAutoPause = false; };
- streamerModeOnStream.enable = true;
- typingIndicator = { enable = true; indicatorMode = 2; };
- typingTweaks.enable = true;
- unindent.enable = true;
- universalMention = { enable = true; globalMention = true; };
- unlimitedAccounts.enable = true;
- unlockedAvatarZoom.enable = true;
- userVoiceShow.enable = true;
- validReply.enable = true;
- validUser.enable = true;
- viewIcons = { enable = true; format = "png"; };
- voiceMessages.enable = true;
- volumeBooster.enable = true;
- whoReacted.enable = true;
- whosWatching.enable = true;
- youtubeAdblock.enable = true;
- youtubeDescription.enable = true;
- };
+ # plugins = {
+ # alwaysExpandRoles = { enable = true; hideArrow = true; };
+ # alwaysTrust = { enable = true; domain = false; };
+ # anammox.enable = true;
+ # betterAudioPlayer.enable = true;
+ # betterGifAltText.enable = true;
+ # betterGifPicker.enable = true;
+ # betterInvites.enable = true;
+ # betterNotesBox = { enable = true; hide = true; };
+ # betterQuickReact = { enable = true; columns = 6.0; rows = 1.0; compactMode = true; };
+ # betterRoleContext.enable = true;
+ # betterUploadButton.enable = true;
+ # biggerStreamPreview.enable = true;
+ # callTimer.enable = true;
+ # characterCounter = { enable = true; colorEffects = false; };
+ # cleanChannelName.enable = true;
+ # clearUrLs.enable = true;
+ # copyFileContents.enable = true;
+ # copyStickerLinks.enable = true;
+ # crashHandler.enable = true;
+ # customTimestamps.enable = true;
+ # disableCallIdle.enable = true;
+ # disableDeepLinks.enable = true;
+ # dontRoundMyTimestamps.enable = true;
+ # equicordHelper = { enable = true; noMirroredCamera = true; };
+ # expressionCloner.enable = true;
+ # fakeNitro = { enable = true; enableEmojiBypass = false; enableStickerBypass = false; };
+ # favoriteEmojiFirst.enable = true;
+ # fixCodeblockGap.enable = true;
+ # fixFileExtensions.enable = true;
+ # fixImagesQuality.enable = true;
+ # fixSpotifyEmbeds.enable = true;
+ # fixYoutubeEmbeds.enable = true;
+ # forceOwnerCrown.enable = true;
+ # friendsSince.enable = true;
+ # fullSearchContext.enable = true;
+ # fullUserInChatbox.enable = true;
+ # gifCollections = { enable = true; preventDuplicates = true; showCopyImageLink = true; };
+ # gifRoulette = { enable = true; pingOwnerChance = true; };
+ # guildTagSettings.enable = true;
+ # homeTyping.enable = true;
+ # ignoreTerms.enable = true;
+ # iLoveSpam.enable = true;
+ # imageFilename.enable = true;
+ # imageLink.enable = true;
+ # imageZoom = { enable = true; nearestNeighbour = true; saveZoomValues = true; square = true; };
+ # imgToGif.enable = true;
+ # inRole.enable = true;
+ # inviteDefaults.enable = true;
+ # memberCount.enable = true;
+ # mentionAvatars = { enable = true; showAtSymbol = true; };
+ # messageLinkEmbeds.enable = true;
+ # messageLogger = { enable = true; ignoreSelf = true; };
+ # moyai.enable = true;
+ # musicControls.enable = true;
+ # neverPausePreviews.enable = true;
+ # newGuildSettings = { enable = true; messages = 1; };
+ # newPluginsManager.enable = true;
+ # noF1.enable = true;
+ # noMaskedUrlPaste.enable = true;
+ # noModalAnimation.enable = true;
+ # noNitroUpsell.enable = true;
+ # noOnboardingDelay.enable = true;
+ # noMosaic.enable = true;
+ # noProfileThemes.enable = true;
+ # noSystemBadge.enable = true;
+ # noTypingAnimation.enable = true;
+ # overrideForumDefaults = { enable = true; defaultLayout = 2; };
+ # onePingPerDm.enable = true;
+ # openInApp.enable = true;
+ # pauseInvitesForever.enable = true;
+ # permissionFreeWill = { enable = true; lockout = false; };
+ # permissionsViewer.enable = true;
+ # pinDMs = { enable = true; canCollapseDmSection = true; };
+ # pinIcon.enable = true;
+ # platformIndicators.enable = true;
+ # quoter.enable = true;
+ # relationshipNotifier.enable = true;
+ # roleColorEverywhere.enable = true;
+ # saveFavoriteGiFs.enable = true;
+ # sendTimestamps.enable = true;
+ # serverInfo.enable = true;
+ # showConnections.enable = true;
+ # showHiddenChannels = { enable = true; };
+ # showHiddenThings.enable = true;
+ # showResourceChannels.enable = true;
+ # showTimeoutDuration.enable = true;
+ # spotifyCrack = { enable = true; noSpotifyAutoPause = false; };
+ # streamerModeOnStream.enable = true;
+ # typingIndicator = { enable = true; indicatorMode = 2; };
+ # typingTweaks.enable = true;
+ # unindent.enable = true;
+ # universalMention = { enable = true; globalMention = true; };
+ # unlimitedAccounts.enable = true;
+ # unlockedAvatarZoom.enable = true;
+ # userVoiceShow.enable = true;
+ # validReply.enable = true;
+ # validUser.enable = true;
+ # viewIcons = { enable = true; format = "png"; };
+ # voiceMessages.enable = true;
+ # volumeBooster.enable = true;
+ # whoReacted.enable = true;
+ # whosWatching.enable = true;
+ # youtubeAdblock.enable = true;
+ # youtubeDescription.enable = true;
+ # };
};
};
};
diff --git a/hm/soft/obs.nix b/hm/soft/obs.nix
index f0ae054..c6bf326 100644
--- a/hm/soft/obs.nix
+++ b/hm/soft/obs.nix
@@ -7,6 +7,15 @@ in
config = lib.mkIf cfg.enable {
programs.obs-studio = {
enable = true;
+ plugins = with pkgs.obs-studio-plugins; [
+ wlrobs
+ obs-websocket
+ obs-pipewire-audio-capture
+ ];
+ };
+ home.packages = [ pkgs.obs-cmd ];
+ home.sessionVariables = {
+ OBS_WEBSOCKET_URL = "obsws://localhost:4455/3uE66N4j0bTv2W1M";
};
};
}
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 316a573..0482f23 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -9,6 +9,9 @@
../../sys/default.nix
];
+ boot.kernelParams = [
+ "video=DP-1:2560x1440@240"
+ ];
sys = {
core = {
allowUnfree.enable = true;
@@ -62,6 +65,7 @@
ollama.enable = true;
};
wm = {
+ enable = true;
niri.enable = true;
};
};
diff --git a/sys/core/bootloader.nix b/sys/core/bootloader.nix
index 3564451..ff0aad5 100644
--- a/sys/core/bootloader.nix
+++ b/sys/core/bootloader.nix
@@ -16,6 +16,7 @@ in
}
(lib.mkIf (cfg == "systemd-boot") {
+ boot.consoleLogLevel = 0;
boot.loader = {
systemd-boot.enable = true;
systemd-boot.editor = false;
diff --git a/sys/wm/wm.nix b/sys/wm/wm.nix
index efe39ab..5374264 100644
--- a/sys/wm/wm.nix
+++ b/sys/wm/wm.nix
@@ -8,15 +8,13 @@ in
];
options.sys.wm.enable = lib.mkEnableOption "enables shared wm features";
-
- config = lib.mkIf (cfg.enable || cfg.niri.enable or false) {
+ config = lib.mkIf cfg.enable {
services.dbus.enable = true;
xdg.portal = {
enable = true;
xdgOpenUsePortal = true;
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
- config.common.default = [ "gtk" ];
};
};
}
generated by cgit v1.3 (git 2.53.0) at 2026-08-17 04:57:08 +0000