summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomuus <tomasz1.mrozinski@proton.me>2025-12-13 15:07:21 +0100
committerTomuus <tomasz1.mrozinski@proton.me>2025-12-13 15:07:21 +0100
commit7ab0ec6f2c49694a429ff539d39a4342b43f5d7d (patch)
tree342a07d9684eeddc7b24c84699e48e11f93ef097
parentc1839d2ca32f0d3e1cdd6883f3ff807972f0eb53 (diff)
More eval errors incoming
Damn the multi config flake will kill me We'll deal with that later
-rw-r--r--home/configs/default.nix6
-rw-r--r--home/configs/tips1
-rw-r--r--home/default.nix2
-rw-r--r--hosts/Makbuk/configuration.nix8
-rw-r--r--hosts/Makbuk/packages.nix7
-rw-r--r--hosts/common/default.nix4
-rw-r--r--hosts/common/tips22
-rw-r--r--hosts/common/zsh.nix (renamed from home/nix-managed/zsh.nix)4
-rw-r--r--modules/hyprland/catppuccin/config/default.nix7
-rw-r--r--modules/hyprland/catppuccin/config/fastfetch.jsonc (renamed from home/configs/fastfetch/config.jsonc)0
-rw-r--r--modules/hyprland/catppuccin/config/omp.json (renamed from home/configs/omp/catppuccin_mocha.json)0
11 files changed, 51 insertions, 10 deletions
diff --git a/home/configs/default.nix b/home/configs/default.nix
index a6553ef..a984e8d 100644
--- a/home/configs/default.nix
+++ b/home/configs/default.nix
@@ -4,7 +4,7 @@
{ ... }:
{
- home.file.".config/fastfetch".source = ./fastfetch;
- home.file.".config/omp".source = ./omp;
- home.file.".tips".source = ./tips;
+# home.file.".config/fastfetch".source = ./fastfetch;
+# home.file.".config/omp".source = ./omp;
+# home.file.".tips".source = ./tips;
}
diff --git a/home/configs/tips b/home/configs/tips
index 46ce4de..6fcd46d 100644
--- a/home/configs/tips
+++ b/home/configs/tips
@@ -20,3 +20,4 @@ nixos-rebuild switch
Go to settings to activate Linux
100% Vibe coded
Now on Apple Silicon
+Just recompile the kernel!
diff --git a/home/default.nix b/home/default.nix
index 82da454..e5fe08a 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -5,7 +5,7 @@
{
imports = [
- ./nix-managed
+# ./nix-managed
./configs
];
diff --git a/hosts/Makbuk/configuration.nix b/hosts/Makbuk/configuration.nix
index 9bac009..2291ab5 100644
--- a/hosts/Makbuk/configuration.nix
+++ b/hosts/Makbuk/configuration.nix
@@ -3,6 +3,8 @@
{ mods, ... }:
{
+ boot.binfmt.emulatedSystems = [ "i686-linux" ];
+
imports = [
./hardware-configuration.nix
./apple-silicon-support
@@ -10,12 +12,12 @@
# ./cal.nix
./../common
# ./tata.nix
- "${mods}/sddm.nix"
+# "${mods}/sddm.nix"
"${mods}/minecraft.nix"
"${mods}/hyprland/new"
"${mods}/cpp.nix"
- "${mods}/cosmic.nix"
- "${mods}/plasma6.nix"
+# "${mods}/cosmic.nix"
+# "${mods}/plasma6.nix"
"${mods}/neovim"
"${mods}/aarch.nix"
"${mods}/tailscale.nix"
diff --git a/hosts/Makbuk/packages.nix b/hosts/Makbuk/packages.nix
index 6f1afa2..db58318 100644
--- a/hosts/Makbuk/packages.nix
+++ b/hosts/Makbuk/packages.nix
@@ -5,8 +5,13 @@
environment.systemPackages = with pkgs; [
apfs-fuse
- steam
+# steam
qemu
edk2
+ retroarch-full
+ asahi-audio
+ spotify-qt
];
+
+# services.spotifyd.enable = true;
}
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index acab1ab..e608134 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ userName, ... }:
{
imports = [
@@ -7,4 +7,6 @@
./system-properties.nix
./user.nix
];
+
+ home-manager.users.${userName} = import ./zsh.nix;
}
diff --git a/hosts/common/tips b/hosts/common/tips
new file mode 100644
index 0000000..46ce4de
--- /dev/null
+++ b/hosts/common/tips
@@ -0,0 +1,22 @@
+git add .env && git commit -m "oops"
+Moooooo
+I use Nixos btw
+sudo rm -rf /
+sudo chmod -x /bin/bash
+HelloWorld("print");
+Judging MacOS users
+Don't use Ubuntu
+git push --force
+Hey copilot use this pc for me
+How to exit Vim?
+Remember to read the Linux bible
+It's just better
+Don't play league
+Does it work on Windows?
+ChromeOS it da best
+Go to sleep
+Are you hacking the FBI?
+nixos-rebuild switch
+Go to settings to activate Linux
+100% Vibe coded
+Now on Apple Silicon
diff --git a/home/nix-managed/zsh.nix b/hosts/common/zsh.nix
index 4caf4ab..8722c9b 100644
--- a/home/nix-managed/zsh.nix
+++ b/hosts/common/zsh.nix
@@ -21,7 +21,9 @@
};
initContent = ''
shuf -n 1 ~/.tips | cowsay
- eval "$(oh-my-posh init zsh --config ~/.config/omp/catppuccin_mocha.json)"
+ #eval "$(oh-my-posh init zsh --config ~/.config/omp/catppuccin_mocha.json)"
'';
};
+
+ home.file.".tips".source = ./tips;
}
diff --git a/modules/hyprland/catppuccin/config/default.nix b/modules/hyprland/catppuccin/config/default.nix
index a666126..91297f6 100644
--- a/modules/hyprland/catppuccin/config/default.nix
+++ b/modules/hyprland/catppuccin/config/default.nix
@@ -12,4 +12,11 @@
home.file.".config/waybar".source = ./waybar;
home.file.".config/kitty".source = ./kitty;
home.file.".config/rofi".source = ./rofi;
+
+ home.file.".config/fastfetch/config.jsonc".source = ./fastfetch.jsonc;
+ home.file.".config/omp/catppuccin_mocha".source = ./omp.json;
+
+ programs.zsh.initContent = ''
+ eval "$(oh-my-posh init zsh --config ~/.config/omp/catppuccin_mocha.json)"
+ '';
}
diff --git a/home/configs/fastfetch/config.jsonc b/modules/hyprland/catppuccin/config/fastfetch.jsonc
index 85e169f..85e169f 100644
--- a/home/configs/fastfetch/config.jsonc
+++ b/modules/hyprland/catppuccin/config/fastfetch.jsonc
diff --git a/home/configs/omp/catppuccin_mocha.json b/modules/hyprland/catppuccin/config/omp.json
index a744979..a744979 100644
--- a/home/configs/omp/catppuccin_mocha.json
+++ b/modules/hyprland/catppuccin/config/omp.json