This commit is contained in:
Max Chaev 2024-11-24 11:37:23 +03:00
parent c506178309
commit b9595c7e4d
9 changed files with 76 additions and 52 deletions

84
flake.lock generated
View File

@ -5,11 +5,11 @@
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
}, },
"locked": { "locked": {
"lastModified": 1708890466, "lastModified": 1732200724,
"narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "base16.nix", "repo": "base16.nix",
"rev": "665b3c6748534eb766c777298721cece9453fdae", "rev": "153d52373b0fb2d343592871009a286ec8837aec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -161,11 +161,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1731533236,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -198,11 +198,11 @@
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1689549921, "lastModified": 1731966426,
"narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "fromYaml", "repo": "fromYaml",
"rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", "rev": "106af9e2f715e2d828df706c386a685698f3223b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -228,11 +228,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731363552, "lastModified": 1732021966,
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,11 +287,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731604581, "lastModified": 1732025103,
"narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -308,11 +308,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731535640, "lastModified": 1732025103,
"narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "35b055009afd0107b69c286fca34d2ad98940d57", "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -329,11 +329,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724435763, "lastModified": 1730837930,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,11 +378,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731454423, "lastModified": 1732016537,
"narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=", "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "6c71c49e2448e51ad830ed211024e6d0edc50116", "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -393,11 +393,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731531548, "lastModified": 1731890469,
"narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "24f0d4acd634792badd6470134c387a3b039dace", "rev": "5083ec887760adfe12af64830a66807423a859a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -409,11 +409,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1731319897, "lastModified": 1732014248,
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dc460ec76cbff0e66e269457d7b728432263166c", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -454,11 +454,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1731675303, "lastModified": 1732143099,
"narHash": "sha256-Pd0ZZICCwwDIE+ruHTDg8Oaizna5bJrdw5BSTht+Pdc=", "narHash": "sha256-lh2Qi8gd1SwJVGo7gJjoFvS/djS5Nimaw25j792PJjM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "46e574d4ea1642dd87a6bfb162053c52b2e4878b", "rev": "2f71c4250bef7a52fe21bd00d1e58c119f62008c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -477,11 +477,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731347683, "lastModified": 1731936508,
"narHash": "sha256-BcSWCEUBShuB32LPif+EG0XGXyUi2jyjCSpGE1rbOws=", "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "135d202e032be70c93b6d7d53592ef4799d6efde", "rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -516,11 +516,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1731657386, "lastModified": 1732261424,
"narHash": "sha256-Mm/JL8tFUS1SOmmZDPcswExUxzw0VpHcEyZI1h58CGA=", "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f", "rev": "b667a340730dd3d0596083aa7c949eef01367c62",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -617,11 +617,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730321837, "lastModified": 1732111664,
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "narHash": "sha256-XWHuPWcP59QnHEewdZJXBX1TA2lAP78Vz4daG6tfIr4=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "rev": "62003fdad7a5ab7b6af3ea9bd7290e4c220277d0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -3,8 +3,8 @@
{ {
programs.git = { programs.git = {
enable = true; enable = true;
userEmail = "dixxe.mail@proton.me"; # Hello there :D. userName = "dixxe";
userName = "ficache"; userEmail = "max.pan@tuta.io";
extraConfig = { extraConfig = {
credential.helper = [ credential.helper = [
"cache --timeout 21600" "cache --timeout 21600"
@ -16,8 +16,5 @@
home.packages = with pkgs; [ # Pretty wonky, but idk home.packages = with pkgs; [ # Pretty wonky, but idk
git-credential-oauth # how to make it better git-credential-oauth # how to make it better
gnupg
pinentry-qt
meld
]; ];
} }

View File

@ -3,9 +3,11 @@
programs.helix = { programs.helix = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
marksman marksman
nil nil
]; ];
# Stylix have troubles with theme for helix right now.
}; };
} }

View File

@ -5,7 +5,7 @@
stylix = { stylix = {
enable = true; enable = true;
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-soft.yaml"; base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-frappe.yaml";
image = ../../wallpaper3.png; image = ../../wallpaper3.png;

View File

@ -0,0 +1,13 @@
{ pkgs, ... }:
{
programs.vscode = {
enable = true;
package = pkgs.vscodium;
extensions = with pkgs.vscode-extensions; [
jnoortheen.nix-ide
ms-dotnettools.vscode-dotnet-runtime
ms-dotnettools.csharp
golang.go
];
};
}

View File

@ -4,6 +4,7 @@
./modules/git.nix ./modules/git.nix
./modules/stylix.nix ./modules/stylix.nix
./modules/syncthing.nix ./modules/syncthing.nix
./modules/helix.nix #./modules/helix.nix
./modules/vscodium.nix
]; ];
} }

View File

@ -4,7 +4,6 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
obsidian obsidian
alacritty alacritty
grimblast
vlc vlc
# Social stuff # Social stuff
@ -17,11 +16,14 @@
# Minecraft stuff # Minecraft stuff
prismlauncher prismlauncher
#Random stuff #Development stuff
krita krita
dotnetCorePackages.sdk_9_0
godot_4-mono
]; ];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"obsidian" "obsidian"
]; ];
} }

View File

@ -0,0 +1,8 @@
{ ... }:
{
services.zerotierone = {
enable = true;
joinNetworks = [ "41d49af6c287fe2b" ];
};
}

View File

@ -4,6 +4,7 @@
./modules/pipewire.nix ./modules/pipewire.nix
./modules/auto-cpufreq.nix ./modules/auto-cpufreq.nix
./modules/zapret.nix ./modules/zapret.nix
./modules/zerotierone.nix
./modules/hardware/nvidia.nix ./modules/hardware/nvidia.nix
./modules/hardware/battery-threshold.nix ./modules/hardware/battery-threshold.nix