From b953f31f2543cd0e4cca09db280a1dd0e6fe4fa9 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 16 Aug 2024 13:52:53 -0600 Subject: wireguard --- 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 455f0e9..6bb7234 100644 --- a/modules/nixos/system-packages.nix +++ b/modules/nixos/system-packages.nix @@ -9,6 +9,7 @@ wget unzip git + wireguard-tools wl-clipboard pciutils usbutils -- cgit v1.2.3 From 42401a1ff4654e694e6958fcc0742992d837d4e5 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 19 Aug 2024 00:58:00 -0600 Subject: update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 765621b..b6573aa 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1722347739, - "narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=", + "lastModified": 1724006173, + "narHash": "sha256-1ROh0buuxiMyc6eIb3CIbJsmYO7PhLqSYs55mOx1XTk=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a", + "rev": "7f8df01d4297b9068a9592400f16044602844f86", "type": "github" }, "original": { @@ -132,11 +132,11 @@ "catppuccin-starship": { "flake": false, "locked": { - "lastModified": 1716565281, - "narHash": "sha256-KzXO4dqpufxTew064ZLp3zKIXBwbF8Bi+I0Xa63j/lI=", + "lastModified": 1723819937, + "narHash": "sha256-t/Hmd2dzBn0AbLUlbL8CBt19/we8spY5nMP0Z+VPMXA=", "owner": "catppuccin", "repo": "starship", - "rev": "ca2fb0600730fd3958a2cb4d4ca97c401877b365", + "rev": "3c4749512e7d552adf48e75e5182a271392ab176", "type": "github" }, "original": { @@ -215,11 +215,11 @@ ] }, "locked": { - "lastModified": 1721330371, - "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=", + "lastModified": 1722623071, + "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc", + "rev": "912d56025f03d41b1ad29510c423757b4379eb1c", "type": "github" }, "original": { @@ -242,11 +242,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1722800434, - "narHash": "sha256-NIKIXBkybpOIo5G9ph2TcOF4eQWTtAOAx9Dfr1wnoFE=", + "lastModified": 1724016119, + "narHash": "sha256-sGaA2Gkf22RjwwETvuEWxCz/fmRB1GnBMJJ790HAlME=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "2b520571e897be2a0e88c8692da607b062000038", + "rev": "83d88fa56467a2b749fb2320e1595281107bd326", "type": "github" }, "original": { @@ -323,11 +323,11 @@ ] }, "locked": { - "lastModified": 1722098849, - "narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=", + "lastModified": 1722869141, + "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f", + "rev": "0252fd13e78e60fb0da512a212e56007515a49f7", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nixlib": { "locked": { - "lastModified": 1722732880, - "narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=", + "lastModified": 1723942470, + "narHash": "sha256-QdSArN0xKESEOTcv+3kE6yu4B4WX9lupZ4+Htx3RXGg=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "8bebd4c74f368aacb047f0141db09ec6b339733c", + "rev": "531a2e8416a6d8200a53eddfbdb8f2c8dc4a1251", "type": "github" }, "original": { @@ -438,11 +438,11 @@ ] }, "locked": { - "lastModified": 1722819251, - "narHash": "sha256-f99it92NQSZsrZ8AYbiwAUfrtb/ZpZRqUsl4q6rMA5s=", + "lastModified": 1724028932, + "narHash": "sha256-U11ZiQPrpIBdv7oS23bNdX9GCxe/hPf/ARr64P2Wj1Y=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "c8c3a20b8191819219dba1af79388aa6d555f634", + "rev": "5fd22603892e4ec5ac6085058ed658243143aacd", "type": "github" }, "original": { @@ -453,11 +453,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722791413, - "narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=", + "lastModified": 1723938990, + "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c", + "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", "type": "github" }, "original": { @@ -484,11 +484,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1722630782, - "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { -- cgit v1.2.3 From 51418c584b1f6fb518daa9ffd99cecd4f41e9634 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 19 Aug 2024 02:36:23 -0600 Subject: wine experiments --- machines/khad/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index 08b84c9..739c2b5 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -100,7 +100,8 @@ }; # environment.systemPackages = with pkgs; [ - # docker + # # wineWowPackages.waylandFull + # # docker # ]; virtualisation.docker = { enable = true; -- cgit v1.2.3 From 8d3000d95157daca11dce648b0187c176c1ea6ce Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 19 Aug 2024 15:08:51 -0600 Subject: wine 64 bit error --- machines/khad/configuration.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index 739c2b5..8d02b76 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -99,10 +99,11 @@ jack.enable = true; }; - # environment.systemPackages = with pkgs; [ - # # wineWowPackages.waylandFull - # # docker - # ]; + environment.systemPackages = with pkgs; [ + wineWowPackages.waylandFull + # wine + # docker + ]; virtualisation.docker = { enable = true; storageDriver = "btrfs"; -- cgit v1.2.3 From d19c07cf3ac53fb0b92eec9204513fac8277d22f Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 19 Aug 2024 15:14:34 -0600 Subject: lix update --- flake.lock | 32 ++++++++++++++++---------------- flake.nix | 2 +- modules/nixos/default.nix | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index b6573aa..6b1d4e2 100644 --- a/flake.lock +++ b/flake.lock @@ -242,11 +242,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1724016119, - "narHash": "sha256-sGaA2Gkf22RjwwETvuEWxCz/fmRB1GnBMJJ790HAlME=", + "lastModified": 1724085862, + "narHash": "sha256-y5NkPDQ9E9HAsYufldlZwQ71nKYW70i8GoHsIM4R/Rg=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "83d88fa56467a2b749fb2320e1595281107bd326", + "rev": "c86db7bbb0cf14d4955ee3a4d13c0ed9f8a0e0ae", "type": "github" }, "original": { @@ -364,15 +364,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1718419213, - "narHash": "sha256-WY7BGnu5PnbK4O8cKKv9kvxwzZIGbIQUQLGPHFXitI0=", - "rev": "253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1", + "lastModified": 1723503926, + "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=", + "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz" } }, "lix-module": { @@ -385,15 +385,15 @@ ] }, "locked": { - "lastModified": 1718778548, - "narHash": "sha256-64lB/NO6AQ6z6EDCemPSYZWX/Qc6Rt04cPia5T5v01g=", - "rev": "29ed1bb67751e5b107d08df35d18dda6d45324e9", + "lastModified": 1723510904, + "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=", + "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/29ed1bb67751e5b107d08df35d18dda6d45324e9.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz" } }, "nix-colors": { @@ -484,11 +484,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7f626d6..004cacf 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ # alternative nix compiler lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index a6d62e3..9694e20 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -6,6 +6,6 @@ nix-common = import ./nix-common.nix; services = import ./services.nix; steam = import ./steam.nix; - sway = import ./sway.nix; + # sway = import ./sway.nix; system-packages = import ./system-packages.nix; } -- cgit v1.2.3 From 75c9d17406ec1d09c1bbe425153d3423e36c9a1f Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 19 Aug 2024 15:18:15 -0600 Subject: found where wine was already installed from --- home-manager/home.nix | 3 ++- machines/khad/configuration.nix | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index 5493730..7465424 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -77,7 +77,8 @@ easyeffects mpv lutris - wine + # wine + wineWowPackages.waylandFull # unstable.yt-dlp yt-dlp telegram-desktop diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index 8d02b76..5da9614 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -99,11 +99,11 @@ jack.enable = true; }; - environment.systemPackages = with pkgs; [ - wineWowPackages.waylandFull - # wine - # docker - ]; + # environment.systemPackages = with pkgs; [ + # # wineWowPackages.waylandFull + # # wine + # # docker + # ]; virtualisation.docker = { enable = true; storageDriver = "btrfs"; -- cgit v1.2.3 From c480ba4232cfc68443c9ad51dd0c194b1f61bd13 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 19 Aug 2024 15:22:36 -0600 Subject: source changed dirs --- modules/home-manager/starship.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home-manager/starship.nix b/modules/home-manager/starship.nix index eafc03c..d74bb93 100644 --- a/modules/home-manager/starship.nix +++ b/modules/home-manager/starship.nix @@ -6,6 +6,6 @@ command_timeout = 1000; palette = "catppuccin_mocha"; - } // builtins.fromTOML (builtins.readFile "${inputs.catppuccin-starship}/palettes/mocha.toml"); + } // builtins.fromTOML (builtins.readFile "${inputs.catppuccin-starship}/themes/mocha.toml"); }; } -- cgit v1.2.3 From 05a0c9efeb9d83ed24124c525fdfaf50e1951884 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 19 Aug 2024 17:15:51 -0600 Subject: i need to switch to btrfs subolumes for space usage but i'm too lazy --- home-manager/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index 7465424..bea666d 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -111,7 +111,7 @@ putty qbittorrent # mpris - ciscoPacketTracer8 + # ciscoPacketTracer8 # ciscoPacketTracer7 openjdk adoptopenjdk-icedtea-web -- cgit v1.2.3