From 125b6af54598804effcbe22a3d6c8b04c15e1507 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 9 Dec 2023 19:15:46 -0700 Subject: nobody updates their electron dependencies --- modules/nixos/system-packages.nix | 1 + 1 file changed, 1 insertion(+) 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" ]; } -- cgit v1.2.3 From 8664a038542680b27515ad408aaee3effd30cedf Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 9 Dec 2023 19:17:52 -0700 Subject: can't use in nix run because of old electron version --- home-manager/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/home.nix b/home-manager/home.nix index 5c92879..1e1a48d 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 -- cgit v1.2.3 From b2251be8953e846de710135d4223ee23e2377adf Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 9 Dec 2023 19:24:40 -0700 Subject: r2modman not working, trying older version --- home-manager/home.nix | 2 +- modules/nixos/system-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index 1e1a48d..1d95b9c 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -42,7 +42,7 @@ # # parentheses. Maybe you want to install Nerd Fonts with a limited number of # # fonts? # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) - r2modman + # r2modman marble-marcher-ce minetest firefox diff --git a/modules/nixos/system-packages.nix b/modules/nixos/system-packages.nix index 76430d3..be9e206 100644 --- a/modules/nixos/system-packages.nix +++ b/modules/nixos/system-packages.nix @@ -12,6 +12,7 @@ wl-clipboard pciutils usbutils + r2modman ]; nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" -- cgit v1.2.3 From a6b1c97ea0f92221574d4abbe1707d37f78ed596 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 9 Dec 2023 19:48:48 -0700 Subject: r2modman version too old, need unstable --- home-manager/home.nix | 2 +- modules/nixos/system-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index 1d95b9c..1e1a48d 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -42,7 +42,7 @@ # # parentheses. Maybe you want to install Nerd Fonts with a limited number of # # fonts? # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) - # r2modman + r2modman marble-marcher-ce minetest firefox diff --git a/modules/nixos/system-packages.nix b/modules/nixos/system-packages.nix index be9e206..9ef1814 100644 --- a/modules/nixos/system-packages.nix +++ b/modules/nixos/system-packages.nix @@ -12,7 +12,7 @@ wl-clipboard pciutils usbutils - r2modman + # r2modman ]; nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" -- cgit v1.2.3 From c753ed913937d013803f0d35f031e739da94be5a Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 9 Dec 2023 19:56:20 -0700 Subject: please fucking work this time --- modules/nixos/environment.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/nixos/environment.nix b/modules/nixos/environment.nix index 225ddda..ab259a2 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"; }; }; } -- cgit v1.2.3 From b0eb7050cb170a854fb54d264bc486a1a6834770 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 9 Dec 2023 20:02:53 -0700 Subject: update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 355a1cf..ee0a50d 100644 --- a/flake.lock +++ b/flake.lock @@ -144,11 +144,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1701737536, - "narHash": "sha256-xSmfHhhCL9mAta5jKfcbJxYjCoD2MdLPBMjBUWvYAJI=", + "lastModified": 1702147292, + "narHash": "sha256-6M+OEv8WEV4v5fkZCRhXde1h6iBMI91zCE4JfJLYmnU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3bb9c7c5cf4f2ee30bf821501499f2308d616f94", + "rev": "af6aae4e12b96fff701d8ae8fcb48ea8bb51009f", "type": "github" }, "original": { @@ -239,11 +239,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701539137, - "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=", + "lastModified": 1701952659, + "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d", + "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "lastModified": 1701718080, + "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", "type": "github" }, "original": { @@ -287,11 +287,11 @@ "nushell-scripts": { "flake": false, "locked": { - "lastModified": 1701553240, - "narHash": "sha256-xnClsTcL/jmRb4o4rL27o0qX4ubgLsYM3x+VOVD0MbM=", + "lastModified": 1702140952, + "narHash": "sha256-8ivtH+mNFf1kbMNn9lmuwCLqG9zE9Z6wsqlwwfHbT98=", "owner": "nushell", "repo": "nu_scripts", - "rev": "735831e1250d9919fe6b102b3da500e6b02bdc27", + "rev": "a4cceb8a0b6295fb0b89fb806b1aebefa2d243c9", "type": "github" }, "original": { -- cgit v1.2.3 From ef1459a50e3959ef98b792a0e912ebcfea233c13 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 9 Dec 2023 20:18:04 -0700 Subject: the version is fucking correct here https://github.com/NixOS/nixpkgs/blob/master/pkgs/games/r2modman/default.nix but won't install the correct version through any means i'm gonna commit violence --- modules/nixos/system-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/nixos/system-packages.nix b/modules/nixos/system-packages.nix index 9ef1814..76430d3 100644 --- a/modules/nixos/system-packages.nix +++ b/modules/nixos/system-packages.nix @@ -12,7 +12,6 @@ wl-clipboard pciutils usbutils - # r2modman ]; nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" -- cgit v1.2.3 From 8c9ff3f2e4f29e27b4f86ce2d621262c8743f668 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Tue, 12 Dec 2023 19:45:15 +0000 Subject: added default ips so headscale stops complaining --- modules/nixos/headscale.nix | 4 ++++ 1 file changed, 4 insertions(+) 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" + ]; }; }; -- cgit v1.2.3 From f9a7232ecf3774ebaf6d08a6b594423fc1ac0ffd Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Thu, 14 Dec 2023 16:27:02 -0700 Subject: added easyeffects --- home-manager/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/home.nix b/home-manager/home.nix index 1e1a48d..eea43f2 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -52,6 +52,7 @@ pass btop helvum + easyeffects mpv lutris wine -- cgit v1.2.3 From 0fb6b77b423c219cca65c2ded547106d924e0678 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 15 Dec 2023 11:53:04 -0700 Subject: linode image already created, nixos-generators iso not accepted anyway --- flake.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 8b8e781..7fc976c 100644 --- a/flake.nix +++ b/flake.nix @@ -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; -- cgit v1.2.3 From 4b5dd35e27e18b5abcfdd4d3fb3eeb3557955b66 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 15 Dec 2023 12:03:07 -0700 Subject: nix flake update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index ee0a50d..baa2ee3 100644 --- a/flake.lock +++ b/flake.lock @@ -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": 1702147292, - "narHash": "sha256-6M+OEv8WEV4v5fkZCRhXde1h6iBMI91zCE4JfJLYmnU=", + "lastModified": 1702664824, + "narHash": "sha256-LwPuwC1rbDNexXYHV49k1ebUBdpQO22pFMhFJ6EjCrk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "af6aae4e12b96fff701d8ae8fcb48ea8bb51009f", + "rev": "79d8d14fe08fed39e9796a76fcb9833c6b64b1c0", "type": "github" }, "original": { @@ -239,11 +239,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701952659, - "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=", + "lastModified": 1702346276, + "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4", + "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1701718080, - "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -287,11 +287,11 @@ "nushell-scripts": { "flake": false, "locked": { - "lastModified": 1702140952, - "narHash": "sha256-8ivtH+mNFf1kbMNn9lmuwCLqG9zE9Z6wsqlwwfHbT98=", + "lastModified": 1702558950, + "narHash": "sha256-pai3qeD2hmpx2r/lDfGpUY3mkl0gRN6j72gplz9DQD4=", "owner": "nushell", "repo": "nu_scripts", - "rev": "a4cceb8a0b6295fb0b89fb806b1aebefa2d243c9", + "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": { -- cgit v1.2.3