summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomuus <tomasz1.mrozinski@proton.me>2026-01-14 15:31:44 +0100
committerTomuus <tomasz1.mrozinski@proton.me>2026-01-14 15:31:44 +0100
commit30194152310f8cf8cc2d20733ce77eb6937a0d5c (patch)
treeeffee0e73c3ca9deb62d371c0365412cdff91e64
parent42b04e12dad92eb166897e0e0df8e877a19f7c09 (diff)
The long awaited config cleaning came
Yeah this config was an absolute mess for the past month or two I'll trim flake.nix from old configs in a moment I just removed the entire home/ directory as its no longer needed And i gotta fix all the evel errors
-rw-r--r--flake.nix2
-rw-r--r--home/configs/default.nix10
-rw-r--r--home/configs/tips23
-rw-r--r--home/nix-managed/default.nix10
-rw-r--r--home/nix-managed/nvf.nix40
-rw-r--r--hosts/Makbuk/configuration.nix17
-rw-r--r--hosts/Makbuk/packages.nix17
-rw-r--r--hosts/common/default.nix4
-rw-r--r--hosts/common/hm.nix (renamed from home/default.nix)9
9 files changed, 33 insertions, 99 deletions
diff --git a/flake.nix b/flake.nix
index 46d28ac..151a236 100644
--- a/flake.nix
+++ b/flake.nix
@@ -93,7 +93,7 @@
modules = [
./hosts/Makbuk/configuration.nix
#nvf.nixosModules.default
- home-manager.nixosModules.home-manager { home-manager.users.${userName} = import ./home { inherit userName fullName; }; } #If it works DON'T TOUCH IT
+ home-manager.nixosModules.home-manager #If it works DON'T TOUCH IT
{
#environment.systemPackages = [
# self.packages.${system}.nvf
diff --git a/home/configs/default.nix b/home/configs/default.nix
deleted file mode 100644
index a984e8d..0000000
--- a/home/configs/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-#./home/configs/default.nix
-#File for importing configs not managed with nix
-
-{ ... }:
-
-{
-# 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
deleted file mode 100644
index 6fcd46d..0000000
--- a/home/configs/tips
+++ /dev/null
@@ -1,23 +0,0 @@
-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
-Just recompile the kernel!
diff --git a/home/nix-managed/default.nix b/home/nix-managed/default.nix
deleted file mode 100644
index fbb8aab..0000000
--- a/home/nix-managed/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-#./home/nix-managed/default.nix
-#Just importing configs managed with nix
-
-{ ... }:
-
-{
- imports = [
- ./zsh.nix
- ];
-}
diff --git a/home/nix-managed/nvf.nix b/home/nix-managed/nvf.nix
deleted file mode 100644
index b093cd5..0000000
--- a/home/nix-managed/nvf.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ ... }:
-
-{
- vim = {
- theme = {
- enable = true;
- name = "catppuccin";
- style = "mocha";
- };
-
- options = {
- number = true;
- relativenumber = false;
- shiftwidth = 2;
- tabstop = 2;
- softtabstop = 2;
- };
- filetree = {
- nvimTree = {
- setupOpts = {
- view = {
- number = false;
- relativenumber = false;
- };
- };
- };
- };
- lsp.enable = true;
- autocomplete.nvim-cmp.enable = true;
- languages = {
-
-# clang.enable = true;
- nix.enable = true;
- rust.enable = true;
- };
-
- autopairs.nvim-autopairs.enable = true;
- };
-}
-
diff --git a/hosts/Makbuk/configuration.nix b/hosts/Makbuk/configuration.nix
index 2291ab5..6c94f2b 100644
--- a/hosts/Makbuk/configuration.nix
+++ b/hosts/Makbuk/configuration.nix
@@ -3,25 +3,27 @@
{ mods, ... }:
{
- boot.binfmt.emulatedSystems = [ "i686-linux" ];
+ programs.fuse.enable = true;
+
+ boot.binfmt.emulatedSystems = [ "i686-linux" "x86_64-linux" ];
+ boot.binfmt.addEmulatedSystemsToNixSandbox = true;
imports = [
./hardware-configuration.nix
./apple-silicon-support
./packages.nix
-# ./cal.nix
./../common
-# ./tata.nix
# "${mods}/sddm.nix"
"${mods}/minecraft.nix"
"${mods}/hyprland/new"
- "${mods}/cpp.nix"
# "${mods}/cosmic.nix"
+ "${mods}/cpp.nix"
+ "${mods}/rust.nix"
# "${mods}/plasma6.nix"
"${mods}/neovim"
"${mods}/aarch.nix"
"${mods}/tailscale.nix"
-# "${mods}/bluetooth.nix"
+ "${mods}/bluetooth.nix"
];
networking.hostName = "Makbuk";
@@ -29,7 +31,10 @@
enable = true;
settings.General.EndableNetworkConfiguration = true;
};
- nixpkgs.config.allowUnsupportedSystem = true;
+
+ virtualisation.docker.enable = true;
+
+ nixpkgs.config.allowUnsupportedSystem = true;
boot.kernelParams = [ "hid_apple.fnmode=2" "apple_dcp.show_notch=1" "hid_apple.swap_opt_cmd=2" ];
hardware.asahi.peripheralFirmwareDirectory = ./firmware;
}
diff --git a/hosts/Makbuk/packages.nix b/hosts/Makbuk/packages.nix
index db58318..f8b4fda 100644
--- a/hosts/Makbuk/packages.nix
+++ b/hosts/Makbuk/packages.nix
@@ -3,15 +3,28 @@
{
nixpkgs.config.allowUnsupportedSystem = true;
+ services.upower.enable = true;
+
environment.systemPackages = with pkgs; [
apfs-fuse
-# steam
qemu
edk2
retroarch-full
asahi-audio
spotify-qt
+ superTuxKart
+ vlc
+ ifuse
+ libimobiledevice
+ usbutils
+ kdePackages.ark
+ squashfuse
+ squashfsTools
+# steam
+ gnumake
+ gperf
+
];
-# services.spotifyd.enable = true;
+ services.usbmuxd.enable = true;
}
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index e608134..efc638e 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -1,4 +1,4 @@
-{ userName, ... }:
+{ userName, fullName, ... }:
{
imports = [
@@ -8,5 +8,5 @@
./user.nix
];
- home-manager.users.${userName} = import ./zsh.nix;
+ home-manager.users.${userName} = import ./hm.nix { inherit userName fullName; };
}
diff --git a/home/default.nix b/hosts/common/hm.nix
index e5fe08a..f0c5379 100644
--- a/home/default.nix
+++ b/hosts/common/hm.nix
@@ -4,11 +4,10 @@
{ userName, ... }:
{
- imports = [
-# ./nix-managed
- ./configs
- ];
-
+ imports = [
+ ./zsh.nix
+ ];
+
home.username = userName;
home.homeDirectory = "/home/${userName}";