hi

37 files changed, 54 insertions, 43 deletions

diff --git a/home/ebisu/fortune/communication/discord/default.nix b/home/ebisu/fortune/communication/discord/default.nix
index 5e8f79d..239a89e 100644
--- a/home/ebisu/fortune/communication/discord/default.nix
+++ b/home/ebisu/fortune/communication/discord/default.nix
@@ -1,6 +1,7 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   imports = [
-    ./vesktop
+    ./vesktop.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/home/ebisu/fortune/communication/discord/vesktop/default.nix b/home/ebisu/fortune/communication/discord/vesktop.nix
index 7d35c84..7d35c84 100644
--- a/home/ebisu/fortune/communication/discord/vesktop/default.nix
+++ b/home/ebisu/fortune/communication/discord/vesktop.nix
diff --git a/home/ebisu/fortune/desktop/agnostic/default.nix b/home/ebisu/fortune/desktop/agnostic.nix
index 4531cc4..4531cc4 100644
--- a/home/ebisu/fortune/desktop/agnostic/default.nix
+++ b/home/ebisu/fortune/desktop/agnostic.nix
diff --git a/home/ebisu/fortune/desktop/default.nix b/home/ebisu/fortune/desktop/default.nix
index 061a773..3ea8654 100644
--- a/home/ebisu/fortune/desktop/default.nix
+++ b/home/ebisu/fortune/desktop/default.nix
@@ -1,8 +1,8 @@
 { ... }:
 {
   imports = [
-    ./agnostic
     ./wayland
-    # ./xorg
+    ./agnostic.nix
+    # ./xorg.nix
   ];
 }
diff --git a/home/ebisu/fortune/desktop/xorg/default.nix b/home/ebisu/fortune/desktop/xorg.nix
index 801a736..801a736 100644
--- a/home/ebisu/fortune/desktop/xorg/default.nix
+++ b/home/ebisu/fortune/desktop/xorg.nix
diff --git a/home/ebisu/fortune/education/calculator/default.nix b/home/ebisu/fortune/education/calculator.nix
index a8bcc7f..a8bcc7f 100644
--- a/home/ebisu/fortune/education/calculator/default.nix
+++ b/home/ebisu/fortune/education/calculator.nix
diff --git a/home/ebisu/fortune/education/default.nix b/home/ebisu/fortune/education/default.nix
index ccddf02..3ed4b6b 100644
--- a/home/ebisu/fortune/education/default.nix
+++ b/home/ebisu/fortune/education/default.nix
@@ -1,6 +1,7 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   imports = [
-    ./calculator
+    ./calculator.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/home/ebisu/fortune/filesystem/archive/default.nix b/home/ebisu/fortune/filesystem/archive.nix
index f52123b..f52123b 100644
--- a/home/ebisu/fortune/filesystem/archive/default.nix
+++ b/home/ebisu/fortune/filesystem/archive.nix
diff --git a/home/ebisu/fortune/filesystem/default.nix b/home/ebisu/fortune/filesystem/default.nix
index 698084c..303bf73 100644
--- a/home/ebisu/fortune/filesystem/default.nix
+++ b/home/ebisu/fortune/filesystem/default.nix
@@ -1,8 +1,8 @@
 { pkgs, ... }:
 {
   imports = [
-    ./archive
     ./core
+    ./archive.nix
   ];
 
   programs.nnn.enable = true;
diff --git a/home/ebisu/fortune/gaming/default.nix b/home/ebisu/fortune/gaming/default.nix
index e39bec4..bf0d842 100644
--- a/home/ebisu/fortune/gaming/default.nix
+++ b/home/ebisu/fortune/gaming/default.nix
@@ -4,7 +4,7 @@
 
   programs.gamemode = {
     enable = true;
-    enableRenice = true;
+    enableRenice = false;
   };
 
   home.packages = with pkgs; [
diff --git a/home/ebisu/fortune/multimedia/audio/default.nix b/home/ebisu/fortune/multimedia/audio/default.nix
index 7944a63..635d449 100644
--- a/home/ebisu/fortune/multimedia/audio/default.nix
+++ b/home/ebisu/fortune/multimedia/audio/default.nix
@@ -1,7 +1,6 @@
-{ pkgs, ... }: {
-  imports = [
-    ./spotify
-  ];
+{ pkgs, ... }:
+{
+  imports = [ ./spotify.nix ];
 
   home.packages = with pkgs; [
     alsa-plugins
diff --git a/home/ebisu/fortune/multimedia/audio/spotify/default.nix b/home/ebisu/fortune/multimedia/audio/spotify.nix
index 5276e07..ad0b0b4 100644
--- a/home/ebisu/fortune/multimedia/audio/spotify/default.nix
+++ b/home/ebisu/fortune/multimedia/audio/spotify.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   home.packages = with pkgs; [
-    # spotify-edge
     spotify
     spotify-player
     spicetify-cli
diff --git a/home/ebisu/fortune/multimedia/default.nix b/home/ebisu/fortune/multimedia/default.nix
index 86da8c4..97b5ff9 100644
--- a/home/ebisu/fortune/multimedia/default.nix
+++ b/home/ebisu/fortune/multimedia/default.nix
@@ -1,10 +1,11 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   imports = [
     ./audio
     ./browser
-    ./document
-    ./image
     ./video
+    ./document.nix
+    ./image.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/home/ebisu/fortune/multimedia/document/default.nix b/home/ebisu/fortune/multimedia/document.nix
index 8be41e2..8be41e2 100644
--- a/home/ebisu/fortune/multimedia/document/default.nix
+++ b/home/ebisu/fortune/multimedia/document.nix
diff --git a/home/ebisu/fortune/multimedia/image/default.nix b/home/ebisu/fortune/multimedia/image.nix
index 08a5372..4121f63 100644
--- a/home/ebisu/fortune/multimedia/image/default.nix
+++ b/home/ebisu/fortune/multimedia/image.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   home.packages = with pkgs; [
-    (pkgs.callPackage ../../../../../pkgs/ahoviewer.nix { })
+    (pkgs.callPackage ../../../../pkgs/ahoviewer.nix { })
     emulsion
     feh
     imv
@@ -12,6 +12,6 @@
     viewnior
     viu
     optipng
-    (pkgs.callPackage ../../../../../pkgs/chan-downloader.nix { })
+    (pkgs.callPackage ../../../../pkgs/chan-downloader.nix { })
   ];
 }
diff --git a/home/ebisu/fortune/multimedia/video/anime/default.nix b/home/ebisu/fortune/multimedia/video/anime.nix
index 471bb7a..471bb7a 100644
--- a/home/ebisu/fortune/multimedia/video/anime/default.nix
+++ b/home/ebisu/fortune/multimedia/video/anime.nix
diff --git a/home/ebisu/fortune/multimedia/video/default.nix b/home/ebisu/fortune/multimedia/video/default.nix
index 1d5a964..50f2a77 100644
--- a/home/ebisu/fortune/multimedia/video/default.nix
+++ b/home/ebisu/fortune/multimedia/video/default.nix
@@ -1,6 +1,7 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   imports = [
-    ./anime
+    ./anime.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/home/ebisu/fortune/system/bitwarden/default.nix b/home/ebisu/fortune/system/bitwarden.nix
index 2ac188f..2ac188f 100644
--- a/home/ebisu/fortune/system/bitwarden/default.nix
+++ b/home/ebisu/fortune/system/bitwarden.nix
diff --git a/home/ebisu/fortune/system/default.nix b/home/ebisu/fortune/system/default.nix
index fd68070..5e3a43b 100644
--- a/home/ebisu/fortune/system/default.nix
+++ b/home/ebisu/fortune/system/default.nix
@@ -1,13 +1,13 @@
 { pkgs, ... }:
 {
   imports = [
-    ./bitwarden
     ./fonts
-    ./opengl
-    ./peripheral
     ./shell
     ./terminal
     ./virtualisation
+    ./bitwarden.nix
+    ./opengl.nix
+    ./peripheral.nix
     ./tracing.nix
     ./variables.nix
     ./xdg.nix
diff --git a/home/ebisu/fortune/system/opengl/default.nix b/home/ebisu/fortune/system/opengl.nix
index cabb8f9..cabb8f9 100644
--- a/home/ebisu/fortune/system/opengl/default.nix
+++ b/home/ebisu/fortune/system/opengl.nix
diff --git a/home/ebisu/fortune/system/peripheral/default.nix b/home/ebisu/fortune/system/peripheral.nix
index f05379c..f05379c 100644
--- a/home/ebisu/fortune/system/peripheral/default.nix
+++ b/home/ebisu/fortune/system/peripheral.nix
diff --git a/home/ebisu/fortune/system/shell/default.nix b/home/ebisu/fortune/system/shell/default.nix
index 2ee83d1..05e84a7 100644
--- a/home/ebisu/fortune/system/shell/default.nix
+++ b/home/ebisu/fortune/system/shell/default.nix
@@ -1,9 +1,9 @@
 { pkgs, ... }:
 {
   imports = [
-    ./fish
-    ./starship
     ./scripting
+    ./fish.nix
+    ./starship.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/home/ebisu/fortune/system/shell/fish/default.nix b/home/ebisu/fortune/system/shell/fish.nix
index d58b065..d58b065 100644
--- a/home/ebisu/fortune/system/shell/fish/default.nix
+++ b/home/ebisu/fortune/system/shell/fish.nix
diff --git a/home/ebisu/fortune/system/shell/scripting/charmbracelet/default.nix b/home/ebisu/fortune/system/shell/scripting/charmbracelet.nix
index e3b78df..e3b78df 100644
--- a/home/ebisu/fortune/system/shell/scripting/charmbracelet/default.nix
+++ b/home/ebisu/fortune/system/shell/scripting/charmbracelet.nix
diff --git a/home/ebisu/fortune/system/shell/scripting/default.nix b/home/ebisu/fortune/system/shell/scripting/default.nix
index 2fe33df..02ce752 100644
--- a/home/ebisu/fortune/system/shell/scripting/default.nix
+++ b/home/ebisu/fortune/system/shell/scripting/default.nix
@@ -1,7 +1,8 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   imports = [
-    ./charmbracelet
-    ./ripgrep
+    ./charmbracelet.nix
+    ./ripgrep.nix
   ];
 
   programs.fzf.enable = true;
diff --git a/home/ebisu/fortune/system/shell/scripting/ripgrep/default.nix b/home/ebisu/fortune/system/shell/scripting/ripgrep.nix
index 00de07f..00de07f 100644
--- a/home/ebisu/fortune/system/shell/scripting/ripgrep/default.nix
+++ b/home/ebisu/fortune/system/shell/scripting/ripgrep.nix
diff --git a/home/ebisu/fortune/system/shell/starship/default.nix b/home/ebisu/fortune/system/shell/starship.nix
index 0088038..0088038 100644
--- a/home/ebisu/fortune/system/shell/starship/default.nix
+++ b/home/ebisu/fortune/system/shell/starship.nix
diff --git a/home/ebisu/fortune/system/terminal/default.nix b/home/ebisu/fortune/system/terminal/default.nix
index 6375e0a..6cd5378 100644
--- a/home/ebisu/fortune/system/terminal/default.nix
+++ b/home/ebisu/fortune/system/terminal/default.nix
@@ -1,7 +1,8 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   imports = [
-    ./kitty
-    ./foot
+    ./kitty.nix
+    ./foot.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/home/ebisu/fortune/system/terminal/foot/default.nix b/home/ebisu/fortune/system/terminal/foot.nix
index ed0820b..ed0820b 100644
--- a/home/ebisu/fortune/system/terminal/foot/default.nix
+++ b/home/ebisu/fortune/system/terminal/foot.nix
diff --git a/home/ebisu/fortune/system/terminal/kitty/default.nix b/home/ebisu/fortune/system/terminal/kitty.nix
index 4346e8d..4346e8d 100644
--- a/home/ebisu/fortune/system/terminal/kitty/default.nix
+++ b/home/ebisu/fortune/system/terminal/kitty.nix
diff --git a/home/ebisu/fortune/system/virtualisation/default.nix b/home/ebisu/fortune/system/virtualisation/default.nix
index 85e082f..3352886 100644
--- a/home/ebisu/fortune/system/virtualisation/default.nix
+++ b/home/ebisu/fortune/system/virtualisation/default.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 {
-  imports = [ ./docker ];
+  imports = [ ./docker.nix ];
 
   home.packages = with pkgs; [
     bottles
diff --git a/home/ebisu/fortune/system/virtualisation/docker/default.nix b/home/ebisu/fortune/system/virtualisation/docker.nix
index 4d395ff..4d395ff 100644
--- a/home/ebisu/fortune/system/virtualisation/docker/default.nix
+++ b/home/ebisu/fortune/system/virtualisation/docker.nix
diff --git a/home/ebisu/fortune/utility/ai/default.nix b/home/ebisu/fortune/utility/ai.nix
index 2ac248a..37b4e4d 100644
--- a/home/ebisu/fortune/utility/ai/default.nix
+++ b/home/ebisu/fortune/utility/ai.nix
@@ -4,9 +4,4 @@
     ollama-cuda
     shell-gpt
   ];
-
-  # services.ollama = {
-  #   enable = true;
-  #   acceleration = "cuda";
-  # };
 }
diff --git a/home/ebisu/fortune/utility/default.nix b/home/ebisu/fortune/utility/default.nix
index 4c5da73..adcd443 100644
--- a/home/ebisu/fortune/utility/default.nix
+++ b/home/ebisu/fortune/utility/default.nix
@@ -1,7 +1,6 @@
-{ pkgs, ... }: {
-  imports = [
-    ./ai
-  ];
+{ pkgs, ... }:
+{
+  imports = [ ./ai.nix ];
 
   home.packages = with pkgs; [
     fontpreview
diff --git a/modules/default.nix b/modules/default.nix
index 1f34456..22b7854 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -8,13 +8,13 @@
     ./datetime.nix
     ./networking.nix
     ./nix.nix
+    ./nixpkgs.nix
     ./security.nix
     ./users.nix
     ./virtualisation.nix
     ./xdg-portal.nix
   ];
 
-  nixpkgs.config.allowUnfree = true;
   location.provider = "geoclue2";
   system.autoUpgrade.enable = false;
 }
diff --git a/modules/nixpkgs.nix b/modules/nixpkgs.nix
new file mode 100644
index 0000000..206983c
--- /dev/null
+++ b/modules/nixpkgs.nix
@@ -0,0 +1,6 @@
+{
+  nixpkgs.config = {
+    cudaSupport = true;
+    allowUnfree = true;
+  };
+}
diff --git a/modules/services/ollama.nix b/modules/services/ollama.nix
new file mode 100644
index 0000000..2638d12
--- /dev/null
+++ b/modules/services/ollama.nix
@@ -0,0 +1,6 @@
+{
+  services.ollama = {
+    enable = false;
+    acceleration = "cuda";
+  };
+}