aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatasha Moongrave <natasha@256phi.eu>2026-03-30 23:19:12 +0200
committerNatasha Moongrave <natasha@256phi.eu>2026-03-30 23:19:12 +0200
commitd8b557099f4d4938f7f87c236f22d416191fcde9 (patch)
treee834855a15dd8d3d001bf4c6d428cd02502a16b0
parentbb9cd7512a57bd348a645b8b888e25061518fa06 (diff)
parentbb42f5fb23ed842837071c2765c33bd65f7eb941 (diff)
Merge branch 'recovered-changes' into config-rewriteconfig-rewrite
-rw-r--r--modules/home/default.nix9
-rw-r--r--modules/home/i3wm/nord-blue/alacritty.nix28
-rw-r--r--modules/home/i3wm/nord-blue/default.nix11
-rw-r--r--modules/home/i3wm/nord-blue/dmenu.nix11
-rw-r--r--modules/home/i3wm/nord-blue/fastfetch.nix33
-rw-r--r--modules/home/i3wm/nord-blue/helix.nix199
-rw-r--r--modules/home/i3wm/nord-blue/i3.nix127
-rw-r--r--modules/home/i3wm/nord-blue/i3lock.nix19
-rw-r--r--modules/home/i3wm/nord-blue/nvim.nix314
-rw-r--r--modules/home/i3wm/nord-blue/picom.nix68
-rw-r--r--modules/home/i3wm/nord-blue/scripts.nix0
-rw-r--r--modules/home/i3wm/nord-blue/variables.nix11
-rw-r--r--modules/home/i3wm/nord-blue/wallpapers/wave-minimal.pngbin352335 -> 0 bytes
-rw-r--r--modules/nixos/base/audio.nix18
-rw-r--r--modules/nixos/base/bluetooth.nix25
-rw-r--r--modules/nixos/base/boot.nix46
-rw-r--r--modules/nixos/base/default.nix18
-rw-r--r--modules/nixos/base/graphics.nix19
-rw-r--r--modules/nixos/base/networking.nix5
-rw-r--r--modules/nixos/base/nix.nix38
-rw-r--r--modules/nixos/base/packages.nix72
-rw-r--r--modules/nixos/base/programs.nix20
-rw-r--r--modules/nixos/base/services.nix19
-rw-r--r--modules/nixos/base/users.nix12
-rw-r--r--modules/nixos/des/gnome.nix14
25 files changed, 0 insertions, 1136 deletions
diff --git a/modules/home/default.nix b/modules/home/default.nix
deleted file mode 100644
index 2e6fff4..0000000
--- a/modules/home/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-
-{
- # Home environment orchestrator
- imports = [
- #./i3wm/original/default.nix
- ./i3wm/nord-blue/default.nix
- ];
-}
diff --git a/modules/home/i3wm/nord-blue/alacritty.nix b/modules/home/i3wm/nord-blue/alacritty.nix
deleted file mode 100644
index 0c56ec6..0000000
--- a/modules/home/i3wm/nord-blue/alacritty.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, pkgs, ... }:
-
-{
- programs.alacritty = {
- enable = true;
- settings = {
- font = {
- normal = {
- family = "JetBrainsMono Nerd Font";
- style = "Regular";
- };
- bold = {
- family = "JetBrainsMono Nerd Font";
- style = "Bold";
- };
- italic = {
- family = "JetBrainsMono Nerd Font";
- style = "Italic";
- };
- size = 7.0;
- };
- };
- };
-
- home.packages = with pkgs; [
- nerd-fonts.jetbrains-mono
- ];
-}
diff --git a/modules/home/i3wm/nord-blue/default.nix b/modules/home/i3wm/nord-blue/default.nix
deleted file mode 100644
index fca7c9c..0000000
--- a/modules/home/i3wm/nord-blue/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ ... }:
-
-{
- imports = [
- ./alacritty.nix
- ./i3.nix
- ./nvim.nix
- ./helix.nix
- ./picom.nix
- ];
-} \ No newline at end of file
diff --git a/modules/home/i3wm/nord-blue/dmenu.nix b/modules/home/i3wm/nord-blue/dmenu.nix
deleted file mode 100644
index 2e6f6d8..0000000
--- a/modules/home/i3wm/nord-blue/dmenu.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, vars }:
-
-pkgs.writeShellScriptBin "app-launcher" ''
- #!/usr/bin/env sh
- BG='${vars.colors.background}'
- FG='${vars.colors.foreground}'
- ACCENT='${vars.colors.accent}'
- TEXT='${vars.colors.text}'
-
- dmenu_run -fn 'JetBrains Mono-12' -nb "$BG" -nf "$FG" -sb "$ACCENT" -sf "$TEXT"
-''
diff --git a/modules/home/i3wm/nord-blue/fastfetch.nix b/modules/home/i3wm/nord-blue/fastfetch.nix
deleted file mode 100644
index a9c6bd3..0000000
--- a/modules/home/i3wm/nord-blue/fastfetch.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- pkgs,
- lib,
- ...
-}: {
- programs.fastfetch = {
- enable = true;
-
- settings = {
- logo = {
- type = "builtin";
- source = "nixos_small";
- };
-
- display = {
- separator = " ";
- };
-
- modules = [
- "title"
- "os"
- "kernel"
- "uptime"
- "packages"
- "shell"
- "terminal"
- "cpu"
- "memory"
- "disk"
- ];
- };
- };
-}
diff --git a/modules/home/i3wm/nord-blue/helix.nix b/modules/home/i3wm/nord-blue/helix.nix
deleted file mode 100644
index a8987f8..0000000
--- a/modules/home/i3wm/nord-blue/helix.nix
+++ /dev/null
@@ -1,199 +0,0 @@
-{ pkgs, ... }:
-
-{
- programs.helix = {
- enable = true;
- defaultEditor = false;
- settings = {
- theme = "ayu_mirage";
- editor = {
- cursor-shape = {
- normal = "block";
- insert = "bar";
- select = "underline";
- };
-
- line-number = "relative";
- bufferline = "multiple";
- color-modes = true;
- cursorline = true;
- auto-save = {
- after-delay.enable = true;
- after-delay.timeout = 10000;
- };
- auto-format = true;
- end-of-line-diagnostics = "hint";
- inline-diagnostics = {
- cursor-line = "hint";
- };
- lsp = {
- display-messages = true;
- display-inlay-hints = true;
- };
- popup-border = "popup";
-
- statusline.left = [
- "mode"
- "spinner"
- "spacer"
- "version-control"
- "file-name"
- "diagnostics"
- "read-only-indicator"
- "file-modification-indicator"
- "spacer"
- ];
-
- statusline.right = [
- "workspace-diagnostics"
- "register"
- "position"
- "selections"
- "file-encoding"
- "file-type"
- ];
- idle-timeout = 50;
- completion-timeout = 100;
- indent-guides = {
- render = true;
- character = "│";
- skip-levels = 3;
- };
- soft-wrap = {
- enable = true;
- };
- whitespace = {
- render = {
- space = "none";
- tab = "all";
- newline = "none";
- };
- characters = {
- nbsp = "·";
- tab = "→";
- };
- };
- };
- };
- languages = {
- language-server = {
- # Bash
- "bash-language-server" = {
- command = "${pkgs.bash-language-server}/bin/bash-language-server";
- args = [ "start" ];
- };
-
- # HTML
- "superhtml" = {
- command = "${pkgs.superhtml}/bin/superhtml";
- };
-
- # CSS
- "vscode-css-languageserver" = {
- command = "${pkgs.vscode-css-languageserver}/bin/vscode-css-languageserver";
- };
-
- # Rust
- "rust-analyzer" = {
- command = "${pkgs.rust-analyzer}/bin/rust-analyzer";
- };
-
- # Python
- "pyright" = {
- command = "${pkgs.pyright}/bin/pyright";
- };
-
- # Nix
- "nil" = {
- command = "${pkgs.nil}/bin/nil";
- };
-
- # LaTeX
- "texlab" = {
- command = "${pkgs.texlab}/bin/texlab";
- };
- texlab.config.texlab = {
- build = {
- onSave = true;
- forwardSearchAfter = true;
- };
-
- chktext = {
- onEdit = true;
- };
- forwardSearch = {
- executable = "zathura";
- args = [
- "--synctex-forward"
- "%l:1:%f"
- "%p"
- ];
- };
- };
-
- # Markdown
- "marksman" = {
- command = "${pkgs.marksman}/bin/marksman";
- };
- };
- language = [
- {
- name = "bash";
- language-servers = [ "bash-language-server" ];
- auto-format = true;
- }
- {
- name = "html";
- language-servers = [ "superhtml" ];
- auto-format = true;
- }
- {
- name = "css";
- language-servers = [ "vscode-css-languageserver" ];
- auto-format = true;
- }
- {
- name = "rust";
- language-servers = [ "rust-analyzer" ];
- auto-format = true;
- }
- {
- name = "python";
- language-servers = [ "pyright" ];
- auto-format = true;
- }
- {
- name = "nix";
- language-servers = [ "nil" ];
- auto-format = true;
- }
- {
- name = "latex";
- language-servers = [ "texlab" ];
- auto-format = true;
- }
- {
- name = "markdown";
- language-servers = [ "marksman" ];
- auto-format = true;
- }
- ];
- };
- };
- home.packages = with pkgs; [
- zathura
- ripgrep
- fd
-
- bash-language-server # LSP for Bash
- superhtml # LSP for HTML
- vscode-css-languageserver # LSP for CSS
- rust-analyzer # Rust LSP
- llvmPackages_latest.lldb # lldb-dap for Rust
- pyright # Python LSP
- nil # Nix LSP
- texlab # LaTeX LSP
- marksman # Markdown LSP
- ];
-
-}
diff --git a/modules/home/i3wm/nord-blue/i3.nix b/modules/home/i3wm/nord-blue/i3.nix
deleted file mode 100644
index 57e8300..0000000
--- a/modules/home/i3wm/nord-blue/i3.nix
+++ /dev/null
@@ -1,127 +0,0 @@
-{ pkgs, config, lib, ... }:
-
-let
- vars = import ./variables.nix;
- lock-screen = import ./i3lock.nix {inherit pkgs; };
- app-launcher = import ./dmenu.nix {inherit pkgs vars; };
- mod = "Mod4";
-in
-{
- xsession.windowManager = {
- i3 = {
- enable = true;
- config = {
- modifier = mod;
-
- bars = [ ];
-
- window = {
- titlebar = false;
- border = 3;
- };
-
- colors = {
- focused = {
- border = vars.colors.accent;
- childBorder = vars.colors.accent;
- background = vars.colors.background;
- text = vars.colors.foreground;
- indicator = vars.colors.foreground;
- };
- focusedInactive = {
- border = vars.colors.background;
- childBorder = vars.colors.background;
- background = vars.colors.background;
- text = vars.colors.foreground;
- indicator = vars.colors.foreground;
- };
- unfocused = {
- border = vars.colors.background;
- childBorder = vars.colors.background;
- background = vars.colors.background;
- text = vars.colors.foreground;
- indicator = vars.colors.foreground;
- };
- };
-
- startup = [
- { command = "sh -c 'feh --bg-scale ~/Pictures/wallpaper.png'"; }
- ];
-
- keybindings = lib.mkOptionDefault {
- "${mod}+Return" = "exec ${pkgs.alacritty}/bin/alacritty"; # Lanuch alacritty as a terminal
- "${mod}+d" = "exec app-launcher"; # Launch dmenu (app launcher)
- "${mod}+m" = "exec app-launcher"; # Alternative keybind to launch the app launcher
- "${mod}+Shift+m" = "exec alacritty -e nnn"; # Launch nnn
- "${mod}+n" = "exec firefox"; # Launch firefox
- "${mod}+q" = "kill"; # Close an app (kill the process)
- "${mod}+Ctrl+l" = "exec lock-screen"; # Lock screen
- "${mod}+Shift+r" = "restart"; # Reload i3
- "${mod}+Ctrl+Shift+e" = "exec sh -c 'i3-msg exit'"; # Exit i3 (CAREFUL NO CONFIRM)
- "${mod}+Shift+s" = "exec flameshot gui";
-
-
- # === FOCUS === #
-
- # Vim bindings
- "${mod}+h" = "focus left";
- "${mod}+j" = "focus down";
- "${mod}+k" = "focus up";
- "${mod}+l" = "focus right";
-
- # Arrow keys
- "${mod}+Left" = "focus left";
- "${mod}+Down" = "focus down";
- "${mod}+Up" = "focus up";
- "${mod}+Right" = "focus right";
-
- # === MOVE === #
-
- # Vim bindings
- "${mod}+Shift+h" = "move left";
- "${mod}+Shift+j" = "move down";
- "${mod}+Shift+k" = "move up";
- "${mod}+Shift+l" = "move right";
-
- # Arrow keys
- "${mod}+Shift+Left" = "focus left";
- "${mod}+Shift+Down" = "focus down";
- "${mod}+Shift+Up" = "focus up";
- "${mod}+Shift+Right" = "focus right";
-
-
- # === F-KEYS === #
-
- # Volume
- "XF86AudioRaiseVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"; # Raise volume by 5%
- "XF86AudioLowerVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"; # Lower volume by 5%
- "XF86AudioMute" = "exec wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; # Toggle volume (audio) on/off
- "XF86AudioMicMute" = "exec wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; # Toggle mic on/off
-
-
- # Brigtness
- "XF86MonBrightnessUp" = "exec brightnessctl set 5%+"; # Raise brightness by 5%
- "XF86MonBrightnessDown" = "exec brightnessctl set 5%-"; # Lower brightness by 5%
- # NOTE: Yes, the brightness can go to 0%, thus turning the screen off.
-
- };
- };
- # I'm trying to avoid using this option as much as I can but sometimes I can't figure out how to do stuff via HM
- # TODO: Find a way to declare smart borders in proper nixos home-manager
- extraConfig = ''
- smart_borders on
- '';
- };
- };
- home.packages = with pkgs; [
- dmenu # App launcher
- app-launcher
- i3lock # Lock screen
- lock-screen
- imagemagick # Handle wallpaper resizing for i3-lock
- polybar # Status bar
- alacritty # Terminal Emulator
- feh # Wallpaper utility
- nnn # File browser
- ];
-}
diff --git a/modules/home/i3wm/nord-blue/i3lock.nix b/modules/home/i3wm/nord-blue/i3lock.nix
deleted file mode 100644
index dc87766..0000000
--- a/modules/home/i3wm/nord-blue/i3lock.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ pkgs }:
-
-# Wrapper/script for i3-lock to use '~/Pictures/wallpaper.png' as the lock screen
-
-pkgs.writeShellScriptBin "lock-screen" ''
- #!/usr/bin/env sh
- set -eu
-
- WALL="''${1:-$HOME/Pictures/wallpaper.png}"
- TMP="/tmp/lockscreen.png"
-
- # Get current resolution (single-monitor friendly)
- RES=$(xrandr | awk '/\*/ {print $1; exit}')
-
- # Scale like feh --bg-fill
- magick "''$WALL" -resize "''${RES}^" -gravity center -extent "''$RES" "''$TMP"
-
- i3lock -i "$TMP"
-''
diff --git a/modules/home/i3wm/nord-blue/nvim.nix b/modules/home/i3wm/nord-blue/nvim.nix
deleted file mode 100644
index ef054a0..0000000
--- a/modules/home/i3wm/nord-blue/nvim.nix
+++ /dev/null
@@ -1,314 +0,0 @@
-{
- pkgs,
- config,
- lib,
- ...
-}: {
- #################################################
- # Packages
- #################################################
- home.packages = with pkgs; [
- zathura
- ripgrep
- fd
- lazygit
- stylua
- alejandra
- black
- shfmt
-
- # Language servers
- lua-language-server
- nil
- rust-analyzer
- pyright
- bash-language-server
- texlab
- ];
-
- #################################################
- # Neovim
- #################################################
- programs.neovim = {
- enable = true;
- defaultEditor = true;
- viAlias = true;
- vimAlias = true;
-
- #################################################
- # Plugins
- #################################################
- plugins = with pkgs.vimPlugins; [
- # UI
- catppuccin-nvim
- nvim-web-devicons
- which-key-nvim
- gitsigns-nvim
-
- # Syntax
- (nvim-treesitter.withPlugins (p: [
- p.lua
- p.nix
- p.rust
- p.python
- p.bash
- p.latex
- p.c
- ]))
-
- # LSP
- nvim-lspconfig
-
- # Completion / snippets
- nvim-cmp
- cmp-nvim-lsp
- cmp_luasnip
- luasnip
- friendly-snippets
- nvim-autopairs
-
- # Formatting
- conform-nvim
- comment-nvim
-
- # Navigation
- telescope-nvim
- plenary-nvim
- nvim-tree-lua
-
- # Terminal
- toggleterm-nvim
-
- # Writing
- vimtex
- orgmode
-
- # Start screen
- {
- plugin = vim-startify;
- config = "let g:startify_change_to_vcs_root = 0";
- }
- ];
-
- #################################################
- # Lua Configuration
- #################################################
- extraLuaConfig = ''
- -------------------------------------------------
- -- LEADER
- -------------------------------------------------
- vim.g.mapleader = " "
-
- -------------------------------------------------
- -- BASIC OPTIONS
- -------------------------------------------------
- vim.opt.number = true
- vim.opt.relativenumber = true
- vim.opt.clipboard = "unnamedplus"
- vim.opt.showtabline = 2
- vim.o.timeout = true
- vim.o.timeoutlen = 300
-
- -------------------------------------------------
- -- THEME
- -------------------------------------------------
- require("catppuccin").setup({
- flavour = "mocha",
- })
- vim.cmd.colorscheme("catppuccin")
-
- -------------------------------------------------
- -- GITSIGNS
- -------------------------------------------------
- require("gitsigns").setup()
-
- -------------------------------------------------
- -- TREESITTER
- -------------------------------------------------
- require("nvim-treesitter.configs").setup({
- highlight = { enable = true },
- indent = { enable = true },
- })
-
- vim.opt.foldmethod = "expr"
- vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
- vim.opt.foldenable = false
-
- -------------------------------------------------
- -- SNIPPETS
- -------------------------------------------------
- require("luasnip.loaders.from_vscode").lazy_load()
-
- -------------------------------------------------
- -- COMPLETION
- -------------------------------------------------
- local cmp = require("cmp")
- local luasnip = require("luasnip")
-
- cmp.setup({
- snippet = {
- expand = function(args)
- luasnip.lsp_expand(args.body)
- end,
- },
-
- mapping = cmp.mapping.preset.insert({
- ["<C-Space>"] = cmp.mapping.complete(),
- ["<CR>"] = cmp.mapping.confirm({ select = true }),
- }),
-
- sources = {
- { name = "nvim_lsp" },
- { name = "luasnip" },
- },
- })
-
-
- -- BRACKET PAIRS
- require("nvim-autopairs").setup({})
-
- -------------------------------------------------
- -- LSP
- -------------------------------------------------
- local capabilities =
- require("cmp_nvim_lsp").default_capabilities()
-
- local servers = {
- "lua_ls",
- "nil_ls",
- "rust_analyzer",
- "pyright",
- "bashls",
- "texlab",
- }
-
- for _, server in ipairs(servers) do
- vim.lsp.config(server, {
- capabilities = capabilities
- })
- vim.lsp.enable(server)
- end
-
- -------------------------------------------------
- -- LSP KEYMAPS
- -------------------------------------------------
-
- -- navigation
- vim.keymap.set("n", "<leader>ld", vim.lsp.buf.definition)
- vim.keymap.set("n", "<leader>lD", vim.lsp.buf.declaration)
- vim.keymap.set("n", "<leader>li", vim.lsp.buf.implementation)
- vim.keymap.set("n", "<leader>lr", vim.lsp.buf.references)
-
- -- information
- vim.keymap.set("n", "lh", vim.lsp.buf.hover)
-
- -- refactor
- vim.keymap.set("n", "ln", vim.lsp.buf.rename)
- vim.keymap.set("n", "la", vim.lsp.buf.code_action)
-
- -- formatting
- vim.keymap.set("n", "lf", function()
- vim.lsp.buf.format()
- end)
-
- -------------------------------------------------
- -- DIAGNOSTICS
- -------------------------------------------------
-
- vim.keymap.set("n", "lj", vim.diagnostic.goto_next)
- vim.keymap.set("n", "lk", vim.diagnostic.goto_prev)
- vim.keymap.set("n", "le", vim.diagnostic.open_float)
-
- -------------------------------------------------
- -- FORMATTER
- -------------------------------------------------
-
- require("conform").setup({
- format_on_save = {
- timeout_ms = 500,
- lsp_format = "fallback",
- },
-
- formatters_by_ft = {
- lua = { "stylua" },
- nix = { "alejandra" },
- rust = { "rustfmt" },
- python = { "black" },
- bash = { "shfmt" },
- },
- })
-
- -- COMMENT TOGGLING
- require("Comment").setup()
-
- -------------------------------------------------
- -- TELESCOPE
- -------------------------------------------------
- local builtin = require("telescope.builtin")
-
- require("telescope").setup({
- defaults = {
- layout_strategy = "horizontal",
- sorting_strategy = "ascending",
- file_ignore_patterns = { "node_modules", ".git/" },
- },
- })
-
- vim.keymap.set("n", "<leader><leader>", builtin.find_files)
- vim.keymap.set("n", "<leader>fg", builtin.live_grep)
- vim.keymap.set("n", "<leader>fb", builtin.buffers)
-
- -------------------------------------------------
- -- WHICH KEY
- -------------------------------------------------
- local wk = require("which-key")
- wk.add({
- { "<leader>l", desc = "LSP"}
- })
-
- -------------------------------------------------
- -- NVIM TREE
- -------------------------------------------------
- require("nvim-tree").setup({})
- vim.keymap.set("n", "<leader>e", "<cmd>NvimTreeToggle<CR>")
-
- -------------------------------------------------
- -- TERMINAL
- -------------------------------------------------
- require("toggleterm").setup({
- direction = "float",
- })
-
- local Terminal = require("toggleterm.terminal").Terminal
-
- local lazygit = Terminal:new({
- cmd = "lazygit",
- hidden = true,
- direction = "float",
- })
-
- vim.keymap.set("n", "<leader>gg", function()
- lazygit:toggle()
- end)
-
- -------------------------------------------------
- -- ORGMODE
- -------------------------------------------------
- local projects = {
- "~/Documents/2_Writing/0_SOČ/**/*.org",
- "~/Documents/2_Writing/2_Notes/**/*.org",
- "~/Documents/1_Projects/6_CRC-Altura/**/*.org",
- "~/ORG/**/*.org"
- }
- require("orgmode").setup({
- org_agenda_files = projects,
- org_default_notes_file = "~/INBOX.org"
- })
-
- -------------------------------------------------
- -- VIMTEX
- -------------------------------------------------
- vim.g.vimtex_view_method = "zathura"
- '';
- };
-}
diff --git a/modules/home/i3wm/nord-blue/picom.nix b/modules/home/i3wm/nord-blue/picom.nix
deleted file mode 100644
index 60b015d..0000000
--- a/modules/home/i3wm/nord-blue/picom.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ pkgs, config, lib, ... }:
-
-
-{
- services.picom = {
- enable = true;
- package = pkgs.picom-pijulius;
-
- settings = {
- ### Backend
- backend = "glx";
- vsync = true;
-
- ### Opacity
- inactive-opacity = 0.9;
- active-opacity = 1.0;
-
- ### Fading
- fading = true;
- fade-delta = 5;
- fade-in-step = 0.09;
- fade-out-step = 0.09;
-
-
-
- ### Shadows
- shadow = true;
- shadow-radius = 15;
- shadow-opacity = 0.5;
- shadow-offset-x = 12;
- shadow-offset-y = 12;
-
- shadow-exclude = [
- "class_g = 'i3-frame'"
- "window_type = 'dock'"
- "window_type = 'desktop'"
- "name = 'dmenu'"
- "class_g = 'dmenu'"
- ];
-
- ### Rounded corners
- corner-radius = 15;
- round-borders = 1;
-
- rounded-corners-exclude = [
- "class_g = 'i3-frame'"
- "window_type = 'dock'"
- ];
-
- ### Animations
- animations = true;
-
- # Physics tuning (higher = snappier)
- animation-stiffness = 25;
- animation-dampening = 1;
- animation-window-mass = 0.01;
-
- ### Per-action animations
- animation-for-open-window = "zoom";
- animation-for-unmap-window = "slide-up";
- animation-for-transient-window = "zoom";
-
- # Moving / resizing
- animation-for-move-window = "slide";
- animation-for-resize-window = "stretch";
- };
- };
-} \ No newline at end of file
diff --git a/modules/home/i3wm/nord-blue/scripts.nix b/modules/home/i3wm/nord-blue/scripts.nix
deleted file mode 100644
index e69de29..0000000
--- a/modules/home/i3wm/nord-blue/scripts.nix
+++ /dev/null
diff --git a/modules/home/i3wm/nord-blue/variables.nix b/modules/home/i3wm/nord-blue/variables.nix
deleted file mode 100644
index 5fac2bc..0000000
--- a/modules/home/i3wm/nord-blue/variables.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- colors = {
- background = "#2D333F";
- accent = "#82A3C0";
- foreground = "#C6D0F5";
- text = "#D5A18E";
- };
-
- wallpaper = "~/home/mun/Documents/4. Configuration/modules/home/i3wm/nord-blue/wallpapers/wave-minimal.png";
- # Add other wallpapers eventually
-}
diff --git a/modules/home/i3wm/nord-blue/wallpapers/wave-minimal.png b/modules/home/i3wm/nord-blue/wallpapers/wave-minimal.png
deleted file mode 100644
index 5d322d4..0000000
--- a/modules/home/i3wm/nord-blue/wallpapers/wave-minimal.png
+++ /dev/null
Binary files differ
diff --git a/modules/nixos/base/audio.nix b/modules/nixos/base/audio.nix
deleted file mode 100644
index a963081..0000000
--- a/modules/nixos/base/audio.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs, config, lib, ... }:
-
-{
- # rtkit is optional but recommended
- security.rtkit.enable = true;
- services.pipewire = {
- enable = true;
- alsa.enable = true;
- alsa.support32Bit = true;
- pulse.enable = true;
- # If you want to use JACK applications, uncomment this
- jack.enable = true;
- };
-
- environment.systemPackages = with pkgs; [
- pavucontrol
- ];
-} \ No newline at end of file
diff --git a/modules/nixos/base/bluetooth.nix b/modules/nixos/base/bluetooth.nix
deleted file mode 100644
index e850ee7..0000000
--- a/modules/nixos/base/bluetooth.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ pkgs, config, lib, ... }:
-
-{
- hardware.bluetooth = {
- enable = true;
- powerOnBoot = true;
- settings = {
- General = {
- # Shows battery charge of connected devices on supported
- # Bluetooth adapters. Defaults to 'false'.
- Experimental = true;
- # When enabled other devices can connect faster to us, however
- # the tradeoff is increased power consumption. Defaults to
- # 'false'.
- FastConnectable = true;
- };
- Policy = {
- # Enable all controllers when they are found. This includes
- # adapters present on start as well as adapters that are plugged
- # in later on. Defaults to 'true'.
- AutoEnable = true;
- };
- };
-};
-} \ No newline at end of file
diff --git a/modules/nixos/base/boot.nix b/modules/nixos/base/boot.nix
deleted file mode 100644
index a9aaff1..0000000
--- a/modules/nixos/base/boot.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
- boot = {
- kernelPackages = pkgs.linuxPackages_latest;
- initrd = {
- kernelModules = [ "i915" ];
- systemd.enable = true;
- };
- loader = {
- efi = {
- canTouchEfiVariables = true;
- efiSysMountPoint = "/boot";
- };
- grub = {
- enable = true;
- device = "nodev";
- useOSProber = true;
- efiSupport = true;
- };
- systemd-boot = {
- enable = false;
- consoleMode = "keep";
- configurationLimit = 5;
- };
- };
- plymouth = {
- enable = false;
- theme = "deus_ex";
- themePackages = with pkgs; [
- (adi1090x-plymouth-themes.override {
- selected_themes = [ "deus_ex" ];
- })
- ];
- logo = pkgs.fetchurl {
- url = "https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fcdn.icon-icons.com%2Ficons2%2F2699%2FPNG%2F512%2Fnixos_logo_icon_170910.png&f=1&nofb=1&ipt=71345d68f1fc864748db54e81111d5853a24fba1d39bdee7cc6fda3e58181bc0";
- sha256 = "sha256-fr1ZnKdX9EeXl2eTIrxEd17DkVKZL8BV9RGmluSgFfk=";
- };
- extraConfig = ''
- DeviceScale=1
- '';
- };
- };
-
- fileSystems."/boot".options = [ "fmask=0077" "dmask=0077" ];
-}
diff --git a/modules/nixos/base/default.nix b/modules/nixos/base/default.nix
deleted file mode 100644
index d49f742..0000000
--- a/modules/nixos/base/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ ... }:
-
-{
- imports = [
- ./audio.nix
- ./nix.nix
- ./bluetooth.nix
- ./boot.nix
- ./networking.nix
- ./users.nix
- ./services.nix
- ./programs.nix
- ./graphics.nix
- ./packages.nix
- ];
-
- system.stateVersion = "25.11";
-}
diff --git a/modules/nixos/base/graphics.nix b/modules/nixos/base/graphics.nix
deleted file mode 100644
index 08e64f0..0000000
--- a/modules/nixos/base/graphics.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
- services.xserver.videoDrivers = [ "intel" ];
-
- hardware.graphics = {
- enable = true;
- extraPackages = with pkgs; [
- intel-vaapi-driver
- intel-media-driver
- intel-compute-runtime
- mesa
- ];
- };
-
- environment.variables = {
-
- };
-}
diff --git a/modules/nixos/base/networking.nix b/modules/nixos/base/networking.nix
deleted file mode 100644
index 58854d5..0000000
--- a/modules/nixos/base/networking.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
- networking.networkmanager.enable = true;
-}
diff --git a/modules/nixos/base/nix.nix b/modules/nixos/base/nix.nix
deleted file mode 100644
index 748dbe6..0000000
--- a/modules/nixos/base/nix.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- config,
- lib,
- pkgs,
- ...
-}: {
- nix = {
- package = pkgs.lixPackageSets.stable.lix; # Use lix as the package manager instead of Nix
-
- settings = {
- substituters = [
- "https://cache.lix.systems"
- "https://cache.nixos.org/"
- ];
-
- trusted-public-keys = [
- "cache.lix.systems-1:32QFpmvZsbQ8HhH3dBHDx1E8zFGbxqMNxjE2Rk5OGcQ="
- "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
- ];
- experimental-features = [
- "nix-command"
- "flakes"
- ];
- };
- };
- # Fix nixkpgs.overlays being broken after switching to Lix from Nix
- nixpkgs.overlays = [
- (final: prev: {
- inherit
- (prev.lixPackageSets.stable)
- nixpkgs-review
- nix-eval-jobs
- nix-fast-build
- colmena
- ;
- })
- ];
-}
diff --git a/modules/nixos/base/packages.nix b/modules/nixos/base/packages.nix
deleted file mode 100644
index b8318b4..0000000
--- a/modules/nixos/base/packages.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
- nixpkgs.config.allowUnfree = true;
-
- environment.systemPackages = with pkgs; [
- # === Core Development Tools ===
- neovim
- wget
- stdenv
- tree-sitter
- git
- lazygit
- killall
- acpi
-
- # === CLI Utilities ===
- tree
- ripgrep
- fd
- unzip
- bzip2
-
- # === System Monitoring ===
- btop
- auto-cpufreq
-
- # === Audio/Media ===
- alsa-utils
- helvum
- playerctl
- pipewire
-
- # === Bluetooth & Wireless ===
- blueman
- bluez
- wirelesstools
-
- # === Display & Graphics ===
- feh
- flameshot
- xss-lock
- brightnessctl
- hyprlock
- imagemagick
- ghostscript
-
-
- # === Development Languages & Compilers ===
- clang
- libgcc
- lua-language-server
- stylua
- nil
- lua53Packages.luarocks
- lua
-
- # === Language Servers & Formatters ===
- ruff
- vtsls
- pyright
- python314
-
- # === System Packages ===
- ly
- ];
-
- fonts = {
- enableDefaultPackages = true;
- packages = with pkgs; [ fira-code noto-fonts noto-fonts-color-emoji blackout beon];
- };
-}
diff --git a/modules/nixos/base/programs.nix b/modules/nixos/base/programs.nix
deleted file mode 100644
index 603111c..0000000
--- a/modules/nixos/base/programs.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- config,
- lib,
- pkgs,
- ...
-}: {
- programs.firefox.enable = true;
- programs.zsh.enable = true;
-
- programs.steam = {
- enable = true;
- remotePlay.openFirewall = true;
- dedicatedServer.openFirewall = true;
- localNetworkGameTransfers.openFirewall = true;
- };
-
- programs.ssh = {
- startAgent = true;
- };
-}
diff --git a/modules/nixos/base/services.nix b/modules/nixos/base/services.nix
deleted file mode 100644
index 913d27b..0000000
--- a/modules/nixos/base/services.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- config,
- lib,
- pkgs,
- ...
-}: {
- security.pam.sshAgentAuth.enable = true;
-
- time.timeZone = "Europe/Prague";
-
- services.displayManager.ly = {
- enable = true;
- };
-
- services.printing.enable = true;
- services.libinput.enable = true;
- services.openssh.enable = true;
- services.tailscale.enable = true;
-}
diff --git a/modules/nixos/base/users.nix b/modules/nixos/base/users.nix
deleted file mode 100644
index c2db993..0000000
--- a/modules/nixos/base/users.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
- users.users = {
- mun = {
- isNormalUser = true;
- extraGroups = [ "wheel" "bluetooth" "networkmanager" "kvm" "nixos" ];
- packages = with pkgs; [ tree ];
- shell = pkgs.zsh;
- };
- };
-}
diff --git a/modules/nixos/des/gnome.nix b/modules/nixos/des/gnome.nix
deleted file mode 100644
index 79d32c8..0000000
--- a/modules/nixos/des/gnome.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- services.displayManager.gdm.enable = true;
- services.desktopManager.gnome.enable = true;
-
- # To disable installing GNOME's suite of applications
- # and only be left with GNOME shell.
- services.gnome.core-apps.enable = false;
- services.gnome.core-developer-tools.enable = false;
- services.gnome.games.enable = false;
- environment.gnome.excludePackages = with pkgs; [ gnome-tour gnome-user-docs ];
-
-} \ No newline at end of file