Updated nix flake (+ making it build) & Migration to continuwuity

This commit is contained in:
Jurn Wubben 2025-05-25 20:30:30 +02:00
parent 1bbb3dedcc
commit 1243606b55
6 changed files with 59 additions and 77 deletions

116
flake.lock generated
View file

@ -10,11 +10,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1745630506, "lastModified": 1747575206,
"narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "96e078c646b711aee04b82ba01aefbff87004ded", "rev": "4835b1dc898959d8547a871ef484930675cb47f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -28,11 +28,11 @@
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
}, },
"locked": { "locked": {
"lastModified": 1745523430, "lastModified": 1746562888,
"narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "base16.nix", "repo": "base16.nix",
"rev": "58bfe2553d937d8af0564f79d5b950afbef69717", "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -115,11 +115,11 @@
"dcbot": { "dcbot": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1739659068, "lastModified": 1747518717,
"narHash": "sha256-MLl4wWl5mcOpz17lWDfPypSPH9jc5vKKifvfl00mkMQ=", "narHash": "sha256-zQ4mO6Xu7BBZFjXWiiTIgeTory0/E8U/2oRHp90egr0=",
"owner": "jsw08", "owner": "jsw08",
"repo": "dcbot", "repo": "dcbot",
"rev": "6c7e4dd0dc9bd580a67e1f00ba0b6e05f7a85bf5", "rev": "e5981afef024dbebb9f030c127210d08dc522a41",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -229,7 +229,6 @@
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"stylix", "stylix",
"nur",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -301,27 +300,6 @@
"type": "github" "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": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -432,16 +410,16 @@
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732369855, "lastModified": 1744584021,
"narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "dadd58f630eeea41d645ee225a63f719390829dc", "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "GNOME", "owner": "GNOME",
"ref": "47.2", "ref": "48.1",
"repo": "gnome-shell", "repo": "gnome-shell",
"type": "github" "type": "github"
} }
@ -473,11 +451,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746413188, "lastModified": 1748182899,
"narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", "narHash": "sha256-r6MHSalDFydlUmjorVTSsyhLjIt8VWNtGc5+mffXvFQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", "rev": "901f8fef7f349cf8a8e97b3230b22fd592df9160",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -516,11 +494,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746369725, "lastModified": 1747763032,
"narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=", "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d", "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -531,11 +509,11 @@
}, },
"mnw": { "mnw": {
"locked": { "locked": {
"lastModified": 1746338991, "lastModified": 1747499976,
"narHash": "sha256-GbyoHjf14LOxZQc+0NFblI4xf/uwGrYo3W8lwE4HcwI=", "narHash": "sha256-YTiSI4WLbk0CleXeBheYmKZV6iqKyBpyoh1e+vcQzu4=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "mnw", "repo": "mnw",
"rev": "c65407ee9387ef75985dad3e30f58c822c766ec1", "rev": "72433a144c4ac16931e9148f78db4a0e4c147441",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -614,11 +592,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1746495601, "lastModified": 1748137719,
"narHash": "sha256-t13mwTToJdJhbaW4oVZBMXc6kbwXk9u/qy9RlBKjn3Y=", "narHash": "sha256-yBiIy+eb0QxYoIOzOY7QyjqXY5PiLgIoNbFtg4SbUH8=",
"owner": "kaylorben", "owner": "kaylorben",
"repo": "nixcord", "repo": "nixcord",
"rev": "07170d72636e7259e1309e5b494ac6d5c5a1ba81", "rev": "c4d7ccc9ae9fc1c46820bdc5b800b4f66e972ccc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -675,11 +653,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1748085680, "lastModified": 1748124805,
"narHash": "sha256-XG90Q/040NiV70gAVvoYbXg1lULbiwIzfkWmwSINyGQ=", "narHash": "sha256-8A7HjmnvCpDjmETrZY1QwzKunR63LiP7lHu1eA5q6JI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4e6eeca5ed45465087274fc9dc6bc2011254a0f3", "rev": "db1aed32009f408e4048c1dd0beaf714dd34ed93",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -723,11 +701,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1746328495, "lastModified": 1748026106,
"narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -768,11 +746,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1745930157, "lastModified": 1747542820,
"narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -784,7 +762,10 @@
}, },
"nur": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": [
"stylix",
"flake-parts"
],
"nixpkgs": [ "nixpkgs": [
"stylix", "stylix",
"nixpkgs" "nixpkgs"
@ -817,11 +798,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1746522393, "lastModified": 1747525582,
"narHash": "sha256-gZTKsH5440Yu4R5lPpjkeyyMl8mX+T4iiNKlZL3izBk=", "narHash": "sha256-oEZ6DV4bPcNZIuwW5Kcd+/zT3PMkXse2kX/3jHoomGk=",
"owner": "notashelf", "owner": "notashelf",
"repo": "nvf", "repo": "nvf",
"rev": "f07468e13a994b04ec3b9cd41777429942cdc8b1", "rev": "d3a0e7029ac57eef1120225973247851c5b967b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -896,7 +877,7 @@
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme", "firefox-gnome-theme": "firefox-gnome-theme",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_4", "flake-parts": "flake-parts_3",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
@ -910,11 +891,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1746519367, "lastModified": 1748028561,
"narHash": "sha256-bdCCX84HW4CecAgokOi0BgRBR3JSPeGFlusWAGIh3fE=", "narHash": "sha256-IgtJU6n9vR3nBUdcXrc7K9E+Y/G/4P6hFifGRr1tXMU=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "a2b80b900647f28658a2c9456d9a10ab4aa3b250", "rev": "34b5930894d8315401d93bd8a9a6635e1cd28eff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1047,17 +1028,16 @@
"tinted-kitty": { "tinted-kitty": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1716423189, "lastModified": 1735730497,
"narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-kitty", "repo": "tinted-kitty",
"rev": "eb39e141db14baef052893285df9f266df041ff8", "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-kitty", "repo": "tinted-kitty",
"rev": "eb39e141db14baef052893285df9f266df041ff8",
"type": "github" "type": "github"
} }
}, },

View file

@ -4,8 +4,9 @@
... ...
}: { }: {
imports = [ imports = [
inputs.stylix.homeManagerModules.stylix inputs.stylix.homeModules.stylix
inputs.nixcord.homeModules.nixcord inputs.nixcord.homeModules.nixcord
inputs.nvf.homeManagerModules.default
./wayland ./wayland
./shell ./shell

View file

@ -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.) # 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 ([ home.packages = lib.mkIf games ([
pkgs.dolphin-emu pkgs.dolphin-emu
pkgs.suyu pkgs.ryubing
pkgs.gale pkgs.gale
pkgs.adwsteamgtk pkgs.adwsteamgtk

View file

@ -3,8 +3,6 @@
osConfig, osConfig,
... ...
}: { }: {
imports = [inputs.nvf.homeManagerModules.default];
home.sessionVariables = {EDITOR = "nvim";}; home.sessionVariables = {EDITOR = "nvim";};
programs.nvf = { programs.nvf = {
enable = osConfig.niksos.neovim; enable = osConfig.niksos.neovim;
@ -38,7 +36,10 @@
action = "<C-w><C-${x}>"; action = "<C-w><C-${x}>";
mode = "n"; mode = "n";
}) ["h" "j" "k" "l"]; }) ["h" "j" "k" "l"];
useSystemClipboard = true; clipboard = {
enable = true;
providers.wl-copy.enable = true;
};
binds = { binds = {
whichKey.enable = true; whichKey.enable = true;
cheatsheet.enable = true; cheatsheet.enable = true;

View file

@ -107,10 +107,10 @@ in {
] ]
++ workspaces ++ workspaces
++ lib.optionals games (let ++ lib.optionals games (let
suyu = "${appE pkgs.suyu} -ql"; ryubing = "${appE pkgs.ryubing} -ql";
dolphin = appE pkgs.dolphin-emu; dolphin = appE pkgs.dolphin-emu;
in [ in [
"Super, s, exec, ${suyu}" "Super, s, exec, ${ryubing}"
"Super, d, exec, ${dolphin}" "Super, d, exec, ${dolphin}"
]) ])
++ lib.optionals portable [ ++ lib.optionals portable [

View file

@ -15,8 +15,8 @@ in {
services = { services = {
matrix-continuwuity = { matrix-continuwuity = {
enable = true; enable = true;
global = { settings.global = {
unix_socket_path = /run/continuwuity/continuwuity.sock; unix_socket_path = "/run/continuwuity/continuwuity.sock";
server_name = host; server_name = host;
allow_registration = true; allow_registration = true;
registration_token_file = config.age.secrets.matrix-registration.path; registration_token_file = config.age.secrets.matrix-registration.path;