From 01585c858e8dbad7afe397575dd210f0922a0389 Mon Sep 17 00:00:00 2001 From: Jurn Wubben Date: Sun, 25 May 2025 20:30:30 +0200 Subject: [PATCH] Updated nix flake (+ making it build) & Migration to continuwuity --- flake.lock | 116 +++++++++++++------------------- home/default.nix | 3 +- home/programs/games.nix | 2 +- home/programs/neovim.nix | 7 +- home/wayland/hyprland/binds.nix | 4 +- system/server/matrix.nix | 4 +- 6 files changed, 59 insertions(+), 77 deletions(-) diff --git a/flake.lock b/flake.lock index c59d418..1bc8f1c 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1745630506, - "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", + "lastModified": 1747575206, + "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", "owner": "ryantm", "repo": "agenix", - "rev": "96e078c646b711aee04b82ba01aefbff87004ded", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -28,11 +28,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1745523430, - "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "dcbot": { "flake": false, "locked": { - "lastModified": 1739659068, - "narHash": "sha256-MLl4wWl5mcOpz17lWDfPypSPH9jc5vKKifvfl00mkMQ=", + "lastModified": 1747518717, + "narHash": "sha256-zQ4mO6Xu7BBZFjXWiiTIgeTory0/E8U/2oRHp90egr0=", "owner": "jsw08", "repo": "dcbot", - "rev": "6c7e4dd0dc9bd580a67e1f00ba0b6e05f7a85bf5", + "rev": "e5981afef024dbebb9f030c127210d08dc522a41", "type": "github" }, "original": { @@ -229,7 +229,6 @@ "inputs": { "nixpkgs-lib": [ "stylix", - "nur", "nixpkgs" ] }, @@ -301,27 +300,6 @@ "type": "github" } }, - "flake-utils_4": { - "inputs": { - "systems": [ - "stylix", - "systems" - ] - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -432,16 +410,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } @@ -473,11 +451,11 @@ ] }, "locked": { - "lastModified": 1746413188, - "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", + "lastModified": 1748182899, + "narHash": "sha256-r6MHSalDFydlUmjorVTSsyhLjIt8VWNtGc5+mffXvFQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", + "rev": "901f8fef7f349cf8a8e97b3230b22fd592df9160", "type": "github" }, "original": { @@ -516,11 +494,11 @@ ] }, "locked": { - "lastModified": 1746369725, - "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=", + "lastModified": 1747763032, + "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", "owner": "nix-community", "repo": "home-manager", - "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d", + "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", "type": "github" }, "original": { @@ -531,11 +509,11 @@ }, "mnw": { "locked": { - "lastModified": 1746338991, - "narHash": "sha256-GbyoHjf14LOxZQc+0NFblI4xf/uwGrYo3W8lwE4HcwI=", + "lastModified": 1747499976, + "narHash": "sha256-YTiSI4WLbk0CleXeBheYmKZV6iqKyBpyoh1e+vcQzu4=", "owner": "Gerg-L", "repo": "mnw", - "rev": "c65407ee9387ef75985dad3e30f58c822c766ec1", + "rev": "72433a144c4ac16931e9148f78db4a0e4c147441", "type": "github" }, "original": { @@ -614,11 +592,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746495601, - "narHash": "sha256-t13mwTToJdJhbaW4oVZBMXc6kbwXk9u/qy9RlBKjn3Y=", + "lastModified": 1748137719, + "narHash": "sha256-yBiIy+eb0QxYoIOzOY7QyjqXY5PiLgIoNbFtg4SbUH8=", "owner": "kaylorben", "repo": "nixcord", - "rev": "07170d72636e7259e1309e5b494ac6d5c5a1ba81", + "rev": "c4d7ccc9ae9fc1c46820bdc5b800b4f66e972ccc", "type": "github" }, "original": { @@ -675,11 +653,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1748085680, - "narHash": "sha256-XG90Q/040NiV70gAVvoYbXg1lULbiwIzfkWmwSINyGQ=", + "lastModified": 1748124805, + "narHash": "sha256-8A7HjmnvCpDjmETrZY1QwzKunR63LiP7lHu1eA5q6JI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4e6eeca5ed45465087274fc9dc6bc2011254a0f3", + "rev": "db1aed32009f408e4048c1dd0beaf714dd34ed93", "type": "github" }, "original": { @@ -723,11 +701,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -768,11 +746,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -784,7 +762,10 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": [ + "stylix", + "flake-parts" + ], "nixpkgs": [ "stylix", "nixpkgs" @@ -817,11 +798,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1746522393, - "narHash": "sha256-gZTKsH5440Yu4R5lPpjkeyyMl8mX+T4iiNKlZL3izBk=", + "lastModified": 1747525582, + "narHash": "sha256-oEZ6DV4bPcNZIuwW5Kcd+/zT3PMkXse2kX/3jHoomGk=", "owner": "notashelf", "repo": "nvf", - "rev": "f07468e13a994b04ec3b9cd41777429942cdc8b1", + "rev": "d3a0e7029ac57eef1120225973247851c5b967b5", "type": "github" }, "original": { @@ -896,7 +877,7 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_4", + "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", @@ -910,11 +891,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1746519367, - "narHash": "sha256-bdCCX84HW4CecAgokOi0BgRBR3JSPeGFlusWAGIh3fE=", + "lastModified": 1748028561, + "narHash": "sha256-IgtJU6n9vR3nBUdcXrc7K9E+Y/G/4P6hFifGRr1tXMU=", "owner": "danth", "repo": "stylix", - "rev": "a2b80b900647f28658a2c9456d9a10ab4aa3b250", + "rev": "34b5930894d8315401d93bd8a9a6635e1cd28eff", "type": "github" }, "original": { @@ -1047,17 +1028,16 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, diff --git a/home/default.nix b/home/default.nix index 1a7a26e..ef0e4cc 100644 --- a/home/default.nix +++ b/home/default.nix @@ -4,8 +4,9 @@ ... }: { imports = [ - inputs.stylix.homeManagerModules.stylix + inputs.stylix.homeModules.stylix inputs.nixcord.homeModules.nixcord + inputs.nvf.homeManagerModules.default ./wayland ./shell diff --git a/home/programs/games.nix b/home/programs/games.nix index 47b121f..3b23e47 100644 --- a/home/programs/games.nix +++ b/home/programs/games.nix @@ -9,7 +9,7 @@ in { # Also look at system/programs/games.nix (some programs have to be overlayed or have systemwide modules that have to be installed.) home.packages = lib.mkIf games ([ pkgs.dolphin-emu - pkgs.suyu + pkgs.ryubing pkgs.gale pkgs.adwsteamgtk diff --git a/home/programs/neovim.nix b/home/programs/neovim.nix index cfeb3ca..1d0197c 100644 --- a/home/programs/neovim.nix +++ b/home/programs/neovim.nix @@ -3,8 +3,6 @@ osConfig, ... }: { - imports = [inputs.nvf.homeManagerModules.default]; - home.sessionVariables = {EDITOR = "nvim";}; programs.nvf = { enable = osConfig.niksos.neovim; @@ -38,7 +36,10 @@ action = ""; mode = "n"; }) ["h" "j" "k" "l"]; - useSystemClipboard = true; + clipboard = { + enable = true; + providers.wl-copy.enable = true; + }; binds = { whichKey.enable = true; cheatsheet.enable = true; diff --git a/home/wayland/hyprland/binds.nix b/home/wayland/hyprland/binds.nix index 9154f2f..0a74555 100644 --- a/home/wayland/hyprland/binds.nix +++ b/home/wayland/hyprland/binds.nix @@ -107,10 +107,10 @@ in { ] ++ workspaces ++ lib.optionals games (let - suyu = "${appE pkgs.suyu} -ql"; + ryubing = "${appE pkgs.ryubing} -ql"; dolphin = appE pkgs.dolphin-emu; in [ - "Super, s, exec, ${suyu}" + "Super, s, exec, ${ryubing}" "Super, d, exec, ${dolphin}" ]) ++ lib.optionals portable [ diff --git a/system/server/matrix.nix b/system/server/matrix.nix index f545d0e..57baa99 100644 --- a/system/server/matrix.nix +++ b/system/server/matrix.nix @@ -15,8 +15,8 @@ in { services = { matrix-continuwuity = { enable = true; - global = { - unix_socket_path = /run/continuwuity/continuwuity.sock; + settings.global = { + unix_socket_path = "/run/continuwuity/continuwuity.sock"; server_name = host; allow_registration = true; registration_token_file = config.age.secrets.matrix-registration.path;