Compare commits

...

4 Commits

12 changed files with 333 additions and 514 deletions
Generated
+259 -482
View File
File diff suppressed because it is too large Load Diff
+43 -7
View File
@@ -20,6 +20,7 @@
nixos-wsl = { nixos-wsl = {
url = "github:nix-community/NixOS-WSL"; url = "github:nix-community/NixOS-WSL";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat";
}; };
# Flake organization tools # Flake organization tools
@@ -40,11 +41,11 @@
# Useful modules # Useful modules
# keep-sorted start block=yes # keep-sorted start block=yes
catppuccin = { impermanence = {
url = "github:catppuccin/nix"; url = "github:nix-community/impermanence";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
}; };
impermanence.url = "github:nix-community/impermanence";
# TODO: sops-nix: remove pr patch once merged # TODO: sops-nix: remove pr patch once merged
# https://github.com/Mic92/sops-nix/pull/779 # https://github.com/Mic92/sops-nix/pull/779
sops-nix = { sops-nix = {
@@ -54,6 +55,8 @@
stylix = { stylix = {
url = "github:danth/stylix"; url = "github:danth/stylix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts";
inputs.systems.follows = "systems";
}; };
system76-scheduler-niri = { system76-scheduler-niri = {
url = "github:Kirottu/system76-scheduler-niri"; url = "github:Kirottu/system76-scheduler-niri";
@@ -66,6 +69,9 @@
angrr = { angrr = {
url = "github:linyinfeng/angrr"; url = "github:linyinfeng/angrr";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat";
inputs.flake-parts.follows = "flake-parts";
inputs.treefmt-nix.follows = "treefmt";
}; };
darkly = { darkly = {
url = "github:Bali10050/Darkly"; url = "github:Bali10050/Darkly";
@@ -78,19 +84,35 @@
go-musicfox = { go-musicfox = {
url = "github:imxyy1soope1/go-musicfox"; url = "github:imxyy1soope1/go-musicfox";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts";
inputs.devenv.follows = "devenv";
inputs.nix2container.inputs.flake-utils.follows = "flake-utils";
}; };
llm-agents = { llm-agents = {
url = "github:numtide/llm-agents.nix"; url = "github:numtide/llm-agents.nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts";
inputs.systems.follows = "systems";
inputs.treefmt-nix.follows = "treefmt";
};
niri = {
url = "github:sodiboo/niri-flake";
# Not followed intentionally (binary cache)
# inputs.nixpkgs.follows = "nixpkgs";
# inputs.nixpkgs-stable.follows = "nixpkgs-stable";
}; };
niri.url = "github:sodiboo/niri-flake";
noctalia = { noctalia = {
url = "github:noctalia-dev/noctalia-shell/v4.7.5"; url = "github:noctalia-dev/noctalia-shell/v4.7.5";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.noctalia-qs.inputs.treefmt-nix.follows = ""; inputs.noctalia-qs.inputs.nixpkgs.follows = "nixpkgs";
inputs.noctalia-qs.inputs.systems.follows = "systems";
inputs.noctalia-qs.inputs.treefmt-nix.follows = "treefmt";
};
zen = {
url = "github:0xc000022070/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
}; };
zen.inputs.nixpkgs.follows = "nixpkgs";
zen.url = "github:0xc000022070/zen-browser-flake";
# keep-sorted end # keep-sorted end
# Misc # Misc
@@ -103,6 +125,20 @@
flake = false; flake = false;
}; };
my-templates.url = "git+https://git.imxyy.top/imxyy1soope1/flake-templates"; my-templates.url = "git+https://git.imxyy.top/imxyy1soope1/flake-templates";
# Flattened indirect dependencies
flake-compat.url = "github:edolstra/flake-compat";
flake-utils = {
url = "github:numtide/flake-utils";
inputs.systems.follows = "systems";
};
systems.url = "github:nix-systems/default";
devenv = {
url = "github:cachix/devenv";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts";
inputs.flake-compat.follows = "flake-compat";
};
}; };
outputs = outputs =
-1
View File
@@ -126,7 +126,6 @@ in
# Upstream modules # Upstream modules
# keep-sorted start # keep-sorted start
inputs.angrr.nixosModules.angrr inputs.angrr.nixosModules.angrr
inputs.catppuccin.nixosModules.catppuccin
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
inputs.impermanence.nixosModules.impermanence inputs.impermanence.nixosModules.impermanence
inputs.niri.nixosModules.niri inputs.niri.nixosModules.niri
+2 -1
View File
@@ -36,7 +36,8 @@ in
vscode-json-languageserver vscode-json-languageserver
vscode-langservers-extracted vscode-langservers-extracted
taplo # taplo
tombi
typos-lsp typos-lsp
# render-markdown.nvim # render-markdown.nvim
python3Packages.pylatexenc python3Packages.pylatexenc
@@ -81,7 +81,8 @@ local servers = {
java_language_server = {}, java_language_server = {},
jsonls = {}, jsonls = {},
pyright = {}, pyright = {},
taplo = {}, -- taplo = {},
tombi = {},
ts_ls = {}, ts_ls = {},
typos_lsp = {}, typos_lsp = {},
-- keep-sorted end -- keep-sorted end
+1 -2
View File
@@ -2,7 +2,6 @@
config, config,
lib, lib,
pkgs, pkgs,
hostname,
... ...
}: }:
let let
@@ -16,7 +15,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
my.hm.programs.zen-browser = { my.hm.programs.zen-browser = {
enable = true; enable = true;
nativeMessagingHosts = [ pkgs.firefoxpwa ]; nativeMessagingHosts = [ pkgs.master.firefoxpwa ];
policies = { policies = {
# find more options here: https://mozilla.github.io/policy-templates/ # find more options here: https://mozilla.github.io/policy-templates/
DisableAppUpdate = true; DisableAppUpdate = true;
+3 -1
View File
@@ -13,7 +13,9 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
my.hm.home.packages = [ pkgs.splayer ]; my.hm.home.packages = [
pkgs.master.splayer
];
my.persist.homeDirs = [ my.persist.homeDirs = [
".config/SPlayer" ".config/SPlayer"
]; ];
-13
View File
@@ -14,19 +14,6 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
catppuccin.sddm = {
enable = true;
font = "Jetbrains Mono";
fontSize = "18";
};
services.displayManager.sddm = {
package = pkgs.kdePackages.sddm;
settings.Theme = {
CursorTheme = "breeze-dark";
CursorSize = 24;
};
};
my.hm = { my.hm = {
stylix = { stylix = {
enable = true; enable = true;
+17
View File
@@ -114,6 +114,23 @@ Theme=Papirus-Dark
contrast=0 contrast=0
frameContrast=0.2 frameContrast=0.2
[KFileDialog Settings]
Allow Expansion=false
Automatically select filename extension=true
Breadcrumb Navigation=true
Decoration position=2
Show Full Path=false
Show Inline Previews=true
Show Preview=false
Show Speedbar=true
Show hidden files=false
Sort by=Name
Sort directories first=true
Sort hidden files last=false
Sort reversed=false
Speedbar Width=154
View Style=DetailTree
[WM] [WM]
activeBackground=34,34,34 activeBackground=34,34,34
activeBlend=255,255,255 activeBlend=255,255,255
+4 -2
View File
@@ -20,9 +20,11 @@ in
package = pkg; package = pkg;
}; };
services.displayManager = { services.displayManager = {
sddm = { ly = {
enable = true; enable = true;
wayland.enable = true; settings = {
animation = "matrix";
};
}; };
}; };
-4
View File
@@ -20,10 +20,6 @@ in
bottles.__input.removeWarningPopup.__assign = true; bottles.__input.removeWarningPopup.__assign = true;
easytier.__assign = final.stable.easytier; easytier.__assign = final.stable.easytier;
openldap.__output.doCheck.__assign =
builtins.warn "doCheck disabled for openldap, check https://github.com/NixOS/nixpkgs/issues/514113"
(!prev.stdenv.hostPlatform.isi686);
}; };
} }
// //
+2
View File
@@ -1,3 +1,5 @@
#:schema https://raw.githubusercontent.com/crate-ci/typos/refs/heads/master/config.schema.json
[files] [files]
extend-exclude = [ extend-exclude = [
"secrets" "secrets"