Compare commits
3
Commits
c4c77bec1b
...
77d514fcd2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
77d514fcd2
|
||
|
|
a79986153f
|
||
|
|
5e6f0bf09f
|
Generated
+51
-33
@@ -7,11 +7,11 @@
|
|||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772290697,
|
"lastModified": 1771029844,
|
||||||
"narHash": "sha256-MyLNx13P+pv1RszO1rMd3144NEeU/oU4iL+xOTpRoaU=",
|
"narHash": "sha256-fY6UGNKCQcYkflnkdzNRbuGNJiavQzokZjMCMVfUgCg=",
|
||||||
"owner": "ezKEa",
|
"owner": "ezKEa",
|
||||||
"repo": "aagl-gtk-on-nix",
|
"repo": "aagl-gtk-on-nix",
|
||||||
"rev": "dcb53a4cb4cb09ef7f08328428ba559be5b9f01b",
|
"rev": "c3b9c0ab9e24d1648ed29040164704a1cd8fa3c9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -313,11 +313,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772633327,
|
"lastModified": 1771037579,
|
||||||
"narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=",
|
"narHash": "sha256-NX5XuhGcsmk0oEII2PEtMRgvh2KaAv3/WWQsOpxAgR4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc",
|
"rev": "05e6dc0f6ed936f918cb6f0f21f1dad1e4c53150",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -473,11 +473,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771865848,
|
"lastModified": 1770899531,
|
||||||
"narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=",
|
"narHash": "sha256-UBrWjh0DR8db60aLNkTnZTJ9F4kWK0Y7rUDNJC88W7A=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprland-plugins",
|
"repo": "hyprland-plugins",
|
||||||
"rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960",
|
"rev": "e03c34ccd51280a44ea6d1f5c040cd81ecca25ed",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -701,11 +701,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772598333,
|
"lastModified": 1770770419,
|
||||||
"narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
|
"narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
|
"rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -765,11 +765,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772624091,
|
"lastModified": 1771008912,
|
||||||
"narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
|
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
|
"rev": "a82ccc39b39b621151d6732718e3e250109076fa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -781,11 +781,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772173633,
|
"lastModified": 1770380644,
|
||||||
"narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=",
|
"narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6",
|
"rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -813,11 +813,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_8": {
|
"nixpkgs_8": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772419343,
|
"lastModified": 1768875095,
|
||||||
"narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=",
|
"narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9",
|
"rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -885,11 +885,29 @@
|
|||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"nixpkgs-pinned": "nixpkgs-pinned",
|
"nixpkgs-pinned": "nixpkgs-pinned",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
|
"russia-blocked-geoip": "russia-blocked-geoip",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"stylix": "stylix",
|
"stylix": "stylix",
|
||||||
"yazi": "yazi"
|
"yazi": "yazi"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"russia-blocked-geoip": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1773222740,
|
||||||
|
"narHash": "sha256-x2We3wwRUjfatG5je8P9ip1snK3NvtTHv9tKlPsqOwI=",
|
||||||
|
"owner": "runetfreedom",
|
||||||
|
"repo": "russia-blocked-geoip",
|
||||||
|
"rev": "6138773989321235eac52193a889197c38efd942",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "runetfreedom",
|
||||||
|
"ref": "release",
|
||||||
|
"repo": "russia-blocked-geoip",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
@@ -916,11 +934,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772420823,
|
"lastModified": 1769091129,
|
||||||
"narHash": "sha256-q3oVwz1Rx41D1D+F6vg41kpOkk3Zi3KwnkHEZp7DCGs=",
|
"narHash": "sha256-Jj/vIHjiu4OdDIrDXZ3xOPCJrMZZKzhE2UIVXV/NYzY=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "458eea8d905c609e9d889423e6b8a1c7bc2f792c",
|
"rev": "131e22d6a6d54ab72aeef6a5a661ab7005b4c596",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -934,11 +952,11 @@
|
|||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772495394,
|
"lastModified": 1770683991,
|
||||||
"narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=",
|
"narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff",
|
"rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -966,11 +984,11 @@
|
|||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772296853,
|
"lastModified": 1770914701,
|
||||||
"narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
|
"narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
|
"rev": "db03fed72e5ca02be34e1d24789345a943329738",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1153,11 +1171,11 @@
|
|||||||
"rust-overlay": "rust-overlay_2"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772712963,
|
"lastModified": 1770959024,
|
||||||
"narHash": "sha256-Hic9c6owAhT9avgCrV0+9UzCQT7v0urKsc7KYnCMTbo=",
|
"narHash": "sha256-r2fZFW+xZxEdyORsAipCrnuxQblGGldtZcx0iSQI1ZQ=",
|
||||||
"owner": "sxyazi",
|
"owner": "sxyazi",
|
||||||
"repo": "yazi",
|
"repo": "yazi",
|
||||||
"rev": "be91b4111c6d063cd2d9cc0685337b8700263b86",
|
"rev": "13bdb164a473091b46e857d37599e7e1ae22665e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -38,6 +38,11 @@
|
|||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
russia-blocked-geoip = {
|
||||||
|
url = "github:runetfreedom/russia-blocked-geoip/release";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-pinned, home-manager, ... }@inputs: let
|
outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-pinned, home-manager, ... }@inputs: let
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, config, ... }: {
|
{ inputs, pkgs, config, ... }: {
|
||||||
systemd.services.v2raya = {
|
systemd.services.v2raya = {
|
||||||
enable = true;
|
enable = true;
|
||||||
description = "v2rayA gui client";
|
description = "v2rayA gui client";
|
||||||
@@ -17,12 +17,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
environment.etc = {
|
environment.etc = {
|
||||||
"v2raya/ru_geoip.dat".source = pkgs.fetchurl {
|
"v2raya/ru_geoip.dat".source = "${inputs.russia-blocked-geoip}/geoip.dat";
|
||||||
name = "geoip.dat";
|
|
||||||
url = "https://github.com/runetfreedom/russia-blocked-geoip/releases/download/202603040949/geoip.dat";
|
|
||||||
hash = "sha256-TmWQqoC26+vrJ2xaRrIiPM2kp9xhrw9h9H8yjq4CA7U=";
|
|
||||||
};
|
|
||||||
|
|
||||||
"v2raya/bolt.db".source = config.sops.secrets.vpn_bolt.path;
|
"v2raya/bolt.db".source = config.sops.secrets.vpn_bolt.path;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,6 +54,15 @@ in {
|
|||||||
enable_stdout_logs = true;
|
enable_stdout_logs = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
general = {
|
||||||
|
"col.inactive_border" = lib.mkForce "rgba(00000000)";
|
||||||
|
};
|
||||||
|
|
||||||
|
decoration = lib.mkDefault {
|
||||||
|
inactive_opacity = .95;
|
||||||
|
border_part_of_window = false;
|
||||||
|
};
|
||||||
|
|
||||||
misc = {
|
misc = {
|
||||||
focus_on_activate = true;
|
focus_on_activate = true;
|
||||||
};
|
};
|
||||||
@@ -92,6 +101,7 @@ in {
|
|||||||
"float, title:(pulsemixer)"
|
"float, title:(pulsemixer)"
|
||||||
"float, title:(clipse)"
|
"float, title:(clipse)"
|
||||||
"size 622 652, title:(clipse)"
|
"size 622 652, title:(clipse)"
|
||||||
|
"rounding 0, focus:1"
|
||||||
];
|
];
|
||||||
|
|
||||||
exec-once = lib.mkBefore [
|
exec-once = lib.mkBefore [
|
||||||
|
|||||||
+9
-10
@@ -1,4 +1,6 @@
|
|||||||
{ config, osConfig, pkgs, lib, ... }: {
|
{ config, osConfig, pkgs, lib, ... }: {
|
||||||
|
home.packages = [ pkgs.nh ];
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
zoxide.enable = true;
|
zoxide.enable = true;
|
||||||
fzf.enable = true;
|
fzf.enable = true;
|
||||||
@@ -50,10 +52,12 @@
|
|||||||
autosuggestion.enable = true;
|
autosuggestion.enable = true;
|
||||||
syntaxHighlighting.enable = true;
|
syntaxHighlighting.enable = true;
|
||||||
|
|
||||||
shellAliases = {
|
shellAliases = let
|
||||||
rb = "nh os switch";
|
flakeDir = "~/nix";
|
||||||
trb = "nh os test";
|
in {
|
||||||
upd = "nix flake update --flake ~/nix";
|
rb = "nh os switch ${flakeDir}";
|
||||||
|
trb = "nh os test ${flakeDir}";
|
||||||
|
upd = "nix flake update --flake ${flakeDir}";
|
||||||
|
|
||||||
cat = "${pkgs.lib.getExe pkgs.bat}";
|
cat = "${pkgs.lib.getExe pkgs.bat}";
|
||||||
cd = "z";
|
cd = "z";
|
||||||
@@ -63,7 +67,7 @@
|
|||||||
win = "sudo grub-reboot 2; sudo reboot";
|
win = "sudo grub-reboot 2; sudo reboot";
|
||||||
};
|
};
|
||||||
|
|
||||||
initContent = ''
|
initContent = /*bash*/ ''
|
||||||
eval "$(zoxide init zsh)"
|
eval "$(zoxide init zsh)"
|
||||||
source "$(fzf-share)/key-bindings.zsh"
|
source "$(fzf-share)/key-bindings.zsh"
|
||||||
source "$(fzf-share)/completion.zsh"
|
source "$(fzf-share)/completion.zsh"
|
||||||
@@ -82,10 +86,5 @@
|
|||||||
|
|
||||||
oh-my-zsh.enable = true;
|
oh-my-zsh.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
nh = {
|
|
||||||
enable = true;
|
|
||||||
flake = "nix";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,11 +51,10 @@
|
|||||||
in {
|
in {
|
||||||
settings = {
|
settings = {
|
||||||
general = {
|
general = {
|
||||||
gaps_in = 5;
|
gaps_in = 2;
|
||||||
gaps_out = 10;
|
gaps_out = 10;
|
||||||
border_size = 3;
|
border_size = 3;
|
||||||
"col.active_border" = lib.mkForce "rgba(${colors.base0C}ee) rgba(${colors.base0B}ee) 45deg";
|
"col.active_border" = lib.mkForce "rgba(${colors.base0C}aa) rgba(${colors.base0B}aa) 45deg";
|
||||||
"col.inactive_border" = lib.mkForce "rgba(${colors.base05}aa)";
|
|
||||||
|
|
||||||
layout = "dwindle";
|
layout = "dwindle";
|
||||||
};
|
};
|
||||||
@@ -70,11 +69,7 @@
|
|||||||
new_optimizations = true;
|
new_optimizations = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
shadow = {
|
shadow.enabled = false;
|
||||||
enabled = true;
|
|
||||||
range = 4;
|
|
||||||
render_power = 3;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
animations = {
|
animations = {
|
||||||
|
|||||||
Reference in New Issue
Block a user