mirror of
https://github.com/nmasur/dotfiles
synced 2025-08-23 23:04:41 +00:00
Compare commits
13 Commits
3b6b4bd2e6
...
master
Author | SHA1 | Date | |
---|---|---|---|
|
e64a9f14d0 | ||
|
e2e179c0e5 | ||
|
e975db7385 | ||
|
08ec8ce4b8 | ||
|
7388eed876 | ||
|
e53d9eb1a9 | ||
|
b956f9dd82 | ||
|
d7969cc8fc | ||
|
21d66d2be1 | ||
|
518848181a | ||
|
f9bf763f91 | ||
|
ca20fa0732 | ||
|
56d10c2765 |
48
flake.lock
generated
48
flake.lock
generated
@@ -22,11 +22,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751313918,
|
"lastModified": 1755825449,
|
||||||
"narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
|
"narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
|
"rev": "8df64f819698c1fee0c2969696f54a843b2231e8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -43,11 +43,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753140376,
|
"lastModified": 1755519972,
|
||||||
"narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=",
|
"narHash": "sha256-bU4nqi3IpsUZJeyS8Jk85ytlX61i4b0KCxXX9YcOgVc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c",
|
"rev": "4073ff2f481f9ef3501678ff479ed81402caae6d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -156,11 +156,11 @@
|
|||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753376980,
|
"lastModified": 1755869734,
|
||||||
"narHash": "sha256-h7Say1U7r1ke3mfg3yvbzYnk3izmJ2g1zXzX5APNA8Q=",
|
"narHash": "sha256-d9hwkPwlpbih4DVbsV0zrK5i2J6cRT7ifrDYK5LZQs8=",
|
||||||
"owner": "helix-editor",
|
"owner": "helix-editor",
|
||||||
"repo": "helix",
|
"repo": "helix",
|
||||||
"rev": "4281228da35b02b0dcca3b4772b93d48d79ce046",
|
"rev": "22a3b10dd8ab907367ae1fe57d9703e22b30d391",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -176,11 +176,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753470191,
|
"lastModified": 1755914636,
|
||||||
"narHash": "sha256-hOUWU5L62G9sm8NxdiLWlLIJZz9H52VuFiDllHdwmVA=",
|
"narHash": "sha256-VJ+Gm6YsHlPfUCpmRQxvdiZW7H3YPSrdVOewQHAhZN8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "a1817d1c0e5eabe7dfdfe4caa46c94d9d8f3fdb6",
|
"rev": "8b55a6ac58b678199e5bba701aaff69e2b3281c0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -222,11 +222,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752588843,
|
"lastModified": 1755344765,
|
||||||
"narHash": "sha256-T4vw0himO8ami5uR7cry+El9HlQkqNcy/UtIFwkcTMw=",
|
"narHash": "sha256-k/Cvh/mzb5lSvilKdgwNBCyAyYmD8YPr1nc0sTSgwxI=",
|
||||||
"owner": "gytis-ivaskevicius",
|
"owner": "gytis-ivaskevicius",
|
||||||
"repo": "nix2vim",
|
"repo": "nix2vim",
|
||||||
"rev": "94f136cece965e33aa4ccccb4ca1af04772851f4",
|
"rev": "78467c8de07719f92397179844bf75cdf2e58b83",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -273,11 +273,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753250450,
|
"lastModified": 1755615617,
|
||||||
"narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=",
|
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf",
|
"rev": "20075955deac2583bb12f07151c2df830ef346b4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -327,11 +327,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753502740,
|
"lastModified": 1755918818,
|
||||||
"narHash": "sha256-g6D9WfAHVq9D76D1t9FahCtuBq+MfTo4dChFde0XosI=",
|
"narHash": "sha256-a7k/fml8k4CxIcVW26luwqVl3lsRMNXBRCyC8uSF0GA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "dd7b97b8d11ebe7c7513d6c58e13104441862896",
|
"rev": "1a47d83c521c098debd6d1f2c2ae313a5bb729f9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -449,11 +449,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753450337,
|
"lastModified": 1755261305,
|
||||||
"narHash": "sha256-l0QLEenVKuU6U2g1wI0zuf9IAm7QpisIbf8wAI6BUX4=",
|
"narHash": "sha256-EOqCupB5X5WoGVHVcfOZcqy0SbKWNuY3kq+lj1wHdu8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NixOS-WSL",
|
"repo": "NixOS-WSL",
|
||||||
"rev": "a8dfcd2962f6e788759a75b36ca86b14aa44d8e5",
|
"rev": "203a7b463f307c60026136dd1191d9001c43457f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@@ -33,9 +33,6 @@ rec {
|
|||||||
|
|
||||||
system.stateVersion = "23.05";
|
system.stateVersion = "23.05";
|
||||||
|
|
||||||
# Overrides
|
|
||||||
services.automatic-timezoned.enable = false;
|
|
||||||
|
|
||||||
# Not sure what's necessary but too afraid to remove anything
|
# Not sure what's necessary but too afraid to remove anything
|
||||||
boot.initrd.availableKernelModules = [
|
boot.initrd.availableKernelModules = [
|
||||||
"xhci_pci"
|
"xhci_pci"
|
||||||
|
@@ -74,6 +74,8 @@ in
|
|||||||
"svg.context-properties.content.enabled" = true; # Sidebery styling
|
"svg.context-properties.content.enabled" = true; # Sidebery styling
|
||||||
"browser.tabs.hoverPreview.enabled" = false; # Disable tab previews
|
"browser.tabs.hoverPreview.enabled" = false; # Disable tab previews
|
||||||
"browser.tabs.hoverPreview.showThumbnails" = false; # Disable tab previews
|
"browser.tabs.hoverPreview.showThumbnails" = false; # Disable tab previews
|
||||||
|
"browser.gesture.swipe.left" = "cmd_scrollLeft"; # Disable swipe to go back
|
||||||
|
"browser.gesture.swipe.right" = "cmd_scrollRight"; # Disable swipe to go forward
|
||||||
};
|
};
|
||||||
userChrome = ''
|
userChrome = ''
|
||||||
:root {
|
:root {
|
||||||
|
@@ -147,7 +147,9 @@ in
|
|||||||
"keep_primary_selection"
|
"keep_primary_selection"
|
||||||
];
|
];
|
||||||
|
|
||||||
space.q = ":quit";
|
# Quit shortcuts
|
||||||
|
space.q = ":quit-all";
|
||||||
|
space.x = ":quit-all!";
|
||||||
|
|
||||||
# Enable and disable inlay hints
|
# Enable and disable inlay hints
|
||||||
space.H = ":toggle lsp.display-inlay-hints";
|
space.H = ":toggle lsp.display-inlay-hints";
|
||||||
@@ -171,8 +173,8 @@ in
|
|||||||
":set mouse true"
|
":set mouse true"
|
||||||
];
|
];
|
||||||
|
|
||||||
# Open git blame in github
|
# Commandline git blame
|
||||||
space.B = ":sh git blame -L %{cursor_line},%{cursor_line} %{buffer_name}";
|
space.B = ":echo %sh{git log -n1 --date=short --pretty=format:'%%h %%ad %%s' $(git blame -L %{cursor_line},+1 \"%{buffer_name}\" | cut -d' ' -f1)}";
|
||||||
|
|
||||||
# Open yazi
|
# Open yazi
|
||||||
# https://github.com/sxyazi/yazi/pull/2461
|
# https://github.com/sxyazi/yazi/pull/2461
|
||||||
@@ -349,7 +351,7 @@ in
|
|||||||
bg = config.theme.colors.base00;
|
bg = config.theme.colors.base00;
|
||||||
};
|
};
|
||||||
"ui.cursor" = {
|
"ui.cursor" = {
|
||||||
fg = config.theme.colors.base0A;
|
fg = config.theme.colors.base04;
|
||||||
modifiers = [ "reversed" ];
|
modifiers = [ "reversed" ];
|
||||||
};
|
};
|
||||||
"ui.cursor.insert" = {
|
"ui.cursor.insert" = {
|
||||||
@@ -361,11 +363,11 @@ in
|
|||||||
bg = config.theme.colors.base01;
|
bg = config.theme.colors.base01;
|
||||||
};
|
};
|
||||||
"ui.cursor.match" = {
|
"ui.cursor.match" = {
|
||||||
fg = config.theme.colors.base0A;
|
fg = config.theme.colors.base03;
|
||||||
modifiers = [ "reversed" ];
|
modifiers = [ "reversed" ];
|
||||||
};
|
};
|
||||||
"ui.cursor.select" = {
|
"ui.cursor.select" = {
|
||||||
fg = config.theme.colors.base0A;
|
fg = config.theme.colors.base04;
|
||||||
modifiers = [ "reversed" ];
|
modifiers = [ "reversed" ];
|
||||||
};
|
};
|
||||||
"ui.gutter" = {
|
"ui.gutter" = {
|
||||||
|
@@ -81,10 +81,10 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
# Auto start on shell init
|
# Auto start on shell init
|
||||||
enableBashIntegration = false;
|
enableBashIntegration = true;
|
||||||
enableFishIntegration = false;
|
enableFishIntegration = true;
|
||||||
enableZshIntegration = false;
|
enableZshIntegration = true;
|
||||||
attachExistingSession = false;
|
attachExistingSession = true;
|
||||||
exitShellOnExit = false;
|
exitShellOnExit = false;
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
@@ -192,10 +192,10 @@ in
|
|||||||
];
|
];
|
||||||
close_on_exit = true;
|
close_on_exit = true;
|
||||||
floating = true;
|
floating = true;
|
||||||
x = "5%";
|
x = "1%";
|
||||||
y = "5%";
|
y = "1%";
|
||||||
width = "90%";
|
width = "99%";
|
||||||
height = "90%";
|
height = "99%";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"bind \"Super Shift ]\"" = {
|
"bind \"Super Shift ]\"" = {
|
||||||
|
@@ -67,7 +67,7 @@ in
|
|||||||
|
|
||||||
# Tell Caddy to use Cloudflare DNS for ACME challenge validation
|
# Tell Caddy to use Cloudflare DNS for ACME challenge validation
|
||||||
services.caddy.package = pkgs.caddy.withPlugins {
|
services.caddy.package = pkgs.caddy.withPlugins {
|
||||||
plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
|
plugins = [ "github.com/caddy-dns/cloudflare@8cbec3f04d5b4a768c52941a5468c4b71436509e" ]; # v0.2.1
|
||||||
hash = "sha256-2D7dnG50CwtCho+U+iHmSj2w14zllQXPjmTHr6lJZ/A=";
|
hash = "sha256-2D7dnG50CwtCho+U+iHmSj2w14zllQXPjmTHr6lJZ/A=";
|
||||||
};
|
};
|
||||||
nmasur.presets.services.caddy.tlsPolicies = [
|
nmasur.presets.services.caddy.tlsPolicies = [
|
||||||
@@ -159,12 +159,13 @@ in
|
|||||||
requires = [ "cloudflare-api-secret.service" ];
|
requires = [ "cloudflare-api-secret.service" ];
|
||||||
script =
|
script =
|
||||||
let
|
let
|
||||||
args =
|
args = [
|
||||||
[ "--cache-file /var/lib/cloudflare-dyndns/ip.cache" ]
|
"--cache-file /var/lib/cloudflare-dyndns/ip.cache"
|
||||||
++ (if config.services.cloudflare-dyndns.ipv4 then [ "-4" ] else [ "-no-4" ])
|
]
|
||||||
++ (if config.services.cloudflare-dyndns.ipv6 then [ "-6" ] else [ "-no-6" ])
|
++ (if config.services.cloudflare-dyndns.ipv4 then [ "-4" ] else [ "-no-4" ])
|
||||||
++ lib.optional config.services.cloudflare-dyndns.deleteMissing "--delete-missing"
|
++ (if config.services.cloudflare-dyndns.ipv6 then [ "-6" ] else [ "-no-6" ])
|
||||||
++ lib.optional config.services.cloudflare-dyndns.proxied "--proxied";
|
++ lib.optional config.services.cloudflare-dyndns.deleteMissing "--delete-missing"
|
||||||
|
++ lib.optional config.services.cloudflare-dyndns.proxied "--proxied";
|
||||||
in
|
in
|
||||||
lib.mkForce ''
|
lib.mkForce ''
|
||||||
export CLOUDFLARE_API_TOKEN=$(cat ''${CREDENTIALS_DIRECTORY}/apiToken)
|
export CLOUDFLARE_API_TOKEN=$(cat ''${CREDENTIALS_DIRECTORY}/apiToken)
|
||||||
|
@@ -24,6 +24,11 @@ in
|
|||||||
|
|
||||||
# Enable automatic timezone updates based on location
|
# Enable automatic timezone updates based on location
|
||||||
services.automatic-timezoned.enable = lib.mkDefault true;
|
services.automatic-timezoned.enable = lib.mkDefault true;
|
||||||
|
services.geoclue2 = {
|
||||||
|
# see: https://github.com/NixOS/nixpkgs/issues/68489#issuecomment-1484030107
|
||||||
|
enableDemoAgent = lib.mkForce true;
|
||||||
|
geoProviderUrl = "https://beacondb.net/v1/geolocate";
|
||||||
|
};
|
||||||
|
|
||||||
# Allow reading from Windows drives
|
# Allow reading from Windows drives
|
||||||
boot.supportedFilesystems = [ "ntfs" ];
|
boot.supportedFilesystems = [ "ntfs" ];
|
||||||
|
Reference in New Issue
Block a user