diff options
| author | Devin Finlinson <devin.finlinson@pm.me> | 2023-12-15 20:10:31 -0700 |
|---|---|---|
| committer | Devin Finlinson <devin.finlinson@pm.me> | 2023-12-15 20:10:31 -0700 |
| commit | 73cbae7f5357bf01a7e0bf1d8674a361dae6dabe (patch) | |
| tree | c7e48fa80e7500923040d10dae9776afe8242489 | |
| parent | 2c90d4ce000efd0fe8b09b0ff9b9eedb4b9f929c (diff) | |
| parent | 4b5dd35e27e18b5abcfdd4d3fb3eeb3557955b66 (diff) | |
Merge branch 'master' of ssh://git.wormcar.gay:2200/devinf/nix-config
| -rw-r--r-- | flake.lock | 36 | ||||
| -rw-r--r-- | flake.nix | 20 | ||||
| -rw-r--r-- | home-manager/home.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/environment.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/headscale.nix | 4 | ||||
| -rw-r--r-- | modules/nixos/system-packages.nix | 1 |
6 files changed, 37 insertions, 28 deletions
@@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1700814205, - "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", + "lastModified": 1702195709, + "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=", "owner": "nix-community", "repo": "home-manager", - "rev": "aeb2232d7a32530d3448318790534d196bf9427a", + "rev": "6761b8188b860f374b457eddfdb05c82eef9752f", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1701737536, - "narHash": "sha256-xSmfHhhCL9mAta5jKfcbJxYjCoD2MdLPBMjBUWvYAJI=", + "lastModified": 1702664824, + "narHash": "sha256-LwPuwC1rbDNexXYHV49k1ebUBdpQO22pFMhFJ6EjCrk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3bb9c7c5cf4f2ee30bf821501499f2308d616f94", + "rev": "79d8d14fe08fed39e9796a76fcb9833c6b64b1c0", "type": "github" }, "original": { @@ -239,11 +239,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701539137, - "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=", + "lastModified": 1702346276, + "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d", + "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -287,11 +287,11 @@ "nushell-scripts": { "flake": false, "locked": { - "lastModified": 1701553240, - "narHash": "sha256-xnClsTcL/jmRb4o4rL27o0qX4ubgLsYM3x+VOVD0MbM=", + "lastModified": 1702558950, + "narHash": "sha256-pai3qeD2hmpx2r/lDfGpUY3mkl0gRN6j72gplz9DQD4=", "owner": "nushell", "repo": "nu_scripts", - "rev": "735831e1250d9919fe6b102b3da500e6b02bdc27", + "rev": "6f1c0dfef203fa07449718b76d31580e8458c8b7", "type": "github" }, "original": { @@ -384,11 +384,11 @@ ] }, "locked": { - "lastModified": 1700508250, - "narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=", + "lastModified": 1702334919, + "narHash": "sha256-ibOZ3TLjqndGMcj2f+07NFwDWoum4IbzF58byZuJJNg=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47", + "rev": "f5c3576c3b6cb1c31a8dfa3e4113f59bfe40cd71", "type": "github" }, "original": { @@ -133,16 +133,16 @@ }; outputs = inputs@{ self, ...}: with inputs; { - packages.x86_64-linux = { - linode = nixos-generators.nixosGenerate { - system = "x86_64-linux"; - modules = [ - ./modules/users/defin.nix - ./modules/nixos/system-packages.nix - ]; - format = "linode"; - }; - }; + # packages.x86_64-linux = { + # linode = nixos-generators.nixosGenerate { + # system = "x86_64-linux"; + # modules = [ + # ./modules/users/defin.nix + # ./modules/nixos/system-packages.nix + # ]; + # format = "linode"; + # }; + # }; # let # inherit (self) outputs; # lib = nixpkgs.lib //home-manager.lib; diff --git a/home-manager/home.nix b/home-manager/home.nix index 5c92879..eea43f2 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -42,6 +42,7 @@ # # parentheses. Maybe you want to install Nerd Fonts with a limited number of # # fonts? # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) + r2modman marble-marcher-ce minetest firefox @@ -51,6 +52,7 @@ pass btop helvum + easyeffects mpv lutris wine diff --git a/modules/nixos/environment.nix b/modules/nixos/environment.nix index a4a18a8..8b9c328 100644 --- a/modules/nixos/environment.nix +++ b/modules/nixos/environment.nix @@ -6,6 +6,7 @@ # $ nix search wget sessionVariables = { NIXOS_OZONE_WL = "1"; + NIXPKGS_ALLOW_INSECURE="1"; }; variables = { # PATH = "/home/defin/.local/share/gem/ruby/3.0.0/bin:"; @@ -13,6 +14,7 @@ MANPAGER = "sh -c 'col -bx | bat -l man -p'"; EDITOR = "hx"; ZEIT_DB = "/home/defin/Documents/zeit"; + NIXPKGS_ALLOW_INSECURE="1"; MANROFFOPT = "-c"; }; }; diff --git a/modules/nixos/headscale.nix b/modules/nixos/headscale.nix index e3e6f5a..f3314fc 100644 --- a/modules/nixos/headscale.nix +++ b/modules/nixos/headscale.nix @@ -12,6 +12,10 @@ in { logtail.enabled = false; serverUrl = "https://${subDomain}"; dns_config.base_domain = "${domain}"; + ip_prefixes = [ + "100.64.0.0/10" + "fdef:6567:bd7a::/48" + ]; }; }; diff --git a/modules/nixos/system-packages.nix b/modules/nixos/system-packages.nix index 368f2e5..76430d3 100644 --- a/modules/nixos/system-packages.nix +++ b/modules/nixos/system-packages.nix @@ -14,6 +14,7 @@ usbutils ]; nixpkgs.config.permittedInsecurePackages = [ + "electron-25.9.0" "electron-24.8.6" ]; } |