feat: changed some stuff

This commit is contained in:
Nick 2025-01-20 23:33:35 -06:00
parent 376c1d7b18
commit c67e864d40
145 changed files with 143 additions and 70 deletions

90
flake.lock generated
View file

@ -161,11 +161,11 @@
},
"crane_3": {
"locked": {
"lastModified": 1734324364,
"narHash": "sha256-omYTR59TdH0AumP1cfh49fBnWZ52HjfdNfaLzCMZBx0=",
"lastModified": 1736898272,
"narHash": "sha256-D10wlrU/HCpSRcb3a7yk+bU3ggpMD1kGbseKtO+7teo=",
"owner": "ipetkov",
"repo": "crane",
"rev": "60d7623f1320470bf2fdb92fd2dca1e9a27b98ce",
"rev": "6a589f034202a7c6e10bce6c5d1d392d7bc0f340",
"type": "github"
},
"original": {
@ -661,11 +661,11 @@
"zig": "zig"
},
"locked": {
"lastModified": 1737085478,
"narHash": "sha256-EzdUQf1ljtGIWMmscVzoW3rUxxN3UKyNXOXbzUvz3BQ=",
"lastModified": 1737430029,
"narHash": "sha256-z55IQogW9z4HhVeT55LlCUFKbYD5O5aLMnU5cX1WTto=",
"owner": "ghostty-org",
"repo": "ghostty",
"rev": "72d085525b22d66468c5969a4d507a0fa68d4a04",
"rev": "5cb2fa6f7594202b12a2603bf32094aa75b1bf0e",
"type": "github"
},
"original": {
@ -836,11 +836,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1737226203,
"narHash": "sha256-maMmVQQzdd92LHiI24NyIF3QblnIUJSESDPpnDThtNU=",
"lastModified": 1737319839,
"narHash": "sha256-wGfX2YcD9Hyqi7sQ8FSqUbN8/Rhftp01YyHoTWYPL8U=",
"owner": "helix-editor",
"repo": "helix",
"rev": "7cc93eb1c554e72a5aa0c18d244c0fd3ec07d97f",
"rev": "e7ac2fcdecfdbf43a4f772e7f7c163b43b3d0b9b",
"type": "github"
},
"original": {
@ -883,11 +883,11 @@
]
},
"locked": {
"lastModified": 1737221749,
"narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=",
"lastModified": 1737394973,
"narHash": "sha256-EW4oXMfnfA5sNM9Jqm+y98horWVvN66Gu7YIcEpFYZc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "97d7946b5e107dd03cc82f21165251d4e0159655",
"rev": "9786661d57c476021c8a0c3e53bf9fa2b4f3328b",
"type": "github"
},
"original": {
@ -1045,11 +1045,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1737197318,
"narHash": "sha256-dzG7PTu2TvBhrVbx5ouFGclQBgfrLobiMH1LWGKSR+I=",
"lastModified": 1737398451,
"narHash": "sha256-k3GQfIFSGC364qxx1WsDaaHfTNN/rt1re8JSyAsBzug=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "f56153a9c1b0a00fac0932a95e0cfa5a4f6c681f",
"rev": "a661203bb6d4714b211572759e2f74b1da194972",
"type": "github"
},
"original": {
@ -1070,11 +1070,11 @@
]
},
"locked": {
"lastModified": 1735774328,
"narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=",
"lastModified": 1737127640,
"narHash": "sha256-mIQ3/axCZ4g8ySwWRbW4fJcyC9v55uAii3cqlJRtW8g=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb",
"rev": "455c055883d9639d4fcbfcedb4c6d12ce313791e",
"type": "github"
},
"original": {
@ -1416,11 +1416,11 @@
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1737250613,
"narHash": "sha256-0QcnnQZ/il9UPVmhJtDqjPDCCcW5vTCz7QaLu+rlrRQ=",
"lastModified": 1737360510,
"narHash": "sha256-uiTiklpgmxZ7BJlQOvqULU9oCOkk9glmSDGSIkerPcc=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "6ec08f11bbf0e936ad82f1bb532f3757f8b5e3c2",
"rev": "cfc19b6d0a0940e600b995827366092405f2bf73",
"type": "github"
},
"original": {
@ -1479,11 +1479,11 @@
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1737165118,
"narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=",
"lastModified": 1737299813,
"narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566",
"rev": "107d5ef05c0b1119749e381451389eded30fb0d5",
"type": "github"
},
"original": {
@ -1566,11 +1566,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1737258869,
"narHash": "sha256-Ue2TumKTw+6VUSKdgHE93gViUTOJDmS2I0HjLbmrHls=",
"lastModified": 1737433096,
"narHash": "sha256-/p0JGjjQcBwglIMqaTB39eYGf+TI9I86XAzouME52YU=",
"owner": "nix-community",
"repo": "NUR",
"rev": "0b2b53ac3bd61384876cf8461d32e698064297ea",
"rev": "6ce0765cd6d8703f4de25493d30ff653f9e60f66",
"type": "github"
},
"original": {
@ -1611,11 +1611,11 @@
]
},
"locked": {
"lastModified": 1737043064,
"narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=",
"lastModified": 1737301351,
"narHash": "sha256-2UNmLCKORvdBRhPGI8Vx0b6l7M8/QBey/nHLIxOl4jE=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "94ee657f6032d913fe0ef49adaa743804635b0bb",
"rev": "15a87cedeb67e3dbc8d2f7b9831990dffcf4e69f",
"type": "github"
},
"original": {
@ -1785,11 +1785,11 @@
]
},
"locked": {
"lastModified": 1734316514,
"narHash": "sha256-0aLx44yMblcOGpfFXKCzp2GhU5JaE6OTvdU+JYrXiUc=",
"lastModified": 1737166965,
"narHash": "sha256-vlDROBAgq+7PEVM0vaS2zboY6DXs3oKK0qW/1dVuFs4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "83ee8ff74d6294a7657320f16814754c4594127b",
"rev": "fc839c9d5d1ebc789b4657c43c4d54838c7c01de",
"type": "github"
},
"original": {
@ -1849,11 +1849,11 @@
]
},
"locked": {
"lastModified": 1737107480,
"narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=",
"lastModified": 1737411508,
"narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6",
"rev": "015d461c16678fc02a2f405eb453abb509d4e1d4",
"type": "github"
},
"original": {
@ -1884,11 +1884,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1737207873,
"narHash": "sha256-XTCuMv753lpm8DvdVf9q2mH3rhlfsKrCUYbaADPC/bA=",
"lastModified": 1737416820,
"narHash": "sha256-PvOXfVj62pYnl2aq8l/hQkgmo22K1qa6n1JILTm4+ng=",
"owner": "danth",
"repo": "stylix",
"rev": "51ad2cec11e773a949bdbec88bed2524f098f49a",
"rev": "268daf22a1f93a00b7efc74c367d6711ca7f18e1",
"type": "github"
},
"original": {
@ -2292,11 +2292,11 @@
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1737214812,
"narHash": "sha256-r46PRML09iEcdh+Oi7xheyQwLE7zSDPvXPhyMQDQhe4=",
"lastModified": 1737370740,
"narHash": "sha256-RKd8w0fZAmwxnpC2k7LRZOk06MbVghygsxgTece+UME=",
"owner": "sxyazi",
"repo": "yazi",
"rev": "0a5c9b61a3bca0ed6c16f8e51a657e6976fcd39d",
"rev": "245fb030df2031a8bc27e61fe3b3fc4f3681fe39",
"type": "github"
},
"original": {
@ -2315,11 +2315,11 @@
"rust-overlay": "rust-overlay_4"
},
"locked": {
"lastModified": 1737239450,
"narHash": "sha256-ckA2nKlqWhQ/E8KXy4939b5uxNdCoof90/X6uFT6M+g=",
"lastModified": 1737426798,
"narHash": "sha256-2q1fPHCBKKm7P/XH2y9H0XVF50nBNDBhtbAqOyvheB0=",
"owner": "zed-industries",
"repo": "zed",
"rev": "ac8220bb2e03a94e8c62022fa0efe9ff9adf1c1c",
"rev": "8f87b5637af4d4e68fbcf0ecfa0b43a03404f638",
"type": "github"
},
"original": {

View file

0
home/modules/cli/android/androidTools/default.nix Normal file → Executable file
View file

0
home/modules/cli/android/default.nix Normal file → Executable file
View file

0
home/modules/cli/android/simpleMtpfs/default.nix Normal file → Executable file
View file

0
home/modules/cli/default.nix Normal file → Executable file
View file

0
home/modules/cli/development/default.nix Normal file → Executable file
View file

0
home/modules/cli/development/editing/default.nix Normal file → Executable file
View file

View file

0
home/modules/cli/development/versioning/default.nix Normal file → Executable file
View file

View file

View file

0
home/modules/cli/files/default.nix Normal file → Executable file
View file

0
home/modules/cli/files/ncdu/default.nix Normal file → Executable file
View file

0
home/modules/cli/files/samba/default.nix Normal file → Executable file
View file

0
home/modules/cli/files/unrar/default.nix Normal file → Executable file
View file

0
home/modules/cli/files/zip/default.nix Normal file → Executable file
View file

0
home/modules/cli/shell/default.nix Normal file → Executable file
View file

0
home/modules/cli/shell/nushell/default.nix Normal file → Executable file
View file

0
home/modules/cli/shell/zellij/default.nix Normal file → Executable file
View file

0
home/modules/cli/shell/zoxide/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/alsaUtils/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/brightnessCtl/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/cifsUtils/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/direnv/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/ffmpeg/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/flac/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/gLib/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/hardInfo/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/homeManager/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/inetUtils/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/libgenCli/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/nyanCat/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/parted/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/pciUtils/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/pinEntry/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/playerCtl/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/protonVpn/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/speedTest/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/sshfs/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/tokei/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/tomb/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/udiskie/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/wget/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/wine/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/xdgUtils/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/xdoTool/default.nix Normal file → Executable file
View file

0
home/modules/cli/utilities/yaBridge/default.nix Normal file → Executable file
View file

0
home/modules/default.nix Normal file → Executable file
View file

0
home/modules/gui/apps/browsers/chrome/default.nix Normal file → Executable file
View file

0
home/modules/gui/apps/browsers/default.nix Normal file → Executable file
View file

0
home/modules/gui/apps/browsers/edge/default.nix Normal file → Executable file
View file

0
home/modules/gui/apps/browsers/epiphany/default.nix Normal file → Executable file
View file

View file

@ -2,6 +2,17 @@
name = "Tools";
toolbar = false;
bookmarks = [
{
name = "Hugging Face";
url = "https://www.huggingface.co";
tags = [
"hugging"
"face"
"ai"
"gguf"
];
keyword = "Hug";
}
{
name = "Uncensored AI";
url = "https://www.aiuncensored.info";

0
home/modules/gui/apps/browsers/ladybird/default.nix Normal file → Executable file
View file

0
home/modules/gui/apps/browsers/opera/default.nix Normal file → Executable file
View file

0
home/modules/gui/apps/browsers/tor/default.nix Normal file → Executable file
View file

0
home/modules/gui/apps/browsers/vivaldi/default.nix Normal file → Executable file
View file

0
home/modules/gui/apps/default.nix Normal file → Executable file
View file

0
home/modules/gui/apps/gaming/default.nix Normal file → Executable file
View file

0
home/modules/gui/apps/gaming/heroic/default.nix Normal file → Executable file
View file

0
home/modules/gui/apps/gaming/lutris/default.nix Normal file → Executable file
View file

0
home/modules/gui/apps/gaming/prismLauncher/default.nix Normal file → Executable file
View file

View file

@ -17,3 +17,5 @@
};
};
}
# If you wanna install Sc2, it takes Proton v8

0
home/modules/gui/apps/ide/default.nix Normal file → Executable file
View file

View file

@ -1,8 +1,35 @@
{
enabled = true;
default_model = {
provider = "zed.dev";
model = "claude-3-5-sonnet-latest";
flake,
...
}:
let
inherit (flake.config.services.instances)
ollama
web
;
service = ollama;
localhost = web.localhost.address0;
in
{
assistant = {
enabled = true;
default_model = {
provider = "zed.dev";
model = "claude-3-5-sonnet-latest";
};
version = "2";
};
assistant1 = {
enabled = true;
default_model = {
provider = "ollama";
model = "qwen2.5-coder:7b";
};
version = "2";
};
language_models = {
ollama = {
api_url = "http://${localhost}:${builtins.toString service.ports.port1}";
};
};
version = "2";
}

View file

@ -6,7 +6,11 @@
}:
let
configPath = ./config;
assistantPath = import (configPath + /assistant);
assistantPath = import (configPath + /assistant) {
inherit
flake
;
};
interfacePath = import (configPath + /interface) {
inherit
@ -30,7 +34,6 @@ let
miscPath = import (configPath + /misc) { inherit lib pkgs; };
in
{
assistant = assistantPath;
git = gitPath;
languages = languagesPath;
lsp = lspPath;
@ -38,5 +41,6 @@ in
experimental.theme_overrides = experimentalPath;
}
// assistantPath
// interfacePath
// miscPath

View file

@ -20,8 +20,8 @@ let
pkgs
;
};
packagePath = flake.inputs.zed-editor.packages.${pkgs.system}.default;
in
# packagePath = flake.inputs.zed-editor.packages.${pkgs.system}.default;
{
programs.zed-editor = {
enable = true;

View file

View file

View file

View file

View file

View file

0
home/modules/gui/apps/media/audio/default.nix Normal file → Executable file
View file

0
home/modules/gui/apps/media/default.nix Normal file → Executable file
View file

0
home/modules/gui/apps/media/doc/default.nix Normal file → Executable file
View file

0
home/modules/gui/apps/media/doc/docEditing/default.nix Normal file → Executable file
View file

View file

View file

View file

View file

0
home/modules/gui/apps/media/doc/docViewing/default.nix Normal file → Executable file
View file

View file

0
home/modules/gui/apps/media/images/default.nix Normal file → Executable file
View file

View file

View file

View file

View file

View file

View file

0
home/modules/gui/apps/media/video/default.nix Normal file → Executable file
View file

View file

View file

Some files were not shown because too many files have changed in this diff Show more