Compare commits

..

No commits in common. "6a61f70457752a7dfcfb730351946b6b4b3df23a" and "5c4c73eda2e261bf9126e2f1a8a1044fa67c1ac9" have entirely different histories.

7 changed files with 58 additions and 125 deletions

View file

@ -78,11 +78,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1733319615, "lastModified": 1732922729,
"narHash": "sha256-QWQPdJiC6ab3J2rThuLoFJivkEOvMNkzOIn5qJLhIQg=", "narHash": "sha256-vp02vUhYVA2yECXTPXifUgb3YtEPYaerpD6lts99010=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "d6a32b476215dbe915ccfa123fcd16d59d21a2c6", "rev": "e581215cbee1ccf67a08f478d3c49808bc93a523",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -121,11 +121,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733168902, "lastModified": 1732988076,
"narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", "narHash": "sha256-2uMaVAZn7fiyTUGhKgleuLYe5+EAAYB/diKxrM7g3as=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", "rev": "2814a5224a47ca19e858e027f7e8bff74a8ea9f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -170,11 +170,11 @@
"flake-compat_3": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1732722421,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -312,11 +312,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733175814, "lastModified": 1732884235,
"narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bf23fe41082aa0289c209169302afd3397092f22", "rev": "819f682269f4e002884702b87e445c82840c68f2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -332,11 +332,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733389730, "lastModified": 1732884235,
"narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", "rev": "819f682269f4e002884702b87e445c82840c68f2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -374,40 +374,10 @@
"type": "github" "type": "github"
} }
}, },
"hyprgraphics": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1733248371,
"narHash": "sha256-FFLJzFTyNhS7tBEEECx0B8Ye/bpmxhFVEKlECgMLc6c=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "cc95e5babc6065bc3ab4cd195429a9900836ef13",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprgraphics",
"type": "github"
}
},
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"aquamarine": "aquamarine", "aquamarine": "aquamarine",
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprgraphics": "hyprgraphics",
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
@ -418,11 +388,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1733369810, "lastModified": 1732988560,
"narHash": "sha256-veg37osP0Nmby/Bt7mdqD6k+Co3wO4jwnth0B2Z7vHU=", "narHash": "sha256-CGtf2NTXgvAH0qXaYXMyZA5Dbw+86B3/jMmXz6QUCW0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "ceef4fb3a5efe1617790f56e2701846a21c2533d", "rev": "d26439a0fe5594fb26d5a3c01571f9490a9a2d2c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -653,11 +623,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733212471, "lastModified": 1732521221,
"narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -669,11 +639,11 @@
}, },
"nixpkgs-smol": { "nixpkgs-smol": {
"locked": { "locked": {
"lastModified": 1733380312, "lastModified": 1732951447,
"narHash": "sha256-ywntxT10Om755wkB9tYgJwEwELQZKYAO5WcNuHv1vjI=", "narHash": "sha256-ndq0dD5E6FkqwmNYFS1wUAHa/5HixS3jLjulogM+7/E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a772498086eac57d97065a980a21fc0f304e3192", "rev": "57feb2a16f705eeffb075888d92a986e66473012",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -733,11 +703,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1733212471, "lastModified": 1732837521,
"narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -781,11 +751,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1733396819, "lastModified": 1733007906,
"narHash": "sha256-AEBmhobRo6PcvaZn9oEfjsQ/NElKBIBj8Va7sivSyzw=", "narHash": "sha256-AWZDsIrTjSONyHIKu4Zl5MM1IbFbXK/0IbBHU9ZraFw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e6098b0360b6436634f3604c134e99b608a8c252", "rev": "d886a37e34f46a1a5c3571b0e98c839f92a72715",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -866,11 +836,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733128155, "lastModified": 1732575825,
"narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -887,11 +857,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733372233, "lastModified": 1732940172,
"narHash": "sha256-nEpd7QFcjHXop4Km9ldh1fXq0K10/u7kPlchPXl44/g=", "narHash": "sha256-0at0wkwsaJfJBCGlwtXfg2JdeY30mZXhrWeoNqhLEYc=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "8a832957847b643f758263293ccca6e801614a1c", "rev": "0b712938230ab50d2e0cf961cc0f3660f7b18041",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1020,11 +990,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1733323770, "lastModified": 1732918908,
"narHash": "sha256-UgxwyPAbnclzcWGltV1UKfoUihKJLv+o6aN0PWL0DUw=", "narHash": "sha256-k43oaC+35/LGqJ+3MjIhn4Ko+ap3wTvHCJ4sj9W/o+k=",
"owner": "wez", "owner": "wez",
"repo": "wezterm", "repo": "wezterm",
"rev": "72e723187ca3596b67bcd3786457234ed40c75d2", "rev": "4906789a6d61da58f73b95f89b59c41af60e0f3b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -17,13 +17,6 @@
initrd.kernelModules = [ ]; initrd.kernelModules = [ ];
kernelPackages = pkgs.linuxPackages_6_12; kernelPackages = pkgs.linuxPackages_6_12;
kernelModules = [ "kvm-amd" ]; kernelModules = [ "kvm-amd" ];
kernel = {
sysctl = {
"vm.max_map_count" = 2147483642;
"net.ipv4.ip_forward" = 1;
"net.ipv6.conf.all.forwarding" = 1;
};
};
extraModulePackages = [ ]; extraModulePackages = [ ];
loader.grub = { loader.grub = {
enable = true; enable = true;
@ -31,8 +24,9 @@
}; };
}; };
nixpkgs.config.allowUnfreePredicate = pkg: nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
builtins.elem (lib.getName pkg) [ "netdata" ]; "netdata"
];
nix = { nix = {
package = pkgs.lix; package = pkgs.lix;
@ -100,21 +94,6 @@
}; };
services = { services = {
tailscale = {
enable = true;
useRoutingFeatures = "server";
openFirewall = true;
};
networkd-dispatcher = {
enable = true;
rules."50-tailscale" = {
onState = [ "routable" ];
script = ''
${lib.getExe pkgs.ethtool} -K ens3 rx-udp-gro-forwarding on rx-gro-list off
'';
};
};
earlyoom = { earlyoom = {
enable = true; enable = true;
@ -191,7 +170,9 @@
"access log" = "none"; "access log" = "none";
"error log" = "syslog"; "error log" = "syslog";
}; };
package = pkgs.netdata.override { withCloudUi = true; }; package = pkgs.netdata.override {
withCloudUi = true;
};
}; };
forgejo = { forgejo = {
@ -306,7 +287,5 @@
jq jq
busybox busybox
fish fish
ethtool
networkd-dispatcher
]; ];
} }

View file

@ -48,9 +48,6 @@
follow_mouse = 1; follow_mouse = 1;
sensitivity = 0.1; sensitivity = 0.1;
force_no_accel = true; force_no_accel = true;
tablet = {
left_handed = true;
};
}; };
general = { general = {

View file

@ -19,8 +19,8 @@
bind = [ bind = [
"Super, mouse_up, workspace, +1" "Super, mouse_up, workspace, +1"
"Super, mouse_down, workspace, -1" "Super, mouse_down, workspace, -1"
"Super, Page_up, workspace, -1" "Super, Page_up, workspace, +1"
"Super, Page_down, workspace, +1" "Super, Page_down, workspace, -1"
"Super+Shift, S, togglespecialworkspace" "Super+Shift, S, togglespecialworkspace"

View file

@ -1,8 +1,12 @@
{ config, pkgs, inputs, ... }: { { config, pkgs, inputs, ... }: {
nixpkgs = { nixpkgs = {
overlays = [ inputs.nur.overlay ]; overlays = [
config = { allowUnfree = true; }; inputs.nur.overlay
];
config = {
allowUnfree = true;
};
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -16,10 +20,8 @@
programs = { programs = {
steam = { steam = {
enable = true; enable = true;
remotePlay.openFirewall = remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
dedicatedServer.openFirewall =
true; # Open ports in the firewall for Source Dedicated Server
}; };
gamemode.enable = true; gamemode.enable = true;
alvr = { alvr = {
@ -39,13 +41,7 @@
hardware = { hardware = {
amdgpu.opencl.enable = true; # For davinci-resolve amdgpu.opencl.enable = true; # For davinci-resolve
opentabletdriver = { # opentabletdriver.enable = true;
enable = true; # For osu!
daemon.enable = true;
blacklistedKernelModules = [
"wacom"
];
};
graphics = { graphics = {
enable = true; enable = true;
enable32Bit = true; enable32Bit = true;

View file

@ -4,6 +4,5 @@
./vpn.nix ./vpn.nix
./pipewire.nix ./pipewire.nix
./bluetooth.nix ./bluetooth.nix
./tailscale.nix
]; ];
} }

View file

@ -1,8 +0,0 @@
{ pkgs, ... }: {
services.tailscale = {
enable = true;
};
environment.systemPackages = with pkgs; [
trayscale
];
}