tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

Compare commits

base: tristan:e8ebe67ad1571ae7489c47f6e725ffa923a1ed0e
Branches Tags
tristan:zenix/master
tristan:alpine/master
tristan:framework/master
..
compare: tristan:7b6e53ea99529a5e93731e1e7413029c7f9c997e
Branches Tags
tristan:alpine/master
tristan:zenix/master
tristan:framework/master

No commits in common. "e8ebe67ad1571ae7489c47f6e725ffa923a1ed0e" and "7b6e53ea99529a5e93731e1e7413029c7f9c997e" have entirely different histories.
e8ebe67ad1 ... 7b6e53ea99

20 changed files with 182 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

133
flake.lock generated
View file

@ -21,17 +21,16 @@
"base16-fish": { "base16-fish": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1754405784, "lastModified": 1622559957,
"narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
"owner": "tomyun", "owner": "tomyun",
"repo": "base16-fish", "repo": "base16-fish",
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "tomyun", "owner": "tomyun",
"repo": "base16-fish", "repo": "base16-fish",
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
"type": "github" "type": "github"
} }
}, },
@ -79,11 +78,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760299432, "lastModified": 1744387566,
"narHash": "sha256-OEsLiZvC+WOssGIzUx0miuKsODlp7IGax8XVhNCw8wY=", "narHash": "sha256-O39zTv7LdRgr4Hw38d+eQG2LYpP75rw2XKqTGV5qzgs=",
"owner": "HeitorAugustoLN", "owner": "HeitorAugustoLN",
"repo": "cosmic-manager", "repo": "cosmic-manager",
"rev": "a61b25313a83d32de4769fbb4026d93bde00b256", "rev": "52d3fdd080a9dd4639948687682a68282fbf0314",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -116,11 +115,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759362264, "lastModified": 1738453229,
"narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -137,11 +136,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759362264, "lastModified": 1754091436,
"narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -229,11 +228,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758463745, "lastModified": 1753592768,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "rev": "fc3add429f21450359369af74c2375cb34a2d204",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -257,16 +256,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754860581, "lastModified": 1748294338,
"narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "ixx", "repo": "ixx",
"rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NuschtOS", "owner": "NuschtOS",
"ref": "v0.1.1", "ref": "v0.0.8",
"repo": "ixx", "repo": "ixx",
"type": "github" "type": "github"
} }
@ -276,11 +275,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1756852730, "lastModified": 1741303672,
"narHash": "sha256-qPere4RBHoZxiEGl8zXU8gjroZg4gkYGEwaAbKmL4vE=", "narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=",
"owner": "musnix", "owner": "musnix",
"repo": "musnix", "repo": "musnix",
"rev": "7ccc92050e43dc92309396c6f2fe1f542214a242", "rev": "d56a15f30329f304151e4e05fa82264d127da934",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -301,11 +300,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1761187190, "lastModified": 1754744872,
"narHash": "sha256-5ln16iOeWpEX5MO7M3jzFEBNFE42gpFsCvSvPjtF6tQ=", "narHash": "sha256-rcMHMs+dFWaDXev092gfxTfxHEWcUY/6SRV+cseNevQ=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "77a07f5d3b775fba67550c38122ebb8d3ee3ba1c", "rev": "346fc31bcc4d2dbcc3e8ce8dbb622e4255ff54b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -317,16 +316,16 @@
"niri-stable": { "niri-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1756556321, "lastModified": 1748151941,
"narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "YaLTeR", "owner": "YaLTeR",
"ref": "v25.08", "ref": "v25.05.1",
"repo": "niri", "repo": "niri",
"type": "github" "type": "github"
} }
@ -334,11 +333,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1760940149, "lastModified": 1754742008,
"narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=", "narHash": "sha256-Tp0FG7VpLudVEC622d91z2hbdfPLCXxw0Nv43iNN4O0=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5", "rev": "67361f88fd01974ebee4cf80f0e29c87d805cc39",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -349,11 +348,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1756542300, "lastModified": 1740695751,
"narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -365,11 +364,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1761016216, "lastModified": 1754689972,
"narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "481cf557888e05d3128a76f14c76397b7d7cc869", "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,11 +380,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1761016216, "lastModified": 1754689972,
"narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "481cf557888e05d3128a76f14c76397b7d7cc869", "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -396,11 +395,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1761114652, "lastModified": 1754214453,
"narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -420,11 +419,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1760795571, "lastModified": 1754262585,
"narHash": "sha256-gi+tWWAknKuTNso3yMeKsT9nj0jx+tuYF7g7nmLUWT8=", "narHash": "sha256-Yz5dJ0VzGRzSRHdHldsWQbuFYmtP3NWNreCvPfCi9CI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "6c945865ba5de87fa2d0dd8a0e66ca572ddf9043", "rev": "ab1b5962e1ca90b42de47e1172e0d24ca80e6256",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -470,11 +469,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760652422, "lastModified": 1753771532,
"narHash": "sha256-C88Pgz38QIl9JxQceexqL2G7sw9vodHWx1Uaq+NRJrw=", "narHash": "sha256-Pmpke0JtLRzgdlwDC5a+aiLVZ11JPUO5Bcqkj0nHE/k=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "3ebeebe8b6a49dfb11f771f761e0310f7c48d726", "rev": "2a65adaf2c0c428efb0f4a2bc406aab466e96a06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -503,11 +502,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760998189, "lastModified": 1754328224,
"narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -537,11 +536,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1760478648, "lastModified": 1754599117,
"narHash": "sha256-Y4l+Y3zUvqIDbyLrtOrzNvp1o50Fp9TYK+iwtwweFU4=", "narHash": "sha256-AzAYdZlat002vCjCKWdFpGi2xUaiOU4DtIPnv1nomD8=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "1ec254101285777db13922303cc47ded06e10bb3", "rev": "312dec38b2231b21f36903d1bdce96daa11548ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -702,16 +701,16 @@
"xwayland-satellite-stable": { "xwayland-satellite-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755491097, "lastModified": 1748488455,
"narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "388d291e82ffbc73be18169d39470f340707edaa", "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Supreeeme", "owner": "Supreeeme",
"ref": "v0.7", "ref": "v0.6",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"type": "github" "type": "github"
} }
@ -719,11 +718,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761173223, "lastModified": 1754533920,
"narHash": "sha256-FumZh+fPRaKXkl9Y1uTh5KV7Io/AyOZso+UkqLhLArs=", "narHash": "sha256-fCZ68Yud1sUCq6UNXj0SDyiBgVA8gJUE+14ZFGsFJG8=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "bf745144acda1343934e9a094cf9458a54d57889", "rev": "e0d1dad25a158551ab58547b2ece4b7d5a19929c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -737,11 +736,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1761192367, "lastModified": 1754540523,
"narHash": "sha256-HdAtNWms1rrswlfuX5NUR9RYCMLUJHEzF986hQ0tUCw=", "narHash": "sha256-Wgv2qVckt8q11/xErY7hYdLAPcoOnZ0BkMLqyXegCzQ=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "1ce32754f78d1d7d6bf9cb44a48a06dac8bb6785", "rev": "451454de40a4433174153e823994fe2ecd3c869e",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -42,6 +42,8 @@
pkgs = import inputs.nixpkgs {inherit system;}; pkgs = import inputs.nixpkgs {inherit system;};
user = "tristan"; user = "tristan";
userFullname = "Tristan Beedell"; userFullname = "Tristan Beedell";
# auto-login = import ./nixos/programs/auto-login.nix;
mkConf = import ./lib/mkconf.nix {inherit inputs system user userFullname;}; mkConf = import ./lib/mkconf.nix {inherit inputs system user userFullname;};
in { in {
formatter.${system} = pkgs.alejandra; formatter.${system} = pkgs.alejandra;
@ -49,6 +51,7 @@
zenix = mkConf { zenix = mkConf {
nixos-modules = [ nixos-modules = [
./hardware/zenix.nix ./hardware/zenix.nix
./nixos/programs/cosmic.nix
./nixos/programs/niri.nix ./nixos/programs/niri.nix
./nixos/programs/gamer.nix ./nixos/programs/gamer.nix
./nixos/programs/personal.nix ./nixos/programs/personal.nix
@ -59,6 +62,7 @@
./home/programs/graphical.nix ./home/programs/graphical.nix
./home/programs/gamer.nix ./home/programs/gamer.nix
./home/programs/personal/. ./home/programs/personal/.
./home/desktop/cosmic/.
]; ];
}; };
@ -67,11 +71,13 @@
./hardware/framework-13.nix ./hardware/framework-13.nix
./nixos/workstation.nix ./nixos/workstation.nix
./nixos/modules/work.nix ./nixos/modules/work.nix
./nixos/programs/cosmic.nix
./nixos/programs/niri.nix ./nixos/programs/niri.nix
]; ];
home-modules = [ home-modules = [
./home/programs/work.nix ./home/programs/work.nix
./home/programs/graphical.nix ./home/programs/graphical.nix
./home/desktop/cosmic/.
]; ];
}; };

37
hardware/framework-13.nix
View file

@ -57,8 +57,6 @@
networking.hostName = "framework-13"; networking.hostName = "framework-13";
services.hardware.bolt.enable = true;
system.stateVersion = "24.11"; # do not change system.stateVersion = "24.11"; # do not change
home-manager.users.${config.user}.imports = [ home-manager.users.${config.user}.imports = [
{ {
@ -79,41 +77,6 @@
} }
''; '';
}; };
programs.niri.settings.outputs = {
# Laptop display
"eDP-1" = {
mode = {
width = 2256;
height = 1504;
refresh = 59.999;
};
};
"HP Inc. HP 24x 1CR9500W9Q" = {
mode = {
width = 1920;
height = 1080;
refresh = 144.001;
};
scale = 1.0;
position = {
x = 2256;
y = 0;
};
};
"Ancor Communications Inc ASUS VS228 F3LMTF154813" = {
mode = {
width = 1920;
height = 1080;
refresh = 60.0;
};
scale = 1.0;
position = {
x = 2256 + 1920;
y = 0;
};
};
};
} }
]; ];

39
hardware/zenix.nix
View file

@ -1,9 +1,12 @@
{ {
config,
lib, lib,
pkgs,
modulesPath, modulesPath,
user,
... ...
}: { }: let
user = config.user;
in {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
./ddc.nix ./ddc.nix
@ -28,6 +31,10 @@
options = ["noatime"]; options = ["noatime"];
}; };
# boot.initrd.luks.devices."usbkey" = {
# device = "/dev/disk/by-label/usbkey1";
# };
boot.initrd.luks.devices."cryptroot" = { boot.initrd.luks.devices."cryptroot" = {
device = "/dev/disk/by-uuid/cc0617df-8cbf-4618-abbc-df64c96de151"; device = "/dev/disk/by-uuid/cc0617df-8cbf-4618-abbc-df64c96de151";
}; };
@ -66,14 +73,6 @@
hardware.cpu.amd.updateMicrocode = true; hardware.cpu.amd.updateMicrocode = true;
hardware.cpu.x86.msr.enable = true; hardware.cpu.x86.msr.enable = true;
hardware.amdgpu = {
opencl.enable = true;
amdvlk = {
enable = true;
support32Bit.enable = true;
};
};
networking.hostName = "zenix"; networking.hostName = "zenix";
services.openssh.enable = true; services.openssh.enable = true;
@ -85,26 +84,6 @@
home-manager.users.${user}.imports = [ home-manager.users.${user}.imports = [
{ {
home.stateVersion = "22.05"; home.stateVersion = "22.05";
programs.niri.settings = {
outputs."HP Inc. HP 24x 1CR9500W9Q" = {
mode = {
width = 1920;
height = 1080;
refresh = 143.855;
};
variable-refresh-rate = true;
scale = 1.0;
};
outputs."HDMI-A-1" = {
mode = {
width = 3840;
height = 2160;
refresh = 120.0;
};
variable-refresh-rate = true;
scale = 2.5;
};
};
} }
]; ];
} }

2
home/default.nix
View file

@ -41,8 +41,6 @@
programs.yazi.enable = true; programs.yazi.enable = true;
programs.bat.enable = true;
programs.zoxide.enable = true; programs.zoxide.enable = true;
programs.rbw = { programs.rbw = {

35
home/desktop/niri/default.nix
View file

@ -11,7 +11,6 @@
]; ];
programs.waybar.settings.mainBar.modules-left = ["niri/workspaces" "niri/window"]; programs.waybar.settings.mainBar.modules-left = ["niri/workspaces" "niri/window"];
programs.waybar.settings.mainBar.modules-right = lib.mkBefore ["niri/language"];
programs.fuzzel = { programs.fuzzel = {
enable = true; enable = true;
@ -33,9 +32,9 @@
programs.niri = { programs.niri = {
settings = { settings = {
input.keyboard = { input.keyboard = {
xkb.layout = "us,gb"; xkb.layout = "us";
xkb.variant = "dvorak,"; xkb.variant = "dvorak";
xkb.options = "caps:escape,esperanto:qwerty,lv3:ralt_switch"; xkb.options = "caps:escape";
}; };
input.mouse = { input.mouse = {
accel-profile = "flat"; accel-profile = "flat";
@ -47,9 +46,9 @@
dwt = true; # disable when typing dwt = true; # disable when typing
}; };
prefer-no-csd = true; prefer-no-csd = true;
xwayland-satellite = { spawn-at-startup = [
path = lib.getExe pkgs.xwayland-satellite; {command = [(lib.getExe pkgs.xwayland-satellite)];}
}; ];
layout = { layout = {
preset-column-widths = [ preset-column-widths = [
{proportion = 1.0;} {proportion = 1.0;}
@ -58,6 +57,25 @@
}; };
environment = { environment = {
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
DISPLAY = ":1";
};
outputs."DP-3" = {
mode = {
width = 1920;
height = 1080;
refresh = 143.855;
};
variable-refresh-rate = true;
scale = 1.0;
};
outputs."HDMI-A-1" = {
mode = {
width = 3840;
height = 2160;
refresh = 120.0;
};
variable-refresh-rate = true;
scale = 2.5;
}; };
binds = with config.lib.niri.actions; { binds = with config.lib.niri.actions; {
"Mod+Return".action.spawn = [(lib.getExe config.programs.terminal)]; "Mod+Return".action.spawn = [(lib.getExe config.programs.terminal)];
@ -110,9 +128,8 @@
"Mod+M".action = switch-preset-column-width; "Mod+M".action = switch-preset-column-width;
"Mod+G".action = toggle-window-floating; "Mod+G".action = toggle-window-floating;
"Mod+Shift+Ctrl+Alt+Space".action = switch-layout "next";
"Print".action.screenshot = []; "Print".action = screenshot;
"XF86AudioRaiseVolume".action.spawn = ["raise-volume"]; "XF86AudioRaiseVolume".action.spawn = ["raise-volume"];
"XF86AudioLowerVolume".action.spawn = ["lower-volume"]; "XF86AudioLowerVolume".action.spawn = ["lower-volume"];

23
home/desktop/utils/waybar.nix
View file

@ -7,7 +7,7 @@
layer = "bottom"; layer = "bottom";
position = "top"; position = "top";
height = 36; height = 36;
modules-right = ["mpris" "power-profiles-daemon" "cpu" "idle_inhibitor" "wireplumber" "clock" "tray" "battery"]; modules-right = ["mpris" "power-profiles-daemon" "cpu" "idle_inhibitor" "pulseaudio" "clock" "tray" "battery"];
"cpu" = { "cpu" = {
"format" = "{icon}"; "format" = "{icon}";
"format-icons" = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"]; "format-icons" = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
@ -35,19 +35,24 @@
tooltip-format-activated = "system sleep inhibited"; tooltip-format-activated = "system sleep inhibited";
tooltip-format-deactivated = "system will sleep when idle"; tooltip-format-deactivated = "system will sleep when idle";
}; };
wireplumber = { pulseaudio = {
format-muted = "🔇"; format-muted = "🔇 {volume}";
format = "{icon} {volume}%"; format = "{icon} {volume}";
format-icons = ["🔈" "🔉" "🔊"]; format-icons.default = ["🔈" "🔉" "🔊"];
on-click = "pwvucontrol"; on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
}; };
mpris = { mpris = {
format = "▶️ {title}"; format = "{player_icon} {title}";
format-paused = "⏸️ {title}"; format-paused = "⏸️ {player_icon} {title}";
player-icons = {
default = "▶️";
mpd = "🎵";
kdeconnect = "☎️";
};
}; };
battery = { battery = {
format = "{icon} {capacity}%"; format = "{icon} {capacity}%";
format-icons = ["🪫" "🔋" "🔋"]; format-icons = ["🤏" "🪫" "🔋" "🔋"];
format-charging = "🔌 {capacity}%"; format-charging = "🔌 {capacity}%";
states = { states = {
warning = 30; warning = 30;

1
home/modules/email.nix
View file

@ -71,6 +71,7 @@ in {
sidebar.enable = true; sidebar.enable = true;
}; };
programs.mbsync.enable = cfg.terminal; programs.mbsync.enable = cfg.terminal;
services.mbsync.enable = cfg.terminal;
programs.aerc = { programs.aerc = {
enable = cfg.terminal; enable = cfg.terminal;

1
home/programs/gamer.nix
View file

@ -8,6 +8,7 @@
# Helpers # Helpers
heroic heroic
lutris
gamescope gamescope
gamemode gamemode
mangohud mangohud

1
home/programs/graphical.nix
View file

@ -25,6 +25,7 @@
youtube-music youtube-music
transmission_4-gtk transmission_4-gtk
feishin feishin
grayjay
# other # other
element-desktop element-desktop

3
home/programs/work.nix
View file

@ -1,7 +1,6 @@
{ {
config, config,
pkgs, pkgs,
lib,
... ...
}: let }: let
modifier = config.windowManager.modifierKey; modifier = config.windowManager.modifierKey;
@ -44,7 +43,7 @@ in {
home.sessionVariables = { home.sessionVariables = {
CYPRESS_INSTALL_BINARY = 0; CYPRESS_INSTALL_BINARY = 0;
CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress"; CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
MONGOMS_SYSTEM_BINARY = lib.getExe' pkgs.mongodb-7_0 "mongod"; MONGOMS_SYSTEM_BINARY = "${pkgs.callPackage ../../pkgs/mongodb.nix pkgs}/bin/mongod";
}; };
gtk.gtk3.bookmarks = [ gtk.gtk3.bookmarks = [

1
home/workstation.nix
View file

@ -28,6 +28,7 @@
playerctl playerctl
quickemu quickemu
devenv devenv
bottles
]; ];
services.udiskie = { services.udiskie = {

7
nixos/default.nix
View file

@ -1,11 +1,13 @@
# https://search.nixos.org/options # https://search.nixos.org/options
{ {
inputs, inputs,
config,
pkgs, pkgs,
lib, lib,
user,
... ...
}: { }: let
user = config.user;
in {
nix = { nix = {
settings = { settings = {
experimental-features = ["nix-command" "flakes" "pipe-operators"]; experimental-features = ["nix-command" "flakes" "pipe-operators"];
@ -96,7 +98,6 @@
nix-tree nix-tree
comma comma
jq jq
bat
]; ];
boot.kernel.sysctl = { boot.kernel.sysctl = {

1
nixos/modules/work.nix
View file

@ -12,7 +12,6 @@ in {
"steam-run" "steam-run"
"postman" "postman"
"drawio" # the creator had a hissyfit over a negative review: https://github.com/jgraph/drawio/discussions/4623 "drawio" # the creator had a hissyfit over a negative review: https://github.com/jgraph/drawio/discussions/4623
"mongodb"
]; ];
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [

10
nixos/programs/auto-login.nix Normal file
View file

@ -0,0 +1,10 @@
command: {user, ...}: {
services.greetd = {
enable = true;
settings = {
default_session = {
inherit command user;
};
};
};
}

5
nixos/programs/gamer.nix
View file

@ -12,13 +12,10 @@
dedicatedServer.openFirewall = true; dedicatedServer.openFirewall = true;
gamescopeSession = { gamescopeSession = {
enable = true; enable = true;
args = ["-r" "120" "-W" "3840" "-H" "2160" "-O" "HDMI-A-1" "--rt" "--hdr-enabled" "--adaptive-sync" "--xwayland-count" "2"]; args = ["-r" "120" "-W" "3840" "-H" "2160" "-O" "HDMI-A-1" "--rt" "--hdr-enabled" "--adaptive-sync"];
env = { env = {
PROTON_ENABLE_WAYLAND = "1";
PROTON_ENABLE_HDR = "1";
ENABLE_HDR_WSI = "1"; ENABLE_HDR_WSI = "1";
DXVK_HDR = "1"; DXVK_HDR = "1";
STEAM_MULTIPLE_XWAYLANDS = "1";
}; };
}; };
}; };

66
nixos/services/grafana.nix
View file

@ -1,27 +1,15 @@
{ {config, lib, pkgs, ...}: let
config,
lib,
pkgs,
...
}: let
cfg = config.services.grafana; cfg = config.services.grafana;
secrets = config.sops.secrets; secrets = config.sops.secrets;
mkDashboards = dashboards: mkDashboards = dashboards: pkgs.symlinkJoin {
pkgs.symlinkJoin { name = "dashboards";
name = "dashboards"; paths = map mkDashboard dashboards;
paths = map mkDashboard dashboards; };
}; mkDashboard = {name, url, sha256, patch ? lib.id}: pkgs.writeTextFile {
mkDashboard = { inherit name;
name, text = patch (builtins.readFile ( builtins.fetchurl {inherit url sha256;} ));
url, destination = "/dash/${name}.json";
sha256, };
patch ? lib.id,
}:
pkgs.writeTextFile {
inherit name;
text = patch (builtins.readFile (builtins.fetchurl {inherit url sha256;}));
destination = "/dash/${name}.json";
};
in { in {
sops.secrets."grafana/oidc_client_secret" = { sops.secrets."grafana/oidc_client_secret" = {
owner = "grafana"; owner = "grafana";
@ -46,26 +34,24 @@ in {
role_attribute_path = "contains(groups[*], 'Grafana Admins') && 'Admin' || contains(groups[*], 'Grafana Editors') && 'Editor' || 'Viewer'"; role_attribute_path = "contains(groups[*], 'Grafana Admins') && 'Admin' || contains(groups[*], 'Grafana Editors') && 'Editor' || 'Viewer'";
}; };
}; };
provision.dashboards.settings.providers = [ provision.dashboards.settings.providers = [{
name = "Node Exporter";
type = "file";
options.path = mkDashboards [
{ {
name = "Node Exporter"; name = "node-exporter";
type = "file"; url = "https://grafana.com/api/dashboards/1860/revisions/37/download";
options.path = mkDashboards [ sha256 = "sha256:0qza4j8lywrj08bqbww52dgh2p2b9rkhq5p313g72i57lrlkacfl";
{ # https://github.com/rfmoz/grafana-dashboards/issues/169
name = "node-exporter"; patch = builtins.replaceStrings ["$__rate_interval"] ["$__range"];
url = "https://grafana.com/api/dashboards/1860/revisions/37/download";
sha256 = "sha256:0qza4j8lywrj08bqbww52dgh2p2b9rkhq5p313g72i57lrlkacfl";
# https://github.com/rfmoz/grafana-dashboards/issues/169
patch = builtins.replaceStrings ["$__rate_interval"] ["$__range"];
}
{
name = "synapse";
url = "https://raw.githubusercontent.com/element-hq/synapse/refs/heads/master/contrib/grafana/synapse.json";
sha256 = "sha256:0yzj1i4zbjy9cms75ip6ad8qyjgv9kka42gxsbzyzr2syznsmqw0";
}
];
} }
]; {
name = "synapse";
url = "https://raw.githubusercontent.com/element-hq/synapse/refs/heads/master/contrib/grafana/synapse.json";
sha256 = "sha256:16fl81sx1by0wldw4vda0zr1pvbq1dpih1fikzwlvmk63mpc80kb";
}
];
}];
}; };
services.nginx.virtualHosts = { services.nginx.virtualHosts = {
${cfg.settings.server.domain} = { ${cfg.settings.server.domain} = {

8
nixos/services/monero.nix
View file

@ -8,13 +8,9 @@
extraConfig = '' extraConfig = ''
prune-blockchain=1 prune-blockchain=1
confirm-external-bind=1 confirm-external-bind=1
out-peers=8 out-peers=64 # This will enable much faster sync and tx awareness; the default 8 is suboptimal nowadays
in-peers=16 in-peers=1024 # The default is unlimited; we prefer to put a cap on this
zmq-pub=tcp://localhost:18083 zmq-pub=tcp://localhost:18083
add-priority-node=p2pmd.xmrvsbeast.com:18080
add-priority-node=nodes.hashvault.pro:18080
enable-dns-blocklist=1
enforce-dns-checkpointing=1
''; '';
}; };
} }

17
nixos/services/musnix.nix
View file

@ -25,22 +25,5 @@
carla carla
drumgizmo drumgizmo
distrho-ports distrho-ports
surge
surge-XT
guitarix
gxplugins-lv2
airwindows-lv2
mod-distortion
mod-arpeggiator-lv2
aether-lv2
neural-amp-modeler-lv2
bchoppr
bshapr
chow-tape-model
chow-kick
chow-phaser
chow-centaur
quadrafuzz
fire
]; ];
} }

19
nixos/workstation.nix
View file

@ -3,7 +3,6 @@
pkgs, pkgs,
lib, lib,
config, config,
user,
... ...
}: { }: {
imports = [ imports = [
@ -22,11 +21,12 @@
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
services.blueman.enable = true; services.blueman.enable = true;
services.power-profiles-daemon.enable = true;
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
services.displayManager.cosmic-greeter.enable = true; programs.kdeconnect.enable = true;
virtualisation.waydroid.enable = true;
networking.stevenblack = { networking.stevenblack = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
@ -76,11 +76,18 @@
}; };
qt.enable = true; qt.enable = true;
fonts.packages = with pkgs; [ nixpkgs.overlays = [
nerd-fonts.symbols-only (final: prev: {
interalia = prev.callPackage ../pkgs/interalia.nix {};
})
]; ];
home-manager.users.${user}.imports = [ fonts.packages = with pkgs; [
nerd-fonts.symbols-only
interalia
];
home-manager.users.${config.user}.imports = [
../home/workstation.nix ../home/workstation.nix
]; ];