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

framework: update

Browse source
This commit is contained in:
Tristan 2026-01-05 09:58:06 +00:00
commit 2d24a1e8e1
13 changed files with 138 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

98
flake.lock generated
View file

@ -21,17 +21,17 @@
"base16-fish": { "base16-fish": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1754405784, "lastModified": 1765809053,
"narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
"owner": "tomyun", "owner": "tomyun",
"repo": "base16-fish", "repo": "base16-fish",
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "tomyun", "owner": "tomyun",
"repo": "base16-fish", "repo": "base16-fish",
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
"type": "github" "type": "github"
} }
}, },
@ -79,11 +79,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765210039, "lastModified": 1765831383,
"narHash": "sha256-7nzwLyKSW/+9LHsk5TjELy+vT1r7H9mpyFW2KOqFf9U=", "narHash": "sha256-P5F/VPjjGw7s0AOTPb3z3gxqtH0YkAnd/c9P6QdWrEU=",
"owner": "HeitorAugustoLN", "owner": "HeitorAugustoLN",
"repo": "cosmic-manager", "repo": "cosmic-manager",
"rev": "d30d013b603ad79c45fb3cfa3f26a7dec06849e0", "rev": "819d4d21fb90460dd11416d81d2cff65a53b8a59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -137,11 +137,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765495779, "lastModified": 1765835352,
"narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "5635c32d666a59ec9a55cab87e898889869f7b71", "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -231,11 +231,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765605144, "lastModified": 1767514898,
"narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=", "narHash": "sha256-ONYqnKrPzfKEEPChoJ9qPcfvBqW9ZgieDKD7UezWPg4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "90b62096f099b73043a747348c11dbfcfbdea949", "rev": "7a06e8a2f844e128d3b210a000a62716b6040b7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -278,11 +278,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1764554060, "lastModified": 1767232402,
"narHash": "sha256-vewrwjGqublgja1bvlIybRnlltKHLNlnP7WYDg+9h1Y=", "narHash": "sha256-li+h6crnhc5Zqs+M6pn7D7M0W9M63ECNennDjRgzioE=",
"owner": "musnix", "owner": "musnix",
"repo": "musnix", "repo": "musnix",
"rev": "599562080b2901046829ca69e0d1461041d27b32", "rev": "d65f98e0b1f792365f1705653d7b2d266ceeff6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -303,11 +303,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1765786620, "lastModified": 1767544157,
"narHash": "sha256-MPgXA3vfeUclJAt1r1LfH6TXmcqDEJm3HVDjr4Y1fIs=", "narHash": "sha256-DVTMOUd4uHkDcZXWAqOS+Pa0M9a27G1Ya3B7SFG6BQs=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "97440574d71b235b601013edf4749397b1ce99a6", "rev": "d0e2c4bebf9d0b879410736f7abce628976bfb92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -336,11 +336,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765687800, "lastModified": 1767530622,
"narHash": "sha256-Erk+ypR8N+rCvjMdUB1N/v4jtm4QRH9k7r/9zh2HyC8=", "narHash": "sha256-ywnL1cc0A6fni7m859ImiBYA8DlXXJ+5OXIlcBqJ2B0=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "7c0898570ca5bd3f10fbf4cf2f8a00edc48d787b", "rev": "54c2e2ab476629d17fdba861895f58e7cdac32ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -351,11 +351,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1764242076, "lastModified": 1766902085,
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -367,11 +367,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1765762245, "lastModified": 1767480499,
"narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -383,11 +383,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1765762245, "lastModified": 1767480499,
"narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -398,11 +398,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1765472234, "lastModified": 1766070988,
"narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -422,11 +422,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1765796859, "lastModified": 1767448089,
"narHash": "sha256-c2YaJUsLGk3WNqIHIU/Pt1fGjNH02ePsHfD5MJlfEe4=", "narHash": "sha256-U1fHsZBnFrUil731NHD9Sg5HoiG+eSHau8OFuClhwW0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "d8c9d8451d4592dd7de647230f407d4d6370bd8e", "rev": "983751b66f255bbea1adc185364e9e7b73f82358",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -504,11 +504,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765684837, "lastModified": 1767499857,
"narHash": "sha256-fJCnsYcpQxxy/wit9EBOK33c0Z9U4D3Tvo3gf2mvHos=", "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "94d8af61d8a603d33d1ed3500a33fcf35ae7d3bc", "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -538,11 +538,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1765802640, "lastModified": 1766603740,
"narHash": "sha256-rLGl6MaC4pwGcLJ14sfFb8r5rbvWb6ZRTfztcLJHwIU=", "narHash": "sha256-F0BovrhzY/siRQYBRUFn2sZH7TJEuwetOJiGgKtITjk=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "4e63fa32d8beefd2f222181e8ca8d41eb9a7e153", "rev": "cfe89cabaae6ea1bbf80709bd53181494566a1b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -698,11 +698,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765343581, "lastModified": 1766429945,
"narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=", "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95", "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -716,11 +716,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1765772419, "lastModified": 1767307876,
"narHash": "sha256-1mQ1K4fqebT54nz13rcRNjd6a+IbNLwLvYyR62EcyE8=", "narHash": "sha256-d5EKvUnfr6tdhymIThz0WGG0JHT2cCZzbZK4t2CwYuc=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "227e836e43fe7985b4c4f8b0076446a6d66f3343", "rev": "c5bffaf433e6137fe80cd1930584836f11119b26",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -49,7 +49,7 @@
zenix = mkConf { zenix = mkConf {
nixos-modules = [ nixos-modules = [
./hardware/zenix.nix ./hardware/zenix.nix
./nixos/programs/niri.nix ./nixos/programs/hyprland.nix
./nixos/programs/gamer.nix ./nixos/programs/gamer.nix
./nixos/programs/personal.nix ./nixos/programs/personal.nix
./nixos/services/musnix.nix ./nixos/services/musnix.nix

68
hardware/framework-13.nix
View file

@ -80,40 +80,40 @@
''; '';
}; };
programs.niri.settings.outputs = { # programs.niri.settings.outputs = {
# Laptop display # # Laptop display
"eDP-1" = { # "eDP-1" = {
mode = { # mode = {
width = 2256; # width = 2256;
height = 1504; # height = 1504;
refresh = 59.999; # refresh = 59.999;
}; # };
}; # };
"HP Inc. HP 24x 1CR9500W9Q" = { # "HP Inc. HP 24x 1CR9500W9Q" = {
mode = { # mode = {
width = 1920; # width = 1920;
height = 1080; # height = 1080;
refresh = 144.001; # refresh = 144.001;
}; # };
scale = 1.0; # scale = 1.0;
position = { # position = {
x = 2256; # x = 2256;
y = 0; # y = 0;
}; # };
}; # };
"Ancor Communications Inc ASUS VS228 F3LMTF154813" = { # "Ancor Communications Inc ASUS VS228 F3LMTF154813" = {
mode = { # mode = {
width = 1920; # width = 1920;
height = 1080; # height = 1080;
refresh = 60.0; # refresh = 60.0;
}; # };
scale = 1.0; # scale = 1.0;
position = { # position = {
x = 2256 + 1920; # x = 2256 + 1920;
y = 0; # y = 0;
}; # };
}; # };
}; # };
} }
]; ];

44
hardware/zenix.nix
View file

@ -68,10 +68,6 @@
hardware.amdgpu = { hardware.amdgpu = {
opencl.enable = true; opencl.enable = true;
amdvlk = {
enable = true;
support32Bit.enable = true;
};
}; };
networking.hostName = "zenix"; networking.hostName = "zenix";
@ -85,26 +81,26 @@
home-manager.users.${user}.imports = [ home-manager.users.${user}.imports = [
{ {
home.stateVersion = "22.05"; home.stateVersion = "22.05";
programs.niri.settings = { # programs.niri.settings = {
outputs."HP Inc. HP 24x 1CR9500W9Q" = { # outputs."HP Inc. HP 24x 1CR9500W9Q" = {
mode = { # mode = {
width = 1920; # width = 1920;
height = 1080; # height = 1080;
refresh = 143.855; # refresh = 143.855;
}; # };
variable-refresh-rate = true; # variable-refresh-rate = true;
scale = 1.0; # scale = 1.0;
}; # };
outputs."HDMI-A-1" = { # outputs."HDMI-A-1" = {
mode = { # mode = {
width = 3840; # width = 3840;
height = 2160; # height = 2160;
refresh = 120.0; # refresh = 120.0;
}; # };
variable-refresh-rate = true; # variable-refresh-rate = true;
scale = 2.5; # scale = 2.5;
}; # };
}; # };
} }
]; ];
} }

7
home/desktop/hyprland/default.nix
View file

@ -33,11 +33,10 @@ in {
scroll_factor = 0.5; scroll_factor = 0.5;
}; };
kb_options = lib.mkDefault "caps:escape"; kb_options = lib.mkDefault "caps:escape";
kb_layout = lib.mkDefault "gb"; kb_layout = lib.mkDefault "us";
kb_variant = lib.mkDefault "dvorak";
numlock_by_default = true; numlock_by_default = true;
}; accel_profile = "flat";
gestures = {
workspace_swipe = true;
}; };
decoration = { decoration = {
rounding = 0; rounding = 0;

2
home/programs/gamer.nix
View file

@ -2,7 +2,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
# Games # Games
airshipper airshipper
minetest luanti
superTuxKart superTuxKart
xonotic xonotic

8
home/programs/graphical.nix
View file

@ -67,12 +67,4 @@
]; ];
}; };
programs.zed-editor = {
enable = true;
extensions = ["tsgo" "nix" "ansible" "helm"];
userSettings = {
vim_mode = true;
};
extraPackages = [pkgs.nixd pkgs.vtsls];
};
} }

1
home/programs/personal/default.nix
View file

@ -38,7 +38,6 @@
krita krita
organicmaps organicmaps
anki anki
bookworm
jellyfin-mpv-shim jellyfin-mpv-shim
]; ];
} }

13
nixos/programs/gamer.nix
View file

@ -1,4 +1,4 @@
{...}: { {pkgs, ...}: {
allowUnfreePkgNames = [ allowUnfreePkgNames = [
"steam" "steam"
"steam-unwrapped" "steam-unwrapped"
@ -27,4 +27,15 @@
capSysNice = true; capSysNice = true;
}; };
programs.gamemode.enable = true; programs.gamemode.enable = true;
nixpkgs.config.permittedInsecurePackages = [
"mbedtls-2.28.10"
];
services.xserver.desktopManager.retroarch = {
enable = true;
package = pkgs.retroarch.withCores (cores:
with cores; [
bsnes
beetle-psx-hw
]);
};
} }

6
nixos/programs/personal.nix
View file

@ -1,4 +1,4 @@
{...}: { {pkgs, ...}: {
i18n.supportedLocales = [ i18n.supportedLocales = [
"eo/UTF-8" "eo/UTF-8"
"en_GB.UTF-8/UTF-8" "en_GB.UTF-8/UTF-8"
@ -9,4 +9,8 @@
enable = true; enable = true;
}; };
}; };
environment.systemPackages = with pkgs; [
warpinator
];
networking.firewall.allowedTCPPorts = [42000 42001];
} }

2
nixos/services/grafana.nix
View file

@ -61,7 +61,7 @@ in {
{ {
name = "synapse"; name = "synapse";
url = "https://raw.githubusercontent.com/element-hq/synapse/refs/heads/master/contrib/grafana/synapse.json"; url = "https://raw.githubusercontent.com/element-hq/synapse/refs/heads/master/contrib/grafana/synapse.json";
sha256 = "sha256:0yzj1i4zbjy9cms75ip6ad8qyjgv9kka42gxsbzyzr2syznsmqw0"; sha256 = "sha256:1lhhhzjm1rj25gg6dnmgwaxr05f8p2ndrlygdnjqzam7s6y75db3";
} }
]; ];
} }

8
nixos/services/prometheus.nix
View file

@ -3,7 +3,7 @@
nodes = [ nodes = [
"alpine" "alpine"
"100.106.49.128" # laptop "100.106.49.128" # laptop
"100.65.29.110" # gaming pc "100.78.76.10" # gaming pc
]; ];
addPort = ip: "${ip}:${toString prometheus.exporters.node.port}"; addPort = ip: "${ip}:${toString prometheus.exporters.node.port}";
in { in {
@ -68,11 +68,13 @@ in {
configuration = { configuration = {
route = { route = {
receiver = "alertmanager-ntfy"; receiver = "alertmanager-ntfy";
routes = [{ routes = [
{
matchers = [ matchers = [
''node_filesystem_device_error != 0'' ''node_filesystem_device_error != 0''
]; ];
}]; }
];
}; };
}; };
}; };

4
nixos/services/vaultwarden.nix
View file

@ -5,6 +5,10 @@ in {
services.vaultwarden = { services.vaultwarden = {
enable = true; enable = true;
backupDir = "/mnt/storage/backups/vaultwarden"; backupDir = "/mnt/storage/backups/vaultwarden";
config = {
ROCKET_ADDRESS = "::1";
ROCKET_PORT = 8222;
};
}; };
services.nginx.virtualHosts.${domain} = { services.nginx.virtualHosts.${domain} = {
forceSSL = true; forceSSL = true;