Compare commits

..

No commits in common. "655f6fdabfca1c2f474ebdc6c8c8de4e99793b25" and "db2412e9ec7541164485e8f73a05fc358496bbf3" have entirely different histories.

11 changed files with 169 additions and 568 deletions

View File

@ -18,11 +18,11 @@
},
"catppuccin": {
"locked": {
"lastModified": 1730458408,
"narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=",
"lastModified": 1728407414,
"narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=",
"owner": "catppuccin",
"repo": "nix",
"rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad",
"rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f",
"type": "github"
},
"original": {
@ -111,22 +111,6 @@
}
},
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -142,7 +126,7 @@
"type": "github"
}
},
"flake-compat_5": {
"flake-compat_4": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@ -156,7 +140,7 @@
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-compat_6": {
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1641205782,
@ -172,7 +156,7 @@
"type": "github"
}
},
"flake-compat_7": {
"flake-compat_6": {
"flake": false,
"locked": {
"lastModified": 1641205782,
@ -193,11 +177,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1730504689,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"lastModified": 1727826117,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github"
},
"original": {
@ -256,11 +240,11 @@
]
},
"locked": {
"lastModified": 1730504689,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"lastModified": 1727826117,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github"
},
"original": {
@ -384,11 +368,11 @@
]
},
"locked": {
"lastModified": 1729104314,
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"lastModified": 1728092656,
"narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
"type": "github"
},
"original": {
@ -414,11 +398,11 @@
]
},
"locked": {
"lastModified": 1730302582,
"narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
"lastModified": 1729104314,
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"type": "github"
},
"original": {
@ -474,11 +458,11 @@
"guihua": {
"flake": false,
"locked": {
"lastModified": 1730516234,
"narHash": "sha256-XpUsbj1boDfbyE8C6SdOvZdkd97682VVC81fvQ5WA/4=",
"lastModified": 1717591195,
"narHash": "sha256-V5rlORFlhgjAT0n+LcpMNdY+rEqQpur/KGTGH6uFxMY=",
"owner": "ray-x",
"repo": "guihua.lua",
"rev": "d783191eaa75215beae0c80319fcce5e6b3beeda",
"rev": "225db770e36aae6a1e9e3a65578095c8eb4038d3",
"type": "github"
},
"original": {
@ -516,11 +500,11 @@
]
},
"locked": {
"lastModified": 1730633670,
"narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
"lastModified": 1728337164,
"narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
"rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
"type": "github"
},
"original": {
@ -537,11 +521,11 @@
]
},
"locked": {
"lastModified": 1730633670,
"narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
"lastModified": 1729260213,
"narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
"rev": "09a0c0c02953318bf94425738c7061ffdc4cba75",
"type": "github"
},
"original": {
@ -550,42 +534,14 @@
"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"
}
},
"lazydev": {
"flake": false,
"locked": {
"lastModified": 1730477088,
"narHash": "sha256-Xgeb2ABoCkWIr1Pfh41vp1hmbgQJY9vCAkztamdzrTk=",
"lastModified": 1721897868,
"narHash": "sha256-D5gP2rVPYoWc8hslTrH7Z90cE7XEu+tfkD6FZzY/iPk=",
"owner": "folke",
"repo": "lazydev.nvim",
"rev": "d5800897d9180cea800023f2429bce0a94ed6064",
"rev": "491452cf1ca6f029e90ad0d0368848fac717c6d2",
"type": "github"
},
"original": {
@ -610,45 +566,14 @@
"type": "github"
}
},
"minecraft-server-flake": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nix-minecraft": [
"nix-minecraft"
],
"nixpkgs": [
"nixpkgs"
],
"placeholderapi-luckperms": "placeholderapi-luckperms",
"systems": [
"systems"
],
"vanillatweaks": "vanillatweaks"
},
"locked": {
"lastModified": 1732313755,
"narHash": "sha256-uF3LDIKiAAmayuQkuRB/50p5ZUS1Lun9poOLuY4wCP8=",
"ref": "refs/heads/master",
"rev": "fccbd8aac6e9114b481e542026c60e247922f252",
"revCount": 149,
"type": "git",
"url": "ssh://git@git.gaja-group.com/gaja-group/minecraft-server-flake.git"
},
"original": {
"type": "git",
"url": "ssh://git@git.gaja-group.com/gaja-group/minecraft-server-flake.git"
}
},
"neorg": {
"flake": false,
"locked": {
"lastModified": 1730333767,
"narHash": "sha256-qTo8rxwvANrgP8UccFhzsNsH+Jbmqv2iOlw0ccLNYm4=",
"lastModified": 1727821831,
"narHash": "sha256-yfWQ6yKytu1jkWUtRZTVICslUWej6jVYv7frmSB7/6Q=",
"owner": "nvim-neorg",
"repo": "neorg",
"rev": "488507bb996f75ee29073f50dec32fa220867ca5",
"rev": "afc9a37bf021acb0853e95714c4c6436e1588286",
"type": "github"
},
"original": {
@ -685,11 +610,11 @@
]
},
"locked": {
"lastModified": 1730088025,
"narHash": "sha256-FIdIaN7f6karwtDV65VXTV8VThNrR63nwykfgXpm4p4=",
"lastModified": 1728453769,
"narHash": "sha256-Y3yr9m0L2ZbVBTWIHKOSQihYe/mUXARDk0R0y8gyVlU=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "f35afbe60a4ff71fd65fec3839fc38943f961951",
"rev": "a03b28ad890ba13be3367d0aae40c52345728fc4",
"type": "github"
},
"original": {
@ -701,11 +626,11 @@
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1729121305,
"narHash": "sha256-c94xkA/RuszC4PfmB+MWqOo2vbO66GTO6XKer0mbltA=",
"lastModified": 1728429403,
"narHash": "sha256-F8dsqHvzdCvlKk+6zMubRemPLxjImYQDKkRHy8wgV3Y=",
"owner": "neovim",
"repo": "neovim",
"rev": "852954ff6d96adce0158f74ca494fdcef3aa1921",
"rev": "e98b1b0235a5e817c00814549606631703ab2041",
"type": "github"
},
"original": {
@ -741,11 +666,11 @@
]
},
"locked": {
"lastModified": 1730600078,
"narHash": "sha256-BoyFmE59HDF3uybBySsWVoyjNuHvz3Wv8row/mSb958=",
"lastModified": 1728901530,
"narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "4652874d014b82cb746173ffc64f6a70044daa7e",
"rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6",
"type": "github"
},
"original": {
@ -754,28 +679,6 @@
"type": "github"
}
},
"nix-minecraft": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": [
"flake-utils"
],
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1732067443,
"narHash": "sha256-CPNSYmlv8Hp1GHLPKq4RE1ujnOpwGEZKHZDWb1b1ZNc=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
"rev": "ca645f4163a501a3302e4afeb25f52906493bfd3",
"type": "github"
},
"original": {
"owner": "Infinidoge",
"repo": "nix-minecraft",
"type": "github"
}
},
"nixgl": {
"inputs": {
"flake-utils": "flake-utils_2",
@ -799,11 +702,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1730537918,
"narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
"lastModified": 1728269138,
"narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
"rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b",
"type": "github"
},
"original": {
@ -814,18 +717,18 @@
},
"nixos-wsl": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1730453870,
"narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=",
"lastModified": 1728399236,
"narHash": "sha256-X1a4t/OkB9fH6Ao+Pqkto8mJrzlG6t8Dimn8jkbPuZc=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "adb6bc4b661a43328752b4575be4968a4990c033",
"rev": "9f4fbf5f9e381826e6d66a6f699ad30ff3122075",
"type": "github"
},
"original": {
@ -836,11 +739,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1715266358,
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
"lastModified": 1728241625,
"narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f1010e0469db743d14519a1efd37e23f8513d714",
"rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
"type": "github"
},
"original": {
@ -852,14 +755,14 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1730504152,
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
"lastModified": 1727825735,
"narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
}
},
"nixpkgs-lib_2": {
@ -879,15 +782,16 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1730785428,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"owner": "nixos",
"lastModified": 1644486793,
"narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",
"type": "github"
},
"original": {
"owner": "nixos",
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -908,26 +812,10 @@
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1644486793,
"narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": {
"inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat_5",
"flake-compat": "flake-compat_4",
"flake-parts": "flake-parts_4",
"git-hooks": "git-hooks_2",
"home-manager": "home-manager_2",
@ -939,11 +827,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1730731617,
"narHash": "sha256-W7FNEe+gewzTSx0lykzZ3XUKmJ8uKk/SpIPblZIfYc0=",
"lastModified": 1729438888,
"narHash": "sha256-TGTDOX2/5OIoSzlcRReVn4BbbfL6Ami/eassiPPGqNA=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "aa06b176e78c9ae9e779e605cab61c9d8681a54e",
"rev": "47b563d4e1410bff6a9481b3dd8b01b1e5ed70d2",
"type": "github"
},
"original": {
@ -954,9 +842,9 @@
},
"norg": {
"inputs": {
"flake-compat": "flake-compat_6",
"flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1672582520,
@ -975,9 +863,9 @@
},
"norg-meta": {
"inputs": {
"flake-compat": "flake-compat_7",
"flake-compat": "flake-compat_6",
"flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_4"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1713028366,
@ -995,11 +883,11 @@
},
"nur": {
"locked": {
"lastModified": 1730779796,
"narHash": "sha256-5J3jgJ923OdtEjyt3xFLyLkxGqGdn6oYUiC+dDCDL44=",
"lastModified": 1728503449,
"narHash": "sha256-rxsnlTXxZXm2JJQXQY9v4SR8WsbBOpkEoBSpNK2BXVA=",
"owner": "nix-community",
"repo": "NUR",
"rev": "d17cb4d177a40e5cedc04719af56571e7ef643a7",
"rev": "f1df2359f8196cfe2edac0d1eba6bf7ea0128c9c",
"type": "github"
},
"original": {
@ -1011,18 +899,17 @@
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_4",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1730515563,
"narHash": "sha256-8lklUZRV7nwkPLF3roxzi4C2oyLydDXyAzAnDvjkOms=",
"lastModified": 1728905062,
"narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=",
"owner": "NuschtOS",
"repo": "search",
"rev": "9e22bd742480916ff5d0ab20ca2522eaa3fa061e",
"rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84",
"type": "github"
},
"original": {
@ -1079,18 +966,6 @@
"url": "http://ftp.vim.org/vim/runtime/spell/de.utf-8.sug"
}
},
"placeholderapi-luckperms": {
"flake": false,
"locked": {
"narHash": "sha256-885K4DpNJc6FVvNwkzIvD8rcHJzEO3LtBpUmcLkcUTM=",
"type": "file",
"url": "https://download.gaja-group.com/LuckPerms-Fabric-PlaceholderAPI-Hook.jar"
},
"original": {
"type": "file",
"url": "https://download.gaja-group.com/LuckPerms-Fabric-PlaceholderAPI-Hook.jar"
}
},
"root": {
"inputs": {
"catppuccin": "catppuccin",
@ -1101,16 +976,14 @@
"home-manager": "home-manager",
"lazydev": "lazydev",
"luavit-meta": "luavit-meta",
"minecraft-server-flake": "minecraft-server-flake",
"neorg": "neorg",
"neorg-telescope": "neorg-telescope",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-colors": "nix-colors",
"nix-minecraft": "nix-minecraft",
"nixgl": "nixgl",
"nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"nixvim": "nixvim",
"norg": "norg",
"norg-meta": "norg-meta",
@ -1119,8 +992,7 @@
"nvim-spell-de-latin1-suggestions": "nvim-spell-de-latin1-suggestions",
"nvim-spell-de-utf8-dictionary": "nvim-spell-de-utf8-dictionary",
"nvim-spell-de-utf8-suggestions": "nvim-spell-de-utf8-suggestions",
"systems": "systems_3",
"vim-mcfunction": "vim-mcfunction"
"systems": "systems_3"
}
},
"systems": {
@ -1176,11 +1048,11 @@
]
},
"locked": {
"lastModified": 1730321837,
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
"lastModified": 1729242555,
"narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
"rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5",
"type": "github"
},
"original": {
@ -1188,35 +1060,6 @@
"repo": "treefmt-nix",
"type": "github"
}
},
"vanillatweaks": {
"flake": false,
"locked": {
"lastModified": 1729813122,
"narHash": "sha256-ilaZ0ozs/M+/XoVXPm8D+XjenKdhyPmZC4iUroexn2U=",
"type": "tarball",
"url": "https://download.gaja-group.com/VanillaTweaks_d592869_UNZIP_ME.zip"
},
"original": {
"type": "tarball",
"url": "https://download.gaja-group.com/VanillaTweaks_d592869_UNZIP_ME.zip"
}
},
"vim-mcfunction": {
"flake": false,
"locked": {
"lastModified": 1675460606,
"narHash": "sha256-R2QKpuuT7BULM3tv2lBf5GCJysU8gNtKqyrQHDoOcMo=",
"owner": "RubixTheSlime",
"repo": "vim-mcfunction",
"rev": "f8ad1bfccb97f8f8e7ee0c52024eac3a8e491a85",
"type": "github"
},
"original": {
"owner": "RubixTheSlime",
"repo": "vim-mcfunction",
"type": "github"
}
}
},
"root": "root",

View File

@ -12,13 +12,9 @@
flakeLib = import ./lib;
neorgWorkspaces = [ "default" "general" "games" "btc" ];
genNeorgWorkspaces = root: workspaces: (builtins.listToAttrs (map (n: { name = n; value = "${root}/${n}"; }) workspaces));
vars = rec {
name = "Patrick Neff";
username = "odie";
extraGroups = [];
homeDirectory = "/home/${username}";
locale = "de_DE.UTF-8";
email = "odie86@gmail.com";
@ -29,7 +25,13 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINs89u4Kvwlmq67eV+H/n+x9M8gsKDxQU+dCPSEb2vJe odie"
];
domain = "odie.home.arpa";
neorg.workspaces = genNeorgWorkspaces "${homeDirectory}/Notes" neorgWorkspaces;
notes = rec {
root = "${homeDirectory}/Notes";
workspaces = {
general = "${root}/general";
games = "${root}/games";
};
};
};
overlays = import ./overlays { inherit inputs; };
in
@ -42,7 +44,6 @@
qemu = import ./modules/nixos/qemu;
home-manager = import ./modules/nixos/home-manager;
server = import ./modules/nixos/server;
games = import ./modules/nixos/games;
};
nixosConfigurations =
flakeLib.mkNixosConfiguration
@ -54,8 +55,13 @@
// flakeLib.mkNixosConfiguration {
inherit inputs nixpkgs outputs flakeLib overlays;
vars = vars // {
neorg.workspaces = genNeorgWorkspaces "/mnt/c/Users/odie/Sync/norg" neorgWorkspaces;
extraGroups = ["minecraft"];
notes = rec {
root = "/mnt/c/Users/odie/Sync/norg";
workspaces = {
general = "${root}/general";
games = "${root}/games";
};
};
};
system = "x86_64-linux";
hostName = "wsl-dev";
@ -126,8 +132,7 @@
inputs = {
# System
nixpkgs.url = "github:nixos/nixpkgs"; # Use master
#nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use unstable
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR";
nix-colors.url = "github:misterio77/nix-colors";
systems.url = "github:nix-systems/default";
@ -180,10 +185,6 @@
url = "github:ray-x/guihua.lua";
flake = false;
};
vim-mcfunction = {
url = "github:RubixTheSlime/vim-mcfunction";
flake = false;
};
/*
neorg-overlay = {
@ -215,23 +216,6 @@
flake = false;
};
# Games
nix-minecraft = {
url = "github:Infinidoge/nix-minecraft";
inputs = {
flake-utils.follows = "flake-utils";
};
};
minecraft-server-flake = {
url = "git+ssh://git@git.gaja-group.com/gaja-group/minecraft-server-flake.git";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
systems.follows = "systems";
nix-minecraft.follows = "nix-minecraft";
};
};
# Misc
csleeptimer = {
url = "git+ssh://gitea@git.niederkassel.neff-steindesign.de/odie/csleeptimer.git";

View File

@ -22,7 +22,6 @@
ripgrep
fd
gdu
jq
python3Packages.argcomplete
];

View File

@ -1,6 +1,8 @@
{ pkgs, lib, config, ... }:
{
options = { };
options = {
};
config = {
programs.tmux = lib.mkIf config.programs.tmux.enable {
newSession = false;
@ -20,32 +22,10 @@
{
plugin = catppuccin;
extraConfig = ''
set -g @catppuccin_flavour "mocha"
set -g @catppuccin_window_status_style "rounded"
set -g @catppuccin_window_default_text " #W" # use "#W" for application instead of directory
set -g @catppuccin_window_current_text " #W" # use "#W" for application instead of directory
set -g @catppuccin_window_status "icon"
set -g @catppuccin_window_separator ""
set -g @catppuccin_window_middle_separator ""
set -g @catppuccin_window_left_separator ""
set -g @catppuccin_window_right_separator ""
set -g @catppuccin_window_default_text "#W" # use "#W" for application instead of directory
set -g @catppuccin_window_current_text "#W" # use "#W" for application instead of directory
set -g @catppuccin_window_status_enable "yes"
set -g @catppuccin_icon_window_last "󰖰 "
set -g @catppuccin_icon_window_current "󰖯 "
set -g @catppuccin_icon_window_zoom "󰁌 "
set -g @catppuccin_icon_window_mark "󰃀 "
set -g @catppuccin_icon_window_silent "󰂛 "
set -g @catppuccin_icon_window_activity "󱅫 "
set -g @catppuccin_icon_window_bell "󰂞 "
#set -g @catppuccin_window_status_enable "yes"
set -g @catppuccin_status_modules_right "directory user host date_time session"
set -g status-right-length 100
#set -g status-right "#{E:@catppuccin_status_directory}"
#set -ag status-right "#{E:@catppuccin_status_user}"
#set -ag status-right "#{E:@catppuccin_status_host}"
#set -ag status-right "#{E:@catppuccin_status_date_time}"
#set -agF status-right "#{E:@catppuccin_status_session}"
set -g status-left ""
'';
}
better-mouse-mode

View File

@ -5,7 +5,7 @@
vars,
...
}: let
inherit (vars) username name sshKeys extraGroups;
inherit (vars) username name locale hostname sshKeys;
baseGroups = [
"users"
@ -24,7 +24,7 @@
"spi"
]
else [];
allExtraGroups = baseGroups ++ rpiGroups ++ extraGroups;
extraGroups = baseGroups ++ rpiGroups;
basePackages = with pkgs; [home-manager];
wslPackages =
@ -45,8 +45,7 @@ in {
groups.${username} = {};
users = {
${username} = {
inherit packages ;
extraGroups = allExtraGroups;
inherit packages extraGroups;
name = username;
uid = 1000;
isNormalUser = true;

View File

@ -1,5 +0,0 @@
{
imports = [
./minecraft
];
}

View File

@ -1,186 +0,0 @@
{ inputs, ... }: {
imports = [
inputs.minecraft-server-flake.nixosModules.minecraft-servers
];
services.minecraft-servers = {
servers = {
vanilla-plus.enable = true;
flat.enable = true;
};
extraOptions = {
flat = {
port = 25567;
mapPort = 8101;
voicePort = 24455;
whitelist = {
masterodie = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30";
Rooomi = "5c5b4a28-e292-46fa-bf92-3b21f577c30e";
};
};
vanilla-plus = {
port = 25566;
mapPort = 8100;
voicePort = 24454;
whitelist = {
masterodie = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30";
Rooomi = "5c5b4a28-e292-46fa-bf92-3b21f577c30e";
};
};
};
};
}
/*
{ pkgs, lib, config, inputs, ... }: with lib; {
imports = [
inputs.nix-minecraft.nixosModules.minecraft-servers
];
nixpkgs.overlays = [
inputs.nix-minecraft.overlays.default
];
services.minecraft-servers = mkIf config.services.minecraft-servers.enable {
eula = true;
servers = {
default = {
enable = true;
package = pkgs.fabricServers.fabric-1_21_3.override { jre_headless = pkgs.jdk23_headless; };
jvmOpts = "-Xms4092M -Xmx4092M -XX:+UseG1GC";
serverProperties = {
difficulty = "hard";
gamemode = "survival";
max-players = 10;
motd = "NixOS Minecraft server!";
white-list = true;
};
whitelist = {
masterodie = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30";
Rooomi = "5c5b4a28-e292-46fa-bf92-3b21f577c30e";
};
symlinks = {
## Api Extensions
# Fabric API https://modrinth.com/mod/fabric-api
"mods/fabric-api.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/kwP1bhmH/fabric-api-0.108.0%2B1.21.3.jar";
sha512 = "sha512-EGHf/3Iamg/MaXzQAsf3qyT+tH6WbdldhQJ4mNbcVH+cclvVZcWSnFRL3662MLUHP0vzwb+Tuqm78LDv9FquJw==";
};
# Cloth Config https://modrinth.com/mod/cloth-config
"mods/cloth-config.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/9s6osm5g/versions/JbVSQUVw/cloth-config-16.0.141-fabric.jar";
sha512 = "sha512-+LD6Fv6AqLeKBZ6/HPNm1lEysd0YMNi2iez8cxaWUU4rPdc5A/uzfQpfPYU6pSGCe/ftb7XZ2yRcav1/+54mhw==";
};
# Fabric Language Kotlin https://modrinth.com/mod/fabric-language-kotlin
"mods/fabric-language-kotlin.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/Ha28R6CL/versions/B0fZidZi/fabric-language-kotlin-1.12.3%2Bkotlin.2.0.21.jar";
sha512 = "sha512-qSeMCjKkkGmJ//F0Ma1cwT++2VqZoVu44QukJ3FOKOtIKPd5r/tOgHMdmKsU8j5NdZ6iCQvgWhDakIYIE55n5w==";
};
# Performance
# Ferrite Core https://modrinth.com/mod/ferrite-core/
"mods/ferritecore.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/uXXizFIs/versions/a3QXXGz2/ferritecore-7.1.0-hotfix-fabric.jar";
sha512 = "sha512-rhqzC+tZOGQ88q57giB2nyyRfj9UQeRum8kAKVNIwKVBoyXDC438OAOSBWINhywngJrNxnQTUfCOTI7cNq4rzA==";
};
"mods/moonrise.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/KOHu7RCS/versions/S7ZBVFid/Moonrise-Fabric-0.2.0-beta.3%2Bbad5cae.jar";
sha512 = "sha512-hIMd4/QCvS9p+6EylBIGT0h1cVJ/u0GCxFQz66PXFu9SwFfU8un3lIIaxRR9uud071yDd29ON2/BC6PYABXP3g==";
};
# Lithium https://modrinth.com/mod/lithium/
"mods/lithium.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/2Ea7RMWZ/lithium-fabric-0.14.1-snapshot%2Bmc1.21.3-build.89.jar";
sha512 = "sha512-0SKyOlIMslc8LqupVWwHhGrl8vjumqvfXc6RQzTkQCeic8jPLvIkP+A8+GqIWOqy3cwkfZVmHe5AzXg89ESu/w==";
};
/*
# Krypton https://modrinth.com/mod/krypton
"mods/krypton.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/fQEb0iXm/versions/Acz3ttTp/krypton-0.2.8.jar";
sha512 = "sha512-X4z5bHm/1NiT8dcNpYLmICa+02r0mn+nseAPtu+yjZrWoe7BRwIElrT+OGk9M/5r/NHuu9k0dWEu5EKQwkg3hA==";
};
# Noisium https://modrinth.com/mod/noisium
"mods/noisium.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/KuNKN7d2/versions/M4c8aGZ4/noisium-fabric-2.4.0%2Bmc1.21.2-1.21.3.jar";
sha512 = "sha512-zASbN/znPqTRK0J1Ogq+zI8pEEuws5fjt5+rL2yVd5So5wTDOdh3ieMhfQNx4xxJ1x7/XKMdGgQuW1q4aayoRA==";
};
#ViaVersion
"mods/vaifabric.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/YlKdE5VK/versions/CQ7NwggR/ViaFabric-0.4.16%2B88-main.jar";
sha512 = "sha512-kxfAa/tP6cRd3Fx+fscoQwI/qZwxbRO+/uuS/94MQwPnSUCBrjOmY/jnDsY4GH/a4blPWHHVIUYGwtS29rC0Qw==";
};
# Voice Chat
"mods/voicechat.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/9eGKb6K1/versions/4qhHM0lS/voicechat-fabric-1.21.3-2.5.25.jar";
sha512 = "sha512-27XVOZ9/VUVCGFXBYKUWoxL7KqZLxJeO0sA9bbp1leOmIiYePU8kmhK7PfmpZncbCdXsuOIHLjsXu65wS8g7mA==";
};
# Map
"mods/bluemap.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/swbUV1cr/versions/Ysj3eVYx/bluemap-5.4-fabric.jar";
sha512 = "sha512-U0vKpejJHvpgWt544QJvxgicbLQN6/0aLkkR6I0/mgZ4pDcdiLQER51ZsKjDXKMn2b5Ad+SezZKQgU6ZQMGC/A==";
};
"mods/jade.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/nvQzSEkH/versions/pGE7hUKk/Jade-1.21.3-Fabric-16.0.4.jar";
sha512 = "sha512-9THM74NBealcS4RoR+2onN1aaYiQ8C3pHL6MrOcmFGlTw9u+q9VtSqYq/GQeRNRSmwY3WeC8wVLCDbwA25NRnw==";
};
"mods/worldedit.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/1u6JkXh5/versions/HFvwhOTG/worldedit-mod-7.3.9-beta-01-dist.jar";
sha512 = "sha512-SXqIS65rgIRgpgbdL47y0SasAWvESMbUSINUg6eJGdOPLRmOHmimS4ixpMRfDE9hdYxlUcOgsz7nFNCjhnO+0Q==";
};
# Permission ?
"mods/luckperms.jar" = pkgs.fetchurl {
url = "https://download.luckperms.net/1561/fabric/LuckPerms-Fabric-5.4.146.jar";
sha512 = "sha512-oA+/IbgyeVur/FPCdcAi3rmtmOokCp1K94GjwEA5/EgSwpLky0pJ13TAtSY7ZhzgqUGIULo8UnrPKgJcHR2bsg==";
};
"mods/luckperms-placeholderapi.jar" = pkgs.fetchurl {
url = "https://ci.lucko.me/job/LuckPermsPlaceholders/12/artifact/fabric-placeholderapi/build/libs/LuckPerms-Fabric-PlaceholderAPI-Hook.jar";
sha512 = "sha512-yQIeNOfk0Ze2OEg5RyDK3xWTMyx9AmyKX6Kz7n+mwM4L0oOnRJXRyHqF/rRBzwPny3aNhhGxMPzpSPgc+3A5yg==";
};
"mods/text-placeholder-api.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/eXts2L7r/versions/ZGVganES/placeholder-api-2.5.0%2B1.21.2.jar";
sha512 = "sha512-yJ6MOZkPq3sSrUVG2K6Ghb1o3aDJPPS+c6teIGqJ+d5W+8wAtXPHXKY+2A5b/0S0Com2qTLpckSM2/ZQ98dGRQ==";
};
"mods/permissions-api.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/lzVo0Dll/versions/nu0wDgUF/fabric-permissions-api-0.3.3.jar";
sha512 = "sha512-drOsBNlEDhOkkxwPY9F09EiUIbjt4EthuKM20iTECmaQyliy4NlpldeIdJlkeaw2q0oOoGaZH/ugfWAwyvcQXw==";
};
"mods/minecraft-permissions.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/fdZkP5Bb/versions/7awQNHzw/vanilla-permissions-0.2.4%2B1.21.3.jar";
sha512 = "sha512-bxgsP5dvs6XppUIJS8D896EgqlWjLlsO18FiA0okKH6h27XlE4xK9BwoSQC0oF2sprmYwtjJc+MxiIeYMtz/VQ==";
};
"mods/styled-chat.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/doqSKB0e/versions/5jN44RUy/styled-chat-2.7.0%2B1.21.2.jar";
sha512 = "sha512-/4rKdXmcQpaeZH6kpPIo7kot+gIu0BvuN71Bac79rUc92RUJI99OexBacDTJ5bgKRQWvAn3wmcHIk8phUHBieg==";
};
"mods/styled-player-list.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/DQIfKUHf/versions/gyvLcVPF/styledplayerlist-3.6.0%2B1.21.2.jar";
sha512 = "sha512-qjwYZG0LNPVq4KPuJL+7YCbwxs6ZIXWGzqAqUhiUb8Rn193TiWDdJOezkq0FEfMLhcvu5XwA/k6LuIUPPVZY3A==";
};
"mods/datapack-loader.jar" = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/gEUERjxK/versions/Du7xlu89/data-loader-1.1.6%2B1.21.jar";
sha512 = "sha512-yc0Jy5UyXPJA1U4o9bojnxaQHFR9hyA+LAIPPHwWl5JpVcIBZ9U8DBr5G8xFvn3NqU84qMI+b0BpCyT+rOAg8w==";
};
"mods/syncmatica.jar" = pkgs.fetchurl {
url = "https://github.com/sakura-ryoko/syncmatica/releases/download/1.21.3-sakura.10/syncmatica-fabric-1.21.3-0.3.12-sakura.10.jar";
sha512 = "sha512-f6/rIWQxnM57RBiwlVMyd9UQ7DDv/40idfHwOIkgh7pgdDJL5sZ6US7WF1aikqw2+2ZJw8HcVODF4rE8cPCn+A==";
};
};
files = {
"config/styled-chat.json" = pkgs.writeText "styled-chat.json" (builtins.readFile ./config/styled-chat.json);
"config/styledplayerlist/config.json" = pkgs.writeText "config.json" (builtins.readFile ./config/styledplayerlist/config.json);
"config/styledplayerlist/styles/default.json" = pkgs.writeText "default.json" (builtins.readFile ./config/styledplayerlist/styles/default.json);
"config/voicechat/voicechat-server.properties" = pkgs.writeText "voicechat-server.properties" (builtins.readFile ./config/voicechat/voicechat-server.properties);
"config/ferritecore.mixin.properties" = pkgs.writeText "ferritecore.mixin.properties" (builtins.readFile ./config/ferritecore.mixin.properties);
"config/moonlight.yml" = pkgs.writeText "moonlight.yml" (builtins.readFile ./config/moonlight.yml);
"config/worldedit/worldedit.properties" = pkgs.writeText "worldedit.properties" (builtins.readFile ./config/worldedit/worldedit.properties);
};
};
};
};
}
*/

View File

@ -1,4 +1,4 @@
{ inputs, pkgs, ... }: {
{ pkgs, ... }: {
imports = [
./cmp.nix
./codeium.nix
@ -34,7 +34,6 @@
web-devicons.enable = true;
lazygit.enable = true;
nvim-colorizer.enable = true;
headlines.enable = true;
cmake-tools = {
enable = true;
@ -47,6 +46,5 @@
extraPlugins = with pkgs.vimPlugins;
[
vim-nftables
(pkgs.vimUtils.buildVimPlugin {name= "mcfunction"; src = inputs.vim-mcfunction; })
];
}

View File

@ -5,7 +5,8 @@
"core.defaults" = lib.nixvim.emptyTable;
"core.dirman" = {
config = {
inherit (vars.neorg) workspaces;
inherit (vars.notes) workspaces;
default_workspace = "general";
};
};
"core.concealer" = {
@ -59,14 +60,6 @@
desc = "[neorg] Index";
};
}
{
key = "<leader>nl";
action = ":Telescope neorg switch-workspace<CR>";
options = {
silent = true;
desc = "[neorg] Switch workspace";
};
}
{
key = "<localleader>nt";
action = ":Neorg toc<CR>";

View File

@ -1,7 +1,6 @@
{
plugins.noice = {
enable = true;
settings = {
cmdline = {
view = "cmdline";
format = {
@ -28,7 +27,7 @@
lang = "bash";
};
lua = {
pattern = [ "^:%s*lua%s+" "^:%s*lua%s*=%s*" "^:%s*=%s*" ];
pattern = ["^:%s*lua%s+" "^:%s*lua%s*=%s*" "^:%s*=%s*"];
icon = "";
lang = "lua";
};
@ -36,7 +35,7 @@
pattern = "^:%s*he?l?p?%s+";
icon = "";
};
input = { };
input = {};
};
};
lsp = {
@ -68,12 +67,11 @@
style = "none";
padding = [ 0 0 ];
};
filter_options = { };
filter_options = {};
win_options = {
winhighlight = "NormalFloat:NormalFloat,FloatBorder:FloatBorder";
};
};
};
};
};
}

View File

@ -7,7 +7,6 @@
outputs.nixosModules.base
outputs.nixosModules.wsl
outputs.nixosModules.server
outputs.nixosModules.games
];
wsl.enable = true;
@ -31,7 +30,6 @@
searx = {
enable = true;
};
minecraft-servers.enable = true;
};
system.stateVersion = "23.11";