oysteikt/nix-dotfiles
1
2
Fork 0
Code Issues 142 Pull Requests Activity

Update nixpkgs to 25.11-beta

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2025-11-25 20:36:02 +09:00
parent 6d89b7b2af
commit fddefdde61
31 changed files with 242 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
flake.lock generated
View File

@@ -62,16 +62,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758463745, "lastModified": 1764034279,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "narHash": "sha256-hZH6EHQYFifVg0bmSBYT8Art5BWhXBXE307uPLnexY0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "rev": "381f4f8a3a5f773cb80d2b7eb8f8d733b8861434",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "master",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -144,11 +144,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762049192, "lastModified": 1763776632,
"narHash": "sha256-4zTar274c7NXC3WA8UFXrRfFp/Clo7dixyogMJcHXw0=", "narHash": "sha256-mvumw4Djwi6BgMKVKw5cpNt8a80+h/LvPy2AHOtzBzE=",
"owner": "infinidoge", "owner": "infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "e8092a7c5eb7f03612bd9eaff5d57652dfe0e7a8", "rev": "e6d3b589d9f1f869e68142f44654e59fcb47390c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -160,11 +160,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1762267440, "lastModified": 1762847253,
"narHash": "sha256-WHjEJ80oYbWyNu0dxysBs5oMlBc5w7YYzL1/UPj4iGo=", "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "2e85ae1b7030df39269d29118b1f74944d0c8f15", "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -176,26 +176,26 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1761999846, "lastModified": 1764012089,
"narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", "narHash": "sha256-PYDIWCOzz7UV67mrQWaaLbywLu3OhpsazJipwH8+JYs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", "rev": "1dcdcf9efc6aed8bf28347c0bfa583ba511954ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-25.05", "ref": "25.11-beta",
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1762156382, "lastModified": 1763934636,
"narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=", "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7241bcbb4f099a66aafca120d37c65e8dda32717", "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -206,11 +206,11 @@
}, },
"nixpkgs-yet-unstabler": { "nixpkgs-yet-unstabler": {
"locked": { "locked": {
"lastModified": 1762303136, "lastModified": 1764066831,
"narHash": "sha256-q5ZOlym6bMVxrqnKoKtifqdcSB89Ei5IZWkEkJexUU0=", "narHash": "sha256-acVdfPqceV0TEODo0G+zEPbAzYXK728RCB8ylostgHk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "353b4f16307b7a46fe4c0de82a2f55e0892ea50c", "rev": "8798c05533731dc25d3eb0c21e37a4a972b8df4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -227,11 +227,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742203788, "lastModified": 1684092181,
"narHash": "sha256-nRqyf+msCPEXvvXF6bvfiYH/B089dqWPc7ljRXieA7g=", "narHash": "sha256-Oi6G8Jx2RkEMi3UndtAnZw61hfgKGEe7l/ILdB9ump4=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "c4e353e745b4012feb75dd1c4405a71f6318ed02", "rev": "028ed8774d1cf4650fc15253146cf14451eb608c",
"revCount": 51, "revCount": 43,
"type": "git", "type": "git",
"url": "file:///home/h7x4/git/osuchan-line-bot" "url": "file:///home/h7x4/git/osuchan-line-bot"
}, },
@@ -262,11 +262,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760998189, "lastModified": 1764021963,
"narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View File

@@ -1,13 +1,13 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-25.05"; nixpkgs.url = "nixpkgs/25.11-beta";
# nixpkgs.url = "nixpkgs/nixos-unstable"; # nixpkgs.url = "nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable";
nixpkgs-yet-unstabler.url = "github:NixOS/nixpkgs/master"; nixpkgs-yet-unstabler.url = "github:NixOS/nixpkgs/master";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; # url = "github:nix-community/home-manager/release-25.05";
# url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

19
home/breakerbox.nix
View File

@@ -9,7 +9,9 @@ in
./programs/nix.nix ./programs/nix.nix
./programs/ahoviewer.nix
./programs/alacritty.nix ./programs/alacritty.nix
./programs/anki.nix
./programs/anyrun ./programs/anyrun
./programs/aria2.nix ./programs/aria2.nix
./programs/atuin.nix ./programs/atuin.nix
@@ -19,9 +21,12 @@ in
./programs/bottom.nix ./programs/bottom.nix
./programs/cargo.nix ./programs/cargo.nix
# ./programs/comma.nix # ./programs/comma.nix
./programs/delta.nix
./programs/direnv ./programs/direnv
./programs/element-desktop.nix
./programs/emacs ./programs/emacs
./programs/eza.nix ./programs/eza.nix
./programs/fastfetch.nix
./programs/feh.nix ./programs/feh.nix
./programs/firefox.nix ./programs/firefox.nix
./programs/fzf.nix ./programs/fzf.nix
@@ -36,17 +41,22 @@ in
./programs/jq.nix ./programs/jq.nix
./programs/less.nix ./programs/less.nix
./programs/man.nix ./programs/man.nix
./programs/meli.nix
./programs/mpv.nix ./programs/mpv.nix
./programs/ncmpcpp.nix ./programs/ncmpcpp.nix
./programs/neomutt.nix
./programs/neovim ./programs/neovim
./programs/newsboat ./programs/newsboat
./programs/nix-index ./programs/nix-index
./programs/nushell.nix ./programs/nushell.nix
./programs/nyxt.nix
./programs/obs-studio.nix ./programs/obs-studio.nix
./programs/obsidian.nix
./programs/pandoc.nix ./programs/pandoc.nix
./programs/prism-launcher.nix ./programs/prism-launcher.nix
./programs/python.nix ./programs/python.nix
./programs/qutebrowser.nix ./programs/qutebrowser.nix
./programs/rclone.nix
./programs/ripgrep.nix ./programs/ripgrep.nix
./programs/rofi ./programs/rofi
./programs/skim.nix ./programs/skim.nix
@@ -99,6 +109,7 @@ in
# programs.comma.enable = true; # programs.comma.enable = true;
programs.direnv.enable = true; programs.direnv.enable = true;
programs.eza.enable = true; programs.eza.enable = true;
programs.fastfetch.enable = true;
programs.fzf.enable = true; programs.fzf.enable = true;
programs.gdb.enable = true; programs.gdb.enable = true;
programs.gh-dash.enable = true; programs.gh-dash.enable = true;
@@ -111,11 +122,14 @@ in
programs.jq.enable = true; programs.jq.enable = true;
programs.less.enable = true; programs.less.enable = true;
programs.man.enable = true; programs.man.enable = true;
programs.meli.enable = true;
programs.neomutt.enable = true;
programs.neovim.enable = true; programs.neovim.enable = true;
programs.nix-index.enable = true; programs.nix-index.enable = true;
programs.nushell.enable = true; programs.nushell.enable = true;
programs.pandoc.enable = true; programs.pandoc.enable = true;
programs.python.enable = true; programs.python.enable = true;
programs.rclone.enable = true;
programs.ripgrep.enable = true; programs.ripgrep.enable = true;
programs.skim.enable = true; programs.skim.enable = true;
programs.sqlite.enable = true; programs.sqlite.enable = true;
@@ -132,14 +146,19 @@ in
gtk.enable = graphics; gtk.enable = graphics;
programs.ahoviewer.enable = graphics;
programs.alacritty.enable = graphics; programs.alacritty.enable = graphics;
programs.anki.enable = graphics;
programs.element-desktop.enable = graphics;
programs.emacs.enable = graphics; programs.emacs.enable = graphics;
programs.feh.enable = graphics; programs.feh.enable = graphics;
programs.firefox.enable = graphics; programs.firefox.enable = graphics;
programs.mpv.enable = graphics; programs.mpv.enable = graphics;
programs.ncmpcpp.enable = graphics; programs.ncmpcpp.enable = graphics;
programs.newsboat.enable = graphics; programs.newsboat.enable = graphics;
programs.nyxt.enable = graphics;
programs.obs-studio.enable = graphics; programs.obs-studio.enable = graphics;
programs.obsidian.enable = graphics;
programs.prism-launcher.enable = graphics; programs.prism-launcher.enable = graphics;
programs.qutebrowser.enable = graphics; programs.qutebrowser.enable = graphics;
programs.rofi.enable = graphics; programs.rofi.enable = graphics;

2
home/modules/services/mpd.nix
View File

@@ -37,7 +37,7 @@ in
Service = { Service = {
Type = "oneshot"; Type = "oneshot";
Slice = "background.slice"; Slice = "background.slice";
ExecStart = "${lib.getExe pkgs.mpc-cli} update --wait"; ExecStart = "${lib.getExe pkgs.mpc} update --wait";
PrivateUsers = true; PrivateUsers = true;
ProtectSystem = true; ProtectSystem = true;

21
home/packages.nix
View File

@@ -35,11 +35,9 @@
lurk lurk
mdcat mdcat
mediainfo mediainfo
meli
mkvtoolnix mkvtoolnix
mmv mmv
mtr mtr
neofetch
nix-diff nix-diff
nix-output-monitor nix-output-monitor
nix-tree nix-tree
@@ -52,12 +50,10 @@
pipr pipr
progress progress
pwntools pwntools
rclone
rip2 rip2
rnr rnr
rsync rsync
# sc-im # sc-im
skim
slack-term slack-term
tea tea
terminal-parrot terminal-parrot
@@ -87,15 +83,12 @@
xorg.xprop xorg.xprop
] ++ ( ] ++ (
lib.optionals (!machineVars.headless) [ lib.optionals (!machineVars.headless) [
ahoviewer
alsa-utils alsa-utils
anki
kdePackages.ark kdePackages.ark
calibre calibre
cool-retro-term cool-retro-term
darktable darktable
yet-unstabler-pkgs.discord yet-unstabler-pkgs.discord
element-desktop
foliate foliate
geogebra geogebra
ghidra ghidra
@@ -115,16 +108,14 @@
libreoffice libreoffice
light light
mission-center mission-center
mopidy # mopidy
mopidy-mpd # mopidy-mpd
mopidy-soundcloud # mopidy-soundcloud
mopidy-youtube # mopidy-youtube
mpc_cli mpc
mumble mumble
naps2 naps2
nsxiv nsxiv
nyxt
obsidian
pdfarranger pdfarranger
pwvucontrol pwvucontrol
# scrcpy # scrcpy
@@ -164,7 +155,7 @@
steam steam
steam-tui steam-tui
stepmania stepmania
taisei # taisei
] ++ lib.optionals (machineName != "dosei") [ ] ++ lib.optionals (machineName != "dosei") [
# Source blocked by external firewall on dosei # Source blocked by external firewall on dosei
pcloud pcloud

4
home/programs/ahoviewer.nix Normal file
View File

@@ -0,0 +1,4 @@
{ ... }:
{
programs.ahoviewer = { };
}

4
home/programs/anki.nix Normal file
View File

@@ -0,0 +1,4 @@
{ ... }:
{
programs.anki = { };
}

11
home/programs/delta.nix Normal file
View File

@@ -0,0 +1,11 @@
{ ... }:
{
programs.delta = {
enableGitIntegration = true;
options = {
line-numbers = true;
side-by-side = true;
theme = "Monokai Extended Origin";
};
};
}

4
home/programs/element-desktop.nix Normal file
View File

@@ -0,0 +1,4 @@
{ ... }:
{
programs.element-desktop = { };
}

4
home/programs/fastfetch.nix Normal file
View File

@@ -0,0 +1,4 @@
{ ... }:
{
programs.fastfetch = { };
}

151
home/programs/git/default.nix
View File

@@ -18,9 +18,6 @@ lib.mkIf cfg.enable {
{ {
package = pkgs.gitFull; package = pkgs.gitFull;
userName = "h7x4";
userEmail = "h7x4@nani.wtf";
signing = { signing = {
key = "46B9228E814A2AAC"; key = "46B9228E814A2AAC";
# format = "openpgp"; # format = "openpgp";
@@ -31,86 +28,82 @@ lib.mkIf cfg.enable {
lfs.enable = true; lfs.enable = true;
delta = { settings = {
enable = true; user = {
options = { name = "h7x4";
line-numbers = true; email = "h7x4@nani.wtf";
side-by-side = true;
theme = "Monokai Extended Origin";
}; };
};
aliases = { alias = {
aliases = "!git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'"; aliases = "!git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'";
authors = "shortlog --summary --numbered --email"; authors = "shortlog --summary --numbered --email";
delete-merged = "!git branch --merged | grep -v -e '\\*' -e 'master' -e 'main' | xargs -n 1 git branch -d"; delete-merged = "!git branch --merged | grep -v -e '\\*' -e 'master' -e 'main' | xargs -n 1 git branch -d";
ff = "fixup-fixup"; ff = "fixup-fixup";
fi = "fixup-interactive"; fi = "fixup-interactive";
forcepush = "push --force-with-lease --force-if-includes"; forcepush = "push --force-with-lease --force-if-includes";
git = "!git"; git = "!git";
pp = "post-pr"; pp = "post-pr";
rebase-author = "rebase -i -x \"git commit --amend --reset-author -CHEAD\""; rebase-author = "rebase -i -x \"git commit --amend --reset-author -CHEAD\"";
reset-to-upstream = "!git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\""; reset-to-upstream = "!git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
rf = "rebase-fixups"; rf = "rebase-fixups";
si = "switch-interactive"; si = "switch-interactive";
subs = "submodule update --init --recursive"; subs = "submodule update --init --recursive";
} // (let } // (let
c = c: s: "%C(${c})${s}%C(reset)"; c = c: s: "%C(${c})${s}%C(reset)";
in { in {
graph = let graph = let
fmt = lib.concatStringsSep "" [ fmt = lib.concatStringsSep "" [
" - " " - "
(c "bold blue" "%h") (c "bold blue" "%h")
" - " " - "
(c "bold green" "(%ar)") (c "bold green" "(%ar)")
" " " "
(c "white" "> %s") (c "white" "> %s")
" " " "
(c "dim white" "- %an") (c "dim white" "- %an")
(c "bold yellow" "%d") (c "bold yellow" "%d")
]; ];
in "log --graph --abbrev-commit --decorate --format=format:'${fmt}' --all"; in "log --graph --abbrev-commit --decorate --format=format:'${fmt}' --all";
graphv = let graphv = let
fmt = lib.concatStringsSep "" [ fmt = lib.concatStringsSep "" [
(c "bold blue" "%h") (c "bold blue" "%h")
" - " " - "
(c "bold cyan" "%aD") (c "bold cyan" "%aD")
" " " "
(c "bold green" "(%ar)") (c "bold green" "(%ar)")
(c "bold yellow" "%d") (c "bold yellow" "%d")
"%n" "%n"
" " " "
(c "white" "%s") (c "white" "%s")
" " " "
(c "dim white" "- %an") (c "dim white" "- %an")
]; ];
in "log --graph --abbrev-commit --decorate --format=format:'${fmt}' --all"; in "log --graph --abbrev-commit --decorate --format=format:'${fmt}' --all";
l = let l = let
fmt = lib.concatStringsSep "%n" (map (x: if builtins.isList x then lib.concatStringsSep " " x else x) [ fmt = lib.concatStringsSep "%n" (map (x: if builtins.isList x then lib.concatStringsSep " " x else x) [
[ (c "bold yellow" "%H") (c "auto" "%d") ] [ (c "bold yellow" "%H") (c "auto" "%d") ]
[ (c "bold white" "Author:") (c "bold cyan" "%aN <%aE>") (c "bold green" "(%ah)") ] [ (c "bold white" "Author:") (c "bold cyan" "%aN <%aE>") (c "bold green" "(%ah)") ]
[ (c "bold white" "Committer:") (c "bold cyan" "%cN <%cE>") (c "bold green" "(%ah)") ] [ (c "bold white" "Committer:") (c "bold cyan" "%cN <%cE>") (c "bold green" "(%ah)") ]
[ (c "bold white" "GPG: (%G?)") (c "bold magenta" "%GF") "-" (c "bold cyan" "%GS") (c "bold blue" "(%GT) ") ] [ (c "bold white" "GPG: (%G?)") (c "bold magenta" "%GF") "-" (c "bold cyan" "%GS") (c "bold blue" "(%GT) ") ]
"" ""
(c "bold white" "# %s") (c "bold white" "# %s")
"%+b" "%+b"
(c "dim yellow" "%+N") (c "dim yellow" "%+N")
]); ]);
# sedExpressions = let # sedExpressions = let
# colorExpr = "\\x1B\\[([0-9]{1,3}(;[0-9]{1,2};?)?)?[mGK]"; # colorExpr = "\\x1B\\[([0-9]{1,3}(;[0-9]{1,2};?)?)?[mGK]";
# colorEndExpr = "\\x1B\\[m"; # colorEndExpr = "\\x1B\\[m";
# colored = x: "${colorExpr}${x}${colorEndExpr}"; # colored = x: "${colorExpr}${x}${colorEndExpr}";
# in lib.concatMapStringsSep " " (x: "-e '${x}'") [ # in lib.concatMapStringsSep " " (x: "-e '${x}'") [
# "s|${colored "GPG: \\(N\\)"} ${colored "F3CDA86CC55A9F10D7A069819F2F7D8250F35146"} - ${colored "h7x4 <h7x4@nani.wtf>"} ${colored "\\(ultimate\\)"}|GPG: h7x4|" # "s|${colored "GPG: \\(N\\)"} ${colored "F3CDA86CC55A9F10D7A069819F2F7D8250F35146"} - ${colored "h7x4 <h7x4@nani.wtf>"} ${colored "\\(ultimate\\)"}|GPG: h7x4|"
# "s|${colored "GPG: \\(N\\)"} ${colored ""} - ${colored ""} ${colored "\\(undefined\\)"}||" # "s|${colored "GPG: \\(N\\)"} ${colored ""} - ${colored ""} ${colored "\\(undefined\\)"}||"
# ]; # ];
in "log --decorate --format=tformat:'${fmt}'"; in "log --decorate --format=tformat:'${fmt}'";
# in "!git log --color=always --format=format:'${fmt}' | sed -E ${sedExpressions} | $PAGER"; # in "!git log --color=always --format=format:'${fmt}' | sed -E ${sedExpressions} | $PAGER";
}); });
extraConfig = {
core = { core = {
whitespace = lib.concatStringsSep "," [ whitespace = lib.concatStringsSep "," [
"space-before-tab" "space-before-tab"
@@ -278,7 +271,7 @@ lib.mkIf cfg.enable {
]; ];
in lib.genAttrs organizations (org: map (uri-prefix: "${uri-prefix}${org}") uri-prefixes); in lib.genAttrs organizations (org: map (uri-prefix: "${uri-prefix}${org}") uri-prefixes);
in { in {
extraConfig."url \"${lib.head uri-prefixes}\"".insteadOf = lib.tail uri-prefixes; settings."url \"${lib.head uri-prefixes}\"".insteadOf = lib.tail uri-prefixes;
includes = map (x: { includes = map (x: {
contentSuffix = "pvv.gitconfig"; contentSuffix = "pvv.gitconfig";

8
home/programs/hyprland/keybinds.nix
View File

@@ -75,10 +75,10 @@ in
]; ];
bindl = [ bindl = [
"$mod, p, exec, ${exe pkgs.mpc_cli} toggle" "$mod, p, exec, ${exe pkgs.mpc} toggle"
",XF86AudioPlay, exec, ${exe pkgs.mpc_cli} toggle" ",XF86AudioPlay, exec, ${exe pkgs.mpc} toggle"
",XF86AudioPrev, exec, ${exe pkgs.mpc_cli} prev" ",XF86AudioPrev, exec, ${exe pkgs.mpc} prev"
",XF86AudioNext, exec, ${exe pkgs.mpc_cli} next" ",XF86AudioNext, exec, ${exe pkgs.mpc} next"
]; ];
bindle = [ bindle = [

2
home/programs/less.nix
View File

@@ -1,7 +1,7 @@
{ config, ... }: { config, ... }:
{ {
programs.less = { programs.less = {
keys = '' config = ''
#env #env
LESS = -i -R LESS = -i -R
LESSHISTSIZE=20000 LESSHISTSIZE=20000

8
home/programs/meli.nix Normal file
View File

@@ -0,0 +1,8 @@
{ pkgs, ... }:
{
programs.meli = {
package = pkgs.meli.overrideAttrs {
doCheck = false;
};
};
}

29
home/programs/neomutt.nix Normal file
View File

@@ -0,0 +1,29 @@
{ config, lib, ... }:
let
cfg = config.programs.neomutt;
in lib.mkIf cfg.enable {
programs.neomutt = {
# vimKeys = true;
# set mailcap_path = ~/.config/neomutt/mailcap
# set header_cache = "~/.cache/mutt"
# set message_cachedir = "~/.cache/mutt"
# set tmpdir = /run/user/${uid}/mutt
# extraConfig = ''
# # vim: filetype=muttrc
# '';
};
xdg.configFile."neomutt/mailcap".text = ''
# vim: filetype=muttrc
text/plain; nvim %s
#PDFs
application/pdf; zathura %s pdf
#Images
image/png; feh %s
image/jpeg; feh %s
'';
}

4
home/programs/nyxt.nix Normal file
View File

@@ -0,0 +1,4 @@
{ ... }:
{
programs.nyxt = { };
}

4
home/programs/obsidian.nix Normal file
View File

@@ -0,0 +1,4 @@
{ ... }:
{
programs.obsidian = { };
}

4
home/programs/rclone.nix Normal file
View File

@@ -0,0 +1,4 @@
{ ... }:
{
programs.rclone = { };
}

8
home/programs/ssh/default.nix
View File

@@ -23,9 +23,11 @@ in
"${config.home.homeDirectory}/.ssh/mutable_config" "${config.home.homeDirectory}/.ssh/mutable_config"
]; ];
controlMaster = "auto"; matchBlocks."*" = {
controlPersist = "10m"; controlMaster = "auto";
controlPath = "${controlMastersDir}/%n%C"; controlPersist = "10m";
controlPath = "${controlMastersDir}/%n%C";
};
}; };
systemd.user.tmpfiles.settings."10-ssh" = { systemd.user.tmpfiles.settings."10-ssh" = {

2
home/programs/tmux/default.nix
View File

@@ -37,7 +37,7 @@
}); });
mpd-status = (pkgs.writeShellApplication { mpd-status = (pkgs.writeShellApplication {
name = "tmux-mpd-status"; name = "tmux-mpd-status";
runtimeInputs = with pkgs; [ mpc-cli gawk gnugrep ]; runtimeInputs = with pkgs; [ mpc gawk gnugrep ];
text = fileContentsWithoutShebang ./scripts/mpd-status.sh; text = fileContentsWithoutShebang ./scripts/mpd-status.sh;
}); });
in '' in ''

2
home/programs/tmux/scripts/mpd-status.sh
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i sh -p mpc-cli gawk gnugrep #!nix-shell -i sh -p mpc gawk gnugrep
while true; do while true; do
MPC_OUTPUT=$(mpc --format '[[%artist% - ]%title%]|[%file%]') MPC_OUTPUT=$(mpc --format '[[%artist% - ]%title%]|[%file%]')

2
home/programs/xmobar/default.nix
View File

@@ -12,7 +12,7 @@ in {
]; ];
mpd_status_script = pkgs.writeShellScript "mpd-status" '' mpd_status_script = pkgs.writeShellScript "mpd-status" ''
MPD_STATUS=$(${pkgs.mpc-cli}/bin/mpc 2>/dev/null | sed -n '2{p;q}' | cut -d ' ' -f1) MPD_STATUS=$(${lib.getExe pkgs.mpc} 2>/dev/null | sed -n '2{p;q}' | cut -d ' ' -f1)
case "$MPD_STATUS" in case "$MPD_STATUS" in
"[playing]") "[playing]")
echo "<fn=2><fc=#00ff00>▶</fc></fn>" echo "<fn=2><fc=#00ff00>▶</fc></fn>"

24
home/programs/zsh/default.nix
View File

@@ -3,18 +3,18 @@ let
cfg = config.programs.zsh; cfg = config.programs.zsh;
in in
lib.mkIf cfg.enable { lib.mkIf cfg.enable {
home.file."${cfg.dotDir}/.zshrc".onChange = '' #home.file."${cfg.dotDir}/.zshrc".onChange = ''
${lib.getExe (pkgs.writeTextFile { # ${lib.getExe (pkgs.writeTextFile {
name = "zsh-compinit-oneshot.zsh"; # name = "zsh-compinit-oneshot.zsh";
executable = true; # executable = true;
destination = "/bin/zsh-compinit-oneshot.zsh"; # destination = "/bin/zsh-compinit-oneshot.zsh";
text = '' # text = ''
#!${lib.getExe cfg.package} # #!${lib.getExe cfg.package}
autoload -Uz compinit && compinit -C -d "${config.xdg.cacheHome}/zsh/zcompdump-$ZSH_VERSION" # autoload -Uz compinit && compinit -C -d "${config.xdg.cacheHome}/zsh/zcompdump-$ZSH_VERSION"
''; # '';
})} # })}
''; #'';
systemd.user.tmpfiles.settings."10-zsh"."${config.xdg.cacheHome}/zsh".d = { systemd.user.tmpfiles.settings."10-zsh"."${config.xdg.cacheHome}/zsh".d = {
mode = "0770"; mode = "0770";
@@ -22,7 +22,7 @@ lib.mkIf cfg.enable {
}; };
programs.zsh = { programs.zsh = {
dotDir = ".config/zsh"; dotDir = "${config.xdg.configHome}/zsh";
# enableSyntaxHighlighting = true; # enableSyntaxHighlighting = true;
defaultKeymap = "viins"; defaultKeymap = "viins";
enableCompletion = true; enableCompletion = true;

8
home/services/sxhkd.nix
View File

@@ -30,11 +30,11 @@ in
# Music # Music
"super + p" = "${pkgs.mpc_cli}/bin/mpc toggle"; "super + p" = "${lib.getExe pkgs.mpc} toggle";
"XF86AudioPlay" = "${pkgs.mpc_cli}/bin/mpc toggle"; "XF86AudioPlay" = "${lib.getExe pkgs.mpc} toggle";
"XF86AudioPrev" = "${pkgs.mpc_cli}/bin/mpc prev"; "XF86AudioPrev" = "${lib.getExe pkgs.mpc} prev";
"XF86AudioNext" = "${pkgs.mpc_cli}/bin/mpc next"; "XF86AudioNext" = "${lib.getExe pkgs.mpc} next";
# Monitor # Monitor

2
home/shell.nix
View File

@@ -281,7 +281,7 @@ in {
type = ";"; type = ";";
alias = [ alias = [
''echo "${extendedLib.termColors.front.red "Concatenating all pdfs in current directory to 'out.pdf'"}"'' ''echo "${extendedLib.termColors.front.red "Concatenating all pdfs in current directory to 'out.pdf'"}"''
"${pkgs.poppler_utils}/bin/pdfunite *.pdf out.pdf" "${pkgs.poppler-utils}/bin/pdfunite *.pdf out.pdf"
]; ];
}; };

1
hosts/common/default.nix
View File

@@ -144,7 +144,6 @@ in {
services = { services = {
udev.packages = with pkgs; [ udev.packages = with pkgs; [
yubikey-personalization yubikey-personalization
android-udev-rules
light light
]; ];
}; };

4
hosts/common/fonts.nix
View File

@@ -21,7 +21,7 @@
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-cjk-serif noto-fonts-cjk-serif
noto-fonts-emoji noto-fonts-color-emoji
ocr-a ocr-a
open-sans open-sans
powerline-fonts powerline-fonts
@@ -29,7 +29,7 @@
source-sans source-sans
symbola symbola
texlivePackages.asana-math texlivePackages.asana-math
ubuntu_font_family ubuntu-classic
victor-mono victor-mono
yasashisa-gothic yasashisa-gothic
]; ];

3
hosts/common/nix.nix
View File

@@ -37,7 +37,8 @@
allowed-uris = [ "http://" "https://" ]; allowed-uris = [ "http://" "https://" ];
binary-caches = [ "https://cache.nixos.org/" ]; binary-caches = [ "https://cache.nixos.org/" ];
builders-use-substitutes = true; builders-use-substitutes = true;
experimental-features = [ "nix-command" "flakes" ]; experimental-features = [ "nix-command" "flakes" "auto-allocate-uids" ];
auto-allocate-uids = true;
log-lines = 50; log-lines = 50;
trusted-users = [ "h7x4" ]; trusted-users = [ "h7x4" ];
allowed-users = [ "@users" ]; allowed-users = [ "@users" ];

2
hosts/common/services/logind.nix
View File

@@ -1,6 +1,6 @@
{ ... }: { ... }:
{ {
services.logind = { services.logind = {
powerKeyLongPress = "poweroff"; settings.Login.HandlePowerKeyLongPress = "poweroff";
}; };
} }

7
hosts/common/services/nixseparatedebuginfod.nix
View File

@@ -1,6 +1,3 @@
{ config, ... }: { { ... }: {
services.nixseparatedebuginfod = { services.nixseparatedebuginfod2.enable = true;
enable = true;
nixPackage = config.nix.package;
};
} }

3
hosts/tsuki/services/nginx/default.nix
View File

@@ -36,7 +36,6 @@
recommendedOptimisation = true; recommendedOptimisation = true;
recommendedProxySettings = true; recommendedProxySettings = true;
recommendedTlsSettings = true; recommendedTlsSettings = true;
recommendedZstdSettings = true;
appendConfig = '' appendConfig = ''
pcre_jit on; pcre_jit on;
@@ -144,7 +143,7 @@
''; '';
}; };
} }
# (host ["www"] { root = "${inputs.website.packages.${pkgs.system}.default}/"; }) # (host ["www"] { root = "${inputs.website.packages.${pkgs.stdenv.hostPlatform.system}.default}/"; })
(host ["testmap"] { (host ["testmap"] {
root = "/var/lib/mcmap"; root = "/var/lib/mcmap";
quic = true; quic = true;