Compare commits

..

No commits in common. "c8e7cb924f96a358924fd03cb4d5e235634b1c3d" and "ebbeb8eda8561442704f971158c886c1ad73e1dd" have entirely different histories.

6 changed files with 98 additions and 146 deletions

View file

@ -28,11 +28,11 @@
"onchg": "onchg" "onchg": "onchg"
}, },
"locked": { "locked": {
"lastModified": 1728874779, "lastModified": 1727101025,
"narHash": "sha256-498cQTDaU7bU3CbWPCQgSGkV25T8sZQmMwhU58WkIXE=", "narHash": "sha256-2mYtBzvhJsCmp8mXzgy+4HIGlA1aEUGZMfRp5LcqqZg=",
"owner": "aksiksi", "owner": "aksiksi",
"repo": "compose2nix", "repo": "compose2nix",
"rev": "07cad037b8887ba94cd7236ffd1a8ee47002a9fe", "rev": "6f63b6706580726f43f4d0788f837313922bf7d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -68,11 +68,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728330715, "lastModified": 1722113426,
"narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -105,11 +105,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1730088193, "lastModified": 1727064198,
"narHash": "sha256-bal4Z9FuMyOeDf9QKjq0BY/ftxas95yksZZjqz3erZo=", "narHash": "sha256-GAwO4R2vYDJse03dfg+8hCttoQSm8LxZCae3BXaXRPk=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "2e14b0705c0c510258864a9832832b89ca6628e9", "rev": "851ae30f15d053b7542cc3abb52ec5be6f100fa3",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -189,11 +189,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727826117, "lastModified": 1726153070,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -273,11 +273,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1710146030,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -336,11 +336,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729104314, "lastModified": 1726745158,
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,11 +378,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730016908, "lastModified": 1726985855,
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e83414058edd339148dc142a8437edb9450574c8", "rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -400,11 +400,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730016908, "lastModified": 1726902823,
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e83414058edd339148dc142a8437edb9450574c8", "rev": "14929f7089268481d86b83ed31ffd88713dcd415",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -413,34 +413,6 @@
"type": "github" "type": "github"
} }
}, },
"ixx": {
"inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729544999,
"narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "65c207c92befec93e22086da9456d3906a4e999c",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.0.5",
"repo": "ixx",
"type": "github"
}
},
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -469,7 +441,7 @@
"narHash": "sha256-64lB/NO6AQ6z6EDCemPSYZWX/Qc6Rt04cPia5T5v01g=", "narHash": "sha256-64lB/NO6AQ6z6EDCemPSYZWX/Qc6Rt04cPia5T5v01g=",
"rev": "29ed1bb67751e5b107d08df35d18dda6d45324e9", "rev": "29ed1bb67751e5b107d08df35d18dda6d45324e9",
"type": "tarball", "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/29ed1bb67751e5b107d08df35d18dda6d45324e9.tar.gz?rev=29ed1bb67751e5b107d08df35d18dda6d45324e9"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -481,11 +453,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1728371783, "lastModified": 1725746760,
"narHash": "sha256-ufI7115ims2PPxggpWQhigAUrwlwu155wVgngZzzyZ0=", "narHash": "sha256-p38Uini6lChBCF0mZndHXTAy7ZH/OQLY696BFCHg92g=",
"owner": "viperML", "owner": "viperML",
"repo": "nh", "repo": "nh",
"rev": "afdff9ab4fdb9c329b5d97c5b742242b97f8754d", "rev": "7650b372e55a36d7765ee0a5e59b142731bc8b3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -502,11 +474,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729982130, "lastModified": 1726742753,
"narHash": "sha256-HmLLQbX07rYD0RXPxbf3kJtUo66XvEIX9Y+N5QHQ9aY=", "narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "2eb472230a5400c81d9008014888b4bff23bcf44", "rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -558,11 +530,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1730068391, "lastModified": 1727040444,
"narHash": "sha256-jlAGtfMuI8pUUoUmNkm2P/38pOtHZdcAf3Az8XQLAf4=", "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "6906ac67a1078cf950b8527341e229eeecb5bc30", "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -590,11 +562,11 @@
}, },
"nixpkgs-2405": { "nixpkgs-2405": {
"locked": { "locked": {
"lastModified": 1729973466, "lastModified": 1726969270,
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -618,11 +590,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1730147637, "lastModified": 1727111026,
"narHash": "sha256-oQx0w89dKGJsUba1AZdcZ9ga8xbbnlS8z7nGlcft8Co=", "narHash": "sha256-YTryIMpXFKrcCPR9tHaH9pRxu+BZOyBiLfJEEc0NOvk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d7216383a52ea029800cd271fbb521038e94e93e", "rev": "595d042883f4e0161286c99e4edefa9dbaf982d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -649,11 +621,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1729973466, "lastModified": 1725762081,
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -696,11 +668,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1727540905, "lastModified": 1725001927,
"narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fbca5e745367ae7632731639de5c21f29c8744ed", "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -728,11 +700,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1729880355, "lastModified": 1726937504,
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -789,11 +761,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1730142611, "lastModified": 1727050833,
"narHash": "sha256-5FeMJgj7DRLVKLsBQiaZusvf/4sxhMEpmNC3Qm/rvnk=", "narHash": "sha256-uq8pP+WsJsZ3QA+GoSftUsAvhx3btBOCWAqKQSFcL1M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "e7356f6be06a68e36987df6cfde3541a6817b708", "rev": "a9345dcfc31519734361fecd246d32164feafbca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -805,18 +777,17 @@
"nuschtosSearch": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_5",
"ixx": "ixx",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1730044642, "lastModified": 1726816132,
"narHash": "sha256-DbyV9l3hkrSWcN34S6d9M4kAFss0gEHGtjqqMdG9eAs=", "narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "e373332c1f8237fc1263901745b0fe747228c8ba", "rev": "7733a39a1321057172d87e6251ded7cdeb67171e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -856,11 +827,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1729856880, "lastModified": 1727026900,
"narHash": "sha256-UIArlQ7eQ/x6vs13tG9SR48NGPxmue+e/4D1vevZ0Tc=", "narHash": "sha256-0b+Mo27UE1WTd00k0hHibdeGA5tBTxepg3clAWZZOdo=",
"owner": "SaumonNet", "owner": "SaumonNet",
"repo": "proxmox-nixos", "repo": "proxmox-nixos",
"rev": "93880e244b528deca89828bc1edf08e23ccc18c4", "rev": "53f9cd6ad81f1bf36b257470d82e77e0629578c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -915,11 +886,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1729999681, "lastModified": 1726524647,
"narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "rev": "e2d404a7ea599a013189aa42947f66cede0645c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1030,11 +1001,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730025913, "lastModified": 1726734507,
"narHash": "sha256-Y9NtFmP8ciLyRsopcCx1tyoaaStKeq+EndwtGCgww7I=", "narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "bae131e525cc8718da22fbeb8d8c7c43c4ea502a", "rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -74,31 +74,31 @@ with inputs; {
} }
]; ];
} }
{ {
name = "piracy"; name = "piracy";
bookmarks = [ bookmarks = [
{ {
name = "slskd"; name = "slskd";
url = "http://seraphim.fritz.box:5030"; url = "http://seraphim.fritz.box:5030";
} }
{ {
name = "Sonarr"; name = "Sonarr";
url = "http://seraphim.fritz.box:8989"; url = "http://seraphim.fritz.box:8989";
} }
{ {
name = "Radarr"; name = "Radarr";
url = "http://seraphim.fritz.box:7878"; url = "http://seraphim.fritz.box:7878";
} }
{ {
name = "Prowlarr"; name = "Prowlarr";
url = "http://seraphim.fritz.box:9696"; url = "http://seraphim.fritz.box:9696";
} }
{ {
name = "qBittorrent"; name = "qBittorrent";
url = "http://seraphim.fritz.box:8085"; url = "http://seraphim.fritz.box:8085";
} }
]; ];
} }
]; ];
} }
]; ];

View file

@ -11,7 +11,6 @@
in { in {
home.packages = home.packages =
(lib.optionals (config.os == "linux") (with pkgs; [ (lib.optionals (config.os == "linux") (with pkgs; [
element-desktop
cargo cargo
yubioath-flutter yubioath-flutter
steam steam
@ -105,6 +104,7 @@ in {
vesktop vesktop
discord discord
element-desktop
qbittorrent qbittorrent
nicotine-plus nicotine-plus
@ -121,9 +121,6 @@ in {
sayonara sayonara
feishin feishin
wireguard-tools
wireguard-ui
nix-tree nix-tree
nixos-icons nixos-icons

View file

@ -32,7 +32,7 @@
enable = true; enable = true;
colorscheme = "apathy"; colorscheme = "apathy";
settings = { settings = {
telescope_borders = true; telescope_borders = true;
}; };
}; };
plugins = { plugins = {
@ -135,13 +135,13 @@
}; };
lsp-format = {enable = true;}; lsp-format = {enable = true;};
copilot-lua = { copilot-lua = {
enable = true; enable = false;
suggestion = { suggestion = {
enabled = false; enabled = false;
}; };
panel.enabled = false; panel.enabled = false;
}; };
copilot-cmp.enable = true; copilot-cmp.enable = false;
copilot-chat = { copilot-chat = {
enable = true; enable = true;
settings.context = "buffers"; settings.context = "buffers";
@ -180,10 +180,6 @@
servers = { servers = {
# disabled due to compile error # disabled due to compile error
# typst-lsp.enable = true; # typst-lsp.enable = true;
protols = {
enable = true;
package = pkgs.protols;
};
typos-lsp.enable = false; typos-lsp.enable = false;
docker-compose-language-service.enable = true; docker-compose-language-service.enable = true;
pylsp.enable = true; pylsp.enable = true;
@ -191,10 +187,7 @@
lua-ls.enable = true; lua-ls.enable = true;
gopls.enable = true; gopls.enable = true;
nushell.enable = true; nushell.enable = true;
clangd = { clangd.enable = true;
enable = true;
filetypes = ["c" "cpp" "objc" "objcpp" "cpp"];
};
svelte.enable = true; svelte.enable = true;
ts-ls.enable = true; ts-ls.enable = true;
java-language-server.enable = true; java-language-server.enable = true;
@ -255,7 +248,7 @@
{name = "path";} {name = "path";}
{name = "buffer";} {name = "buffer";}
{name = "luasnip";} {name = "luasnip";}
{name = "copilot";} # {name = "copilot";}
]; ];
#mapping = { #mapping = {
# __raw = '' # __raw = ''

View file

@ -1,9 +1,4 @@
{ {config, lib, pkgs, ...}: {
config,
lib,
pkgs,
...
}: {
services.caddy = { services.caddy = {
enable = true; enable = true;
email = "xqtc@tutanota.com"; email = "xqtc@tutanota.com";

View file

@ -1,9 +1,5 @@
{config, pkgs, lib, ...}:
{ {
config,
pkgs,
lib,
...
}: {
users.users.marie = { users.users.marie = {
isNormalUser = true; isNormalUser = true;
packages = with pkgs; [ packages = with pkgs; [
@ -36,7 +32,7 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKA4+3PkFptATzrWncxdj63SqZ747cDb8TqmdQFugvW7 ellie@card" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKA4+3PkFptATzrWncxdj63SqZ747cDb8TqmdQFugvW7 ellie@card"
]; ];
}; };
users.users.brodo = { users.users.brodo = {
isNormalUser = true; isNormalUser = true;
packages = with pkgs; [ packages = with pkgs; [