diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | flake.lock | 68 | ||||
| -rw-r--r-- | hosts/local/fw11/configuration.nix | 38 |
3 files changed, 91 insertions, 17 deletions
@@ -9,4 +9,4 @@ devenv.local.nix # pre-commit .pre-commit-config.yaml -flake.lock +# flake.lock @@ -507,6 +507,7 @@ "type": "github" } }, +<<<<<<< Updated upstream "flake-utils_7": { "inputs": { "systems": "systems_7" @@ -525,6 +526,8 @@ "type": "github" } }, +======= +>>>>>>> Stashed changes "git-hooks": { "inputs": { "flake-compat": [ @@ -1144,16 +1147,28 @@ }, "nixpkgs-darwin": { "locked": { +<<<<<<< Updated upstream "lastModified": 1752483536, "narHash": "sha256-RaaMPRtewLITsV0JMIgoTSkSR+Wuu/a/I/Za0hiCes8=", "owner": "nixos", "repo": "nixpkgs", "rev": "1156bb3c3d94de7c6a7dc798b42c98bb975f3a75", +======= + "lastModified": 1735564410, + "narHash": "sha256-HB/FA0+1gpSs8+/boEavrGJH+Eq08/R2wWNph1sM1Dg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1e7a8f391f1a490460760065fa0630b5520f9cf8", +>>>>>>> Stashed changes "type": "github" }, "original": { "owner": "nixos", +<<<<<<< Updated upstream "ref": "nixpkgs-25.05-darwin", +======= + "ref": "nixpkgs-24.05-darwin", +>>>>>>> Stashed changes "repo": "nixpkgs", "type": "github" } @@ -1203,6 +1218,7 @@ "type": "github" } }, +<<<<<<< Updated upstream "nixpkgs-old": { "locked": { "lastModified": 1751274312, @@ -1226,11 +1242,24 @@ "owner": "nixos", "repo": "nixpkgs", "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058", +======= + "nixpkgs-stable": { + "locked": { + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", +>>>>>>> Stashed changes "type": "github" }, "original": { "owner": "nixos", +<<<<<<< Updated upstream "ref": "nixos-25.05", +======= + "ref": "nixos-24.05", +>>>>>>> Stashed changes "repo": "nixpkgs", "type": "github" } @@ -1263,11 +1292,19 @@ ] }, "locked": { +<<<<<<< Updated upstream "lastModified": 1752562123, "narHash": "sha256-vFgilSNwK5BFyKHb252VmUDY096qwOHlHF424xJxA1Q=", "owner": "nix-community", "repo": "nixpkgs-wayland", "rev": "2a1fbe8df21216eaff2ccf3a60ab94a33838ba97", +======= + "lastModified": 1752547084, + "narHash": "sha256-lgHLCehVd9Y7BOQ3Q5x2IpeYh/xYVj/LSS/PSeeNx50=", + "owner": "nix-community", + "repo": "nixpkgs-wayland", + "rev": "230a740fc870ba7b23f6c35eeb43e881479a059f", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -1488,11 +1525,19 @@ "nixpkgs": "nixpkgs_14" }, "locked": { +<<<<<<< Updated upstream "lastModified": 1752575257, "narHash": "sha256-34S3op5XjbcHahifCUkzxOL0t6YkRzJaj5PXI8tEz6k=", "owner": "nix-community", "repo": "NUR", "rev": "b4815529806b1e30a4e6c66c1091e010e0a4c2b8", +======= + "lastModified": 1752555807, + "narHash": "sha256-uPf6vXeHq/npoRt6gkcoajX6KtfBO1ATmQ0LbxJBc3o=", + "owner": "nix-community", + "repo": "NUR", + "rev": "5dfd4f5779c92e6031346e444b61ae6023239092", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -1501,6 +1546,7 @@ "type": "github" } }, +<<<<<<< Updated upstream "openai-codex": { "inputs": { "flake-utils": "flake-utils_7", @@ -1523,6 +1569,8 @@ "type": "github" } }, +======= +>>>>>>> Stashed changes "polybar-themes": { "flake": false, "locked": { @@ -1622,12 +1670,18 @@ "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_12", "nixpkgs-darwin": "nixpkgs-darwin", +<<<<<<< Updated upstream "nixpkgs-old": "nixpkgs-old", +======= +>>>>>>> Stashed changes "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unfree": "nixpkgs-unfree", "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", +<<<<<<< Updated upstream "openai-codex": "openai-codex", +======= +>>>>>>> Stashed changes "polybar-themes": "polybar-themes", "waybar": "waybar", "windsurf": "windsurf", @@ -1699,6 +1753,7 @@ "type": "github" } }, +<<<<<<< Updated upstream "rust-overlay_4": { "inputs": { "nixpkgs": [ @@ -1720,6 +1775,8 @@ "type": "github" } }, +======= +>>>>>>> Stashed changes "spectrum": { "flake": false, "locked": { @@ -1826,6 +1883,7 @@ "type": "github" } }, +<<<<<<< Updated upstream "systems_7": { "locked": { "lastModified": 1681028828, @@ -1841,6 +1899,8 @@ "type": "github" } }, +======= +>>>>>>> Stashed changes "waybar": { "inputs": { "flake-compat": "flake-compat_7", @@ -1869,7 +1929,11 @@ ] }, "locked": { +<<<<<<< Updated upstream "lastModified": 1740186345, +======= + "lastModified": 1741246078, +>>>>>>> Stashed changes "narHash": "sha256-Qox5x+FI4OhCs/7T/v4hZlR9Rm7ZfpXP7ISy+OrHCyw=", "path": "/home/y/nixconf/derivations/windsurf", "type": "path" @@ -1901,7 +1965,11 @@ ] }, "locked": { +<<<<<<< Updated upstream "lastModified": 1740469068, +======= + "lastModified": 1747476774, +>>>>>>> Stashed changes "narHash": "sha256-uoitiN9zrv9QaGf8mKIXhRxXtsNi6MupZVK+Zy3jOoA=", "path": "/home/y/nixconf/derivations/yek", "type": "path" diff --git a/hosts/local/fw11/configuration.nix b/hosts/local/fw11/configuration.nix index 197e8ca..69b51a2 100644 --- a/hosts/local/fw11/configuration.nix +++ b/hosts/local/fw11/configuration.nix @@ -5,19 +5,21 @@ inputs, pkgs, ... -}: let - wrappers = - inputs.wrapper-manager.lib.build - { - inherit pkgs; - modules = [ - ../../../wrappers/chromium - ../../../wrappers/brave - ../../../wrappers/zellij - ../../../wrappers/alacritty - ]; - }; -in { +}: +# let +# wrappers = +# inputs.wrapper-manager.lib.build +# { +# inherit pkgs; +# modules = [ +# ../../../wrappers/chromium +# ../../../wrappers/brave +# ../../../wrappers/zellij +# ../../../wrappers/alacritty +# ]; +# }; +# in +{ imports = [ # Include the results of the hardware scan. ../../base.nix @@ -29,9 +31,9 @@ in { # ../android.nix ]; - environment.systemPackages = [ - wrappers - ]; + # environment.systemPackages = [ + # wrappers + # ]; environment = { etc = { "sway/config".source = ./swayconfig; @@ -76,6 +78,10 @@ in { services.logind.lidSwitchDocked = "ignore"; services.logind.lidSwitch = "ignore"; + services.tailscale = { + enable = true; + useRoutingFeatures = "both"; + }; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave |