Skip to content
Merged

Niri #241

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 125 additions & 27 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@
url = "github:different-name/steam-config-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
plasma-manager = {
url = "github:nix-community/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixos-avf = {
url = "github:nix-community/nixos-avf";
Expand All @@ -56,6 +51,9 @@
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
# niri compositor: NixOS + home-manager modules with build-time config
# validation. Keeps its own nixpkgs pin so its binary cache stays hit.
niri.url = "github:sodiboo/niri-flake";
mac-app-util = {
# Pinned to nixos-25.11 (sbcl 2.5.10) instead of following our nixos-26.05:
# 26.05's sbcl 2.6.4 breaks cl-nix-lite's fare-quasiquote build
Expand Down
13 changes: 13 additions & 0 deletions home/common/glide/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@

programs.glide-browser = {
enable = true;

policies.SearchEngines = {
Default = "Kagi";
Remove = [ "Google" "Bing" "DuckDuckGo" "Amazon.com" "eBay" "Wikipedia (en)" "Perplexity" ];
Add = [{
Name = "Kagi";
URLTemplate = "https://kagi.com/search?q={searchTerms}";
Method = "GET";
IconURL = "https://kagi.com/favicon.ico";
SuggestURLTemplate = "https://kagi.com/api/autosuggest?q={searchTerms}";
Alias = "kagi";
}];
};
};

home.file.".config/glide" = {
Expand Down
8 changes: 8 additions & 0 deletions home/common/stylix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ in
autoEnable = lib.mkDefault true;
image = lib.mkDefault null;

# Themed cursor. niri-flake's stylix target reads this to set niri's xcursor
# theme + size; also themes GTK/other apps' cursors. (Global, not niri-only.)
cursor = {
name = lib.mkDefault "Bibata-Modern-Classic";
package = lib.mkDefault pkgs.bibata-cursors;
size = lib.mkDefault 24;
};

fonts = {
monospace = {
name = lib.mkOptionDefault "MonoLisa Nerd Font";
Expand Down
10 changes: 3 additions & 7 deletions home/linux/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ features, hostName, lib, ... }:
{ features, lib, ... }:
{
imports = [
./theme.nix
Expand All @@ -7,11 +7,7 @@
./mpv
] ++ lib.optionals features.gaming [
./games
] ++ lib.optionals (features.desktopEnvironment == "plasma") [
./plasma
] ++ lib.optionals (features.desktopEnvironment == "sway") [
./sway
] ++ lib.optionals (features.desktopEnvironment != null && features.desktopEnvironment != "sway") [
./${features.desktopEnvironment}/host/${hostName}.nix
] ++ lib.optionals (features.desktopEnvironment == "niri") [
./niri
];
}
1 change: 1 addition & 0 deletions home/linux/desktop.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ in
filezilla
flashprint
crosspipe
kdePackages.dolphin
kdePackages.kdenlive
glaxnimate
krita
Expand Down
Loading
Loading