summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomuus <tomasz1.mrozinski@proton.me>2025-12-08 19:40:23 +0100
committerTomuus <tomasz1.mrozinski@proton.me>2025-12-08 19:40:23 +0100
commit020f97ba48ec9f2fc07aa289d83569b518968fb9 (patch)
tree071eb5f4c16531b0322a9ebb90c9ff21685c6d1b
parentb11a14721e3c092606c2900c2f1bd345c6486c34 (diff)
Flattened modules
Yeah the reabuild errors are bouta eat me alive "File not found" I'll deal with that later
-rw-r--r--flake.nix4
-rw-r--r--hosts/Makbuk/configuration.nix4
-rw-r--r--modules/cosmic.nix (renamed from modules/de/cosmic.nix)0
-rw-r--r--modules/cpp.nix (renamed from modules/dev/cpp.nix)0
-rw-r--r--modules/hyprland/catppuccin/config/default.nix (renamed from modules/de/hyprland/catppuccin-mocha/default.nix)0
-rw-r--r--modules/hyprland/catppuccin/config/hypr/hpaper/config.conf (renamed from modules/de/hyprland/catppuccin-mocha/hypr/hpaper/config.conf)0
-rw-r--r--modules/hyprland/catppuccin/config/hypr/hpaper/wall1.webp (renamed from modules/de/hyprland/catppuccin-mocha/hypr/hpaper/wall1.webp)bin163314 -> 163314 bytes
-rw-r--r--modules/hyprland/catppuccin/config/hypr/hpaper/wall2.jpg (renamed from modules/de/hyprland/catppuccin-mocha/hypr/hpaper/wall2.jpg)bin272772 -> 272772 bytes
-rw-r--r--modules/hyprland/catppuccin/config/hypr/hyprland.conf (renamed from modules/de/hyprland/catppuccin-mocha/hypr/hyprland.conf)0
-rw-r--r--modules/hyprland/catppuccin/config/hypr/hyprland/autostart.conf (renamed from modules/de/hyprland/catppuccin-mocha/hypr/hyprland/autostart.conf)0
-rw-r--r--modules/hyprland/catppuccin/config/hypr/hyprland/environment.conf (renamed from modules/de/hyprland/catppuccin-mocha/hypr/hyprland/environment.conf)0
-rw-r--r--modules/hyprland/catppuccin/config/hypr/hyprland/input.conf (renamed from modules/de/hyprland/catppuccin-mocha/hypr/hyprland/input.conf)0
-rw-r--r--modules/hyprland/catppuccin/config/hypr/hyprland/keybinds.conf (renamed from modules/de/hyprland/catppuccin-mocha/hypr/hyprland/keybinds.conf)0
-rw-r--r--modules/hyprland/catppuccin/config/hypr/hyprland/programs.conf (renamed from modules/de/hyprland/catppuccin-mocha/hypr/hyprland/programs.conf)0
-rw-r--r--modules/hyprland/catppuccin/config/hypr/hyprland/style.conf (renamed from modules/de/hyprland/catppuccin-mocha/hypr/hyprland/style.conf)0
-rw-r--r--modules/hyprland/catppuccin/config/hypr/hyprland/theme.conf (renamed from modules/de/hyprland/catppuccin-mocha/hypr/hyprland/theme.conf)0
-rw-r--r--modules/hyprland/catppuccin/config/hypr/hyprland/wrules.conf (renamed from modules/de/hyprland/catppuccin-mocha/hypr/hyprland/wrules.conf)0
-rw-r--r--modules/hyprland/catppuccin/config/hypr/hyprlock.conf (renamed from modules/de/hyprland/catppuccin-mocha/hypr/hyprlock.conf)0
-rw-r--r--modules/hyprland/catppuccin/config/hypr/themes/mocha.conf (renamed from modules/de/hyprland/catppuccin-mocha/hypr/themes/mocha.conf)0
-rw-r--r--modules/hyprland/catppuccin/config/kitty/current-theme.conf (renamed from modules/de/hyprland/catppuccin-mocha/kitty/current-theme.conf)0
-rw-r--r--modules/hyprland/catppuccin/config/kitty/kitty.conf (renamed from modules/de/hyprland/catppuccin-mocha/kitty/kitty.conf)0
-rw-r--r--modules/hyprland/catppuccin/config/quickshell/default.nix (renamed from modules/de/hyprland/catppuccin-mocha/quickshell/default.nix)0
-rw-r--r--modules/hyprland/catppuccin/config/quickshell/path.txt (renamed from modules/de/hyprland/catppuccin-mocha/quickshell/path.txt)0
-rw-r--r--modules/hyprland/catppuccin/config/quickshell/scheme.json (renamed from modules/de/hyprland/catppuccin-mocha/quickshell/scheme.json)0
-rw-r--r--modules/hyprland/catppuccin/config/quickshell/shell.json (renamed from modules/de/hyprland/catppuccin-mocha/quickshell/shell.json)0
-rw-r--r--modules/hyprland/catppuccin/config/quickshell/wall2.jpg (renamed from modules/de/hyprland/catppuccin-mocha/quickshell/wall2.jpg)bin272772 -> 272772 bytes
-rw-r--r--modules/hyprland/catppuccin/config/rofi/catppuccin-default.rasi (renamed from modules/de/hyprland/catppuccin-mocha/rofi/catppuccin-default.rasi)0
-rw-r--r--modules/hyprland/catppuccin/config/rofi/catppuccin-mocha.rasi (renamed from modules/de/hyprland/catppuccin-mocha/rofi/catppuccin-mocha.rasi)0
-rw-r--r--modules/hyprland/catppuccin/config/rofi/config.rasi (renamed from modules/de/hyprland/catppuccin-mocha/rofi/config.rasi)0
-rw-r--r--modules/hyprland/catppuccin/config/waybar/config.jsonc (renamed from modules/de/hyprland/catppuccin-mocha/waybar/config.jsonc)0
-rw-r--r--modules/hyprland/catppuccin/config/waybar/mocha.css (renamed from modules/de/hyprland/catppuccin-mocha/waybar/mocha.css)0
-rw-r--r--modules/hyprland/catppuccin/config/waybar/style.css (renamed from modules/de/hyprland/catppuccin-mocha/waybar/style.css)0
-rw-r--r--modules/hyprland/catppuccin/default.nix (renamed from modules/de/hyprland/default.nix)2
-rw-r--r--modules/ly.nix (renamed from modules/dm/ly.nix)0
-rw-r--r--modules/neovim/default.nix14
-rw-r--r--modules/neovim/hm.nix18
-rw-r--r--modules/neovim/init.lua50
-rw-r--r--modules/nvidia.nix (renamed from modules/gpu/nvidia.nix)0
-rw-r--r--modules/plasma6.nix (renamed from modules/de/plasma6.nix)0
-rw-r--r--modules/rust.nix (renamed from modules/dev/rust.nix)0
-rw-r--r--modules/sddm.nix (renamed from modules/dm/sddm.nix)0
41 files changed, 87 insertions, 5 deletions
diff --git a/flake.nix b/flake.nix
index 0073317..46d28ac 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
outputs = { self, nixpkgs, home-manager, nvf, quickshell, spicetify-nix, nixpkgs-unstable, caelestiaShell, ... } @ inputs:
let
# pkgs = nixpkgs.legacyPackages.${system};
-# unstbl = nixpkgs-unstable.legacyPackages.${system};
+ unstbl = nixpkgs-unstable;
mods = ./modules; # Just so i can import modules everywhere i want without big paths
userName = "tomus";
fullName = "Tomus";
@@ -89,7 +89,7 @@
Makbuk = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
- specialArgs = { inherit inputs mods userName fullName; };
+ specialArgs = { inherit unstbl inputs mods userName fullName; };
modules = [
./hosts/Makbuk/configuration.nix
#nvf.nixosModules.default
diff --git a/hosts/Makbuk/configuration.nix b/hosts/Makbuk/configuration.nix
index 212c2a2..560ff90 100644
--- a/hosts/Makbuk/configuration.nix
+++ b/hosts/Makbuk/configuration.nix
@@ -12,7 +12,7 @@
# ./tata.nix
"${mods}/dm/sddm.nix"
"${mods}/minecraft.nix"
- "${mods}/de/hyprland"
+ "${mods}/hyprland/new"
"${mods}/dev/cpp.nix"
"${mods}/de/cosmic.nix"
"${mods}/de/plasma6.nix"
@@ -28,6 +28,6 @@
settings.General.EndableNetworkConfiguration = true;
};
nixpkgs.config.allowUnsupportedSystem = true;
- boot.kernelParams = [ "hid_apple.fnmode=2" ];
+ boot.kernelParams = [ "hid_apple.fnmode=2" "apple_dcp.show_notch=1" ];
hardware.asahi.peripheralFirmwareDirectory = ./firmware;
}
diff --git a/modules/de/cosmic.nix b/modules/cosmic.nix
index d53215f..d53215f 100644
--- a/modules/de/cosmic.nix
+++ b/modules/cosmic.nix
diff --git a/modules/dev/cpp.nix b/modules/cpp.nix
index a2d87d2..a2d87d2 100644
--- a/modules/dev/cpp.nix
+++ b/modules/cpp.nix
diff --git a/modules/de/hyprland/catppuccin-mocha/default.nix b/modules/hyprland/catppuccin/config/default.nix
index a666126..a666126 100644
--- a/modules/de/hyprland/catppuccin-mocha/default.nix
+++ b/modules/hyprland/catppuccin/config/default.nix
diff --git a/modules/de/hyprland/catppuccin-mocha/hypr/hpaper/config.conf b/modules/hyprland/catppuccin/config/hypr/hpaper/config.conf
index db1fd3f..db1fd3f 100644
--- a/modules/de/hyprland/catppuccin-mocha/hypr/hpaper/config.conf
+++ b/modules/hyprland/catppuccin/config/hypr/hpaper/config.conf
diff --git a/modules/de/hyprland/catppuccin-mocha/hypr/hpaper/wall1.webp b/modules/hyprland/catppuccin/config/hypr/hpaper/wall1.webp
index 24e8285..24e8285 100644
--- a/modules/de/hyprland/catppuccin-mocha/hypr/hpaper/wall1.webp
+++ b/modules/hyprland/catppuccin/config/hypr/hpaper/wall1.webp
Binary files differ
diff --git a/modules/de/hyprland/catppuccin-mocha/hypr/hpaper/wall2.jpg b/modules/hyprland/catppuccin/config/hypr/hpaper/wall2.jpg
index c313c66..c313c66 100644
--- a/modules/de/hyprland/catppuccin-mocha/hypr/hpaper/wall2.jpg
+++ b/modules/hyprland/catppuccin/config/hypr/hpaper/wall2.jpg
Binary files differ
diff --git a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland.conf b/modules/hyprland/catppuccin/config/hypr/hyprland.conf
index be7a569..be7a569 100644
--- a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland.conf
+++ b/modules/hyprland/catppuccin/config/hypr/hyprland.conf
diff --git a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/autostart.conf b/modules/hyprland/catppuccin/config/hypr/hyprland/autostart.conf
index f5c7a4d..f5c7a4d 100644
--- a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/autostart.conf
+++ b/modules/hyprland/catppuccin/config/hypr/hyprland/autostart.conf
diff --git a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/environment.conf b/modules/hyprland/catppuccin/config/hypr/hyprland/environment.conf
index 2fdce16..2fdce16 100644
--- a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/environment.conf
+++ b/modules/hyprland/catppuccin/config/hypr/hyprland/environment.conf
diff --git a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/input.conf b/modules/hyprland/catppuccin/config/hypr/hyprland/input.conf
index e3f0a91..e3f0a91 100644
--- a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/input.conf
+++ b/modules/hyprland/catppuccin/config/hypr/hyprland/input.conf
diff --git a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/keybinds.conf b/modules/hyprland/catppuccin/config/hypr/hyprland/keybinds.conf
index 1833abb..1833abb 100644
--- a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/keybinds.conf
+++ b/modules/hyprland/catppuccin/config/hypr/hyprland/keybinds.conf
diff --git a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/programs.conf b/modules/hyprland/catppuccin/config/hypr/hyprland/programs.conf
index 3a8ef00..3a8ef00 100644
--- a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/programs.conf
+++ b/modules/hyprland/catppuccin/config/hypr/hyprland/programs.conf
diff --git a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/style.conf b/modules/hyprland/catppuccin/config/hypr/hyprland/style.conf
index 1c0ccae..1c0ccae 100644
--- a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/style.conf
+++ b/modules/hyprland/catppuccin/config/hypr/hyprland/style.conf
diff --git a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/theme.conf b/modules/hyprland/catppuccin/config/hypr/hyprland/theme.conf
index fc250c2..fc250c2 100644
--- a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/theme.conf
+++ b/modules/hyprland/catppuccin/config/hypr/hyprland/theme.conf
diff --git a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/wrules.conf b/modules/hyprland/catppuccin/config/hypr/hyprland/wrules.conf
index 3e5e43d..3e5e43d 100644
--- a/modules/de/hyprland/catppuccin-mocha/hypr/hyprland/wrules.conf
+++ b/modules/hyprland/catppuccin/config/hypr/hyprland/wrules.conf
diff --git a/modules/de/hyprland/catppuccin-mocha/hypr/hyprlock.conf b/modules/hyprland/catppuccin/config/hypr/hyprlock.conf
index 8d008fc..8d008fc 100644
--- a/modules/de/hyprland/catppuccin-mocha/hypr/hyprlock.conf
+++ b/modules/hyprland/catppuccin/config/hypr/hyprlock.conf
diff --git a/modules/de/hyprland/catppuccin-mocha/hypr/themes/mocha.conf b/modules/hyprland/catppuccin/config/hypr/themes/mocha.conf
index 8ccb56a..8ccb56a 100644
--- a/modules/de/hyprland/catppuccin-mocha/hypr/themes/mocha.conf
+++ b/modules/hyprland/catppuccin/config/hypr/themes/mocha.conf
diff --git a/modules/de/hyprland/catppuccin-mocha/kitty/current-theme.conf b/modules/hyprland/catppuccin/config/kitty/current-theme.conf
index b06c918..b06c918 100644
--- a/modules/de/hyprland/catppuccin-mocha/kitty/current-theme.conf
+++ b/modules/hyprland/catppuccin/config/kitty/current-theme.conf
diff --git a/modules/de/hyprland/catppuccin-mocha/kitty/kitty.conf b/modules/hyprland/catppuccin/config/kitty/kitty.conf
index 6536a18..6536a18 100644
--- a/modules/de/hyprland/catppuccin-mocha/kitty/kitty.conf
+++ b/modules/hyprland/catppuccin/config/kitty/kitty.conf
diff --git a/modules/de/hyprland/catppuccin-mocha/quickshell/default.nix b/modules/hyprland/catppuccin/config/quickshell/default.nix
index ae66093..ae66093 100644
--- a/modules/de/hyprland/catppuccin-mocha/quickshell/default.nix
+++ b/modules/hyprland/catppuccin/config/quickshell/default.nix
diff --git a/modules/de/hyprland/catppuccin-mocha/quickshell/path.txt b/modules/hyprland/catppuccin/config/quickshell/path.txt
index c957105..c957105 100644
--- a/modules/de/hyprland/catppuccin-mocha/quickshell/path.txt
+++ b/modules/hyprland/catppuccin/config/quickshell/path.txt
diff --git a/modules/de/hyprland/catppuccin-mocha/quickshell/scheme.json b/modules/hyprland/catppuccin/config/quickshell/scheme.json
index 0444456..0444456 100644
--- a/modules/de/hyprland/catppuccin-mocha/quickshell/scheme.json
+++ b/modules/hyprland/catppuccin/config/quickshell/scheme.json
diff --git a/modules/de/hyprland/catppuccin-mocha/quickshell/shell.json b/modules/hyprland/catppuccin/config/quickshell/shell.json
index 0df3063..0df3063 100644
--- a/modules/de/hyprland/catppuccin-mocha/quickshell/shell.json
+++ b/modules/hyprland/catppuccin/config/quickshell/shell.json
diff --git a/modules/de/hyprland/catppuccin-mocha/quickshell/wall2.jpg b/modules/hyprland/catppuccin/config/quickshell/wall2.jpg
index c313c66..c313c66 100644
--- a/modules/de/hyprland/catppuccin-mocha/quickshell/wall2.jpg
+++ b/modules/hyprland/catppuccin/config/quickshell/wall2.jpg
Binary files differ
diff --git a/modules/de/hyprland/catppuccin-mocha/rofi/catppuccin-default.rasi b/modules/hyprland/catppuccin/config/rofi/catppuccin-default.rasi
index f4f8669..f4f8669 100644
--- a/modules/de/hyprland/catppuccin-mocha/rofi/catppuccin-default.rasi
+++ b/modules/hyprland/catppuccin/config/rofi/catppuccin-default.rasi
diff --git a/modules/de/hyprland/catppuccin-mocha/rofi/catppuccin-mocha.rasi b/modules/hyprland/catppuccin/config/rofi/catppuccin-mocha.rasi
index c8ea0e1..c8ea0e1 100644
--- a/modules/de/hyprland/catppuccin-mocha/rofi/catppuccin-mocha.rasi
+++ b/modules/hyprland/catppuccin/config/rofi/catppuccin-mocha.rasi
diff --git a/modules/de/hyprland/catppuccin-mocha/rofi/config.rasi b/modules/hyprland/catppuccin/config/rofi/config.rasi
index 314e470..314e470 100644
--- a/modules/de/hyprland/catppuccin-mocha/rofi/config.rasi
+++ b/modules/hyprland/catppuccin/config/rofi/config.rasi
diff --git a/modules/de/hyprland/catppuccin-mocha/waybar/config.jsonc b/modules/hyprland/catppuccin/config/waybar/config.jsonc
index 6732619..6732619 100644
--- a/modules/de/hyprland/catppuccin-mocha/waybar/config.jsonc
+++ b/modules/hyprland/catppuccin/config/waybar/config.jsonc
diff --git a/modules/de/hyprland/catppuccin-mocha/waybar/mocha.css b/modules/hyprland/catppuccin/config/waybar/mocha.css
index 0eb6a82..0eb6a82 100644
--- a/modules/de/hyprland/catppuccin-mocha/waybar/mocha.css
+++ b/modules/hyprland/catppuccin/config/waybar/mocha.css
diff --git a/modules/de/hyprland/catppuccin-mocha/waybar/style.css b/modules/hyprland/catppuccin/config/waybar/style.css
index 010ae9f..010ae9f 100644
--- a/modules/de/hyprland/catppuccin-mocha/waybar/style.css
+++ b/modules/hyprland/catppuccin/config/waybar/style.css
diff --git a/modules/de/hyprland/default.nix b/modules/hyprland/catppuccin/default.nix
index a71dd68..33b2d14 100644
--- a/modules/de/hyprland/default.nix
+++ b/modules/hyprland/catppuccin/default.nix
@@ -19,7 +19,7 @@
lxqt.lxqt-policykit
kdePackages.dolphin
hyprshot
- inputs.caelestiaShell.packages.${pkgs.system}.with-cli
+# inputs.caelestiaShell.packages.${pkgs.system}.with-cli
xdg-desktop-portal
];
diff --git a/modules/dm/ly.nix b/modules/ly.nix
index e884aef..e884aef 100644
--- a/modules/dm/ly.nix
+++ b/modules/ly.nix
diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
new file mode 100644
index 0000000..2279796
--- /dev/null
+++ b/modules/neovim/default.nix
@@ -0,0 +1,14 @@
+{ pkgs, unstbl, userName, ... }:
+
+{
+ environment.systemPackages = with pkgs; [
+ neovim
+ unstbl.legacyPackages."aarch64-linux".clang-tools
+ unstbl.legacyPackages."aarch64-linux".clang
+ cmake
+ nixd
+ nil
+ ];
+
+ home-manager.users.${userName} = import ./hm.nix;
+}
diff --git a/modules/neovim/hm.nix b/modules/neovim/hm.nix
new file mode 100644
index 0000000..637db00
--- /dev/null
+++ b/modules/neovim/hm.nix
@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+
+{
+ #home.file.".config/nvim/init.lua".source = ./init.lua;
+
+ programs.neovim = {
+ enable = true;
+
+# Tell Neovim to use plugins from nixpkgs
+ plugins = with pkgs.vimPlugins; [
+ nvim-cmp
+ cmp-nvim-lsp
+ nvim-autopairs
+ #catppuccin
+ ];
+ };
+
+}
diff --git a/modules/neovim/init.lua b/modules/neovim/init.lua
new file mode 100644
index 0000000..5a2b949
--- /dev/null
+++ b/modules/neovim/init.lua
@@ -0,0 +1,50 @@
+-- Basic settings
+vim.o.number = true
+vim.o.tabstop = 2
+vim.o.shiftwidth = 2
+vim.cmd("syntax on")
+vim.o.completeopt = "menuone,noinsert,noselect"
+
+require("nvim-autopairs").setup{}
+
+-- LSP keybindings
+local function on_attach(client, bufnr)
+ local opts = { noremap=true, silent=true, buffer=bufnr }
+ local keymap = vim.keymap.set
+ keymap("n", "gd", vim.lsp.buf.definition, opts)
+ keymap("n", "K", vim.lsp.buf.hover, opts)
+ keymap("n", "<leader>rn", vim.lsp.buf.rename, opts)
+ keymap("n", "gr", vim.lsp.buf.references, opts)
+end
+
+-- Capabilities for nvim-cmp
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
+
+-- LSP servers
+vim.lsp.config("clangd", { cmd = {"clangd"}, on_attach = on_attach, capabilities = capabilities })
+vim.lsp.enable("clangd")
+
+vim.lsp.config("nil", {
+ cmd = {"nil"},
+ on_attach = on_attach,
+ capabilities = capabilities,
+ filetypes = {"nix"},
+ -- settings = { [ nil ] = { nixpkgs = { expr = "import <nixpkgs> { }" } } }
+})
+vim.lsp.enable("nil")
+
+-- Completion
+local cmp = require("cmp")
+cmp.setup({
+ mapping = { ['<CR>'] = cmp.mapping.confirm({ select = true }) },
+ sources = { { name = "nvim_lsp" } },
+})
+
+-- Catppuccin theme
+vim.g.catppuccin_flavour = "mocha"
+require("catppuccin").setup({
+ integrations = { lsp_trouble = true, treesitter = true, telescope = true }
+})
+vim.cmd("colorscheme catppuccin")
+
diff --git a/modules/gpu/nvidia.nix b/modules/nvidia.nix
index 7800a4b..7800a4b 100644
--- a/modules/gpu/nvidia.nix
+++ b/modules/nvidia.nix
diff --git a/modules/de/plasma6.nix b/modules/plasma6.nix
index bad4b82..bad4b82 100644
--- a/modules/de/plasma6.nix
+++ b/modules/plasma6.nix
diff --git a/modules/dev/rust.nix b/modules/rust.nix
index 7a3338f..7a3338f 100644
--- a/modules/dev/rust.nix
+++ b/modules/rust.nix
diff --git a/modules/dm/sddm.nix b/modules/sddm.nix
index 010ae13..010ae13 100644
--- a/modules/dm/sddm.nix
+++ b/modules/sddm.nix