absolutely massive rewrite, made (almost) everything modular with changes to come

23 files changed, 0 insertions, 1043 deletions

diff --git a/modules/hm/default.nix b/modules/hm/default.nix
deleted file mode 100644
index d388717..0000000
--- a/modules/hm/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./editors/default.nix
-    ./programs/default.nix
-    ./terminal/default.nix
-    ./wayland/default.nix
-
-    ./git.nix
-    ./xdg.nix
-  ];
-}
diff --git a/modules/hm/editors/default.nix b/modules/hm/editors/default.nix
deleted file mode 100644
index e990897..0000000
--- a/modules/hm/editors/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./nixvim.nix
-    # ./helix.nix
-    # ./nvf.nix
-  ];
-}
diff --git a/modules/hm/editors/helix.nix b/modules/hm/editors/helix.nix
deleted file mode 100644
index 0204f8d..0000000
--- a/modules/hm/editors/helix.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.helix = {
-    enable = true;
-#    package = pkgs.helix;
-  };
-}
diff --git a/modules/hm/editors/nixvim.nix b/modules/hm/editors/nixvim.nix
deleted file mode 100644
index b8a4e5a..0000000
--- a/modules/hm/editors/nixvim.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{ pkgs,  inputs, ... }:
-{
-  imports = [ inputs.nixvim.homeModules.nixvim ];
-  programs.nixvim = {
-    enable = true;
-    package = inputs.neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default;
-
-    viAlias = true;
-    vimAlias = true;
-    defaultEditor = true;
-    waylandSupport = true;
-    colorschemes.gruvbox.enable = true;
-
-     plugins = {
-       lualine.enable = true;
-       oil.enable = true;
-       lazygit.enable = true;
-       persistence.enable = true;
-       nvim-autopairs.enable = true;
-       neoscroll.enable = true;
-       bufferline.enable = true;
-       web-devicons.enable = true;
-
-       treesitter = {
-         enable = true;
-         settings = {
-          indent.enable = true;
-         };
-       };
-
-       telescope = {
-         enable = true;
-         extensions = {
-            fzf-native = {
-               enable = true;
-            };
-          };
-        };
-
-      notify = {
-        enable = true;
-        settings = {
-          backgroundColour = "#1e1e2e";
-          fps = 60;
-          render = "default";
-          timeout = 500;
-          topDown = true;
-        };
-      };
-
-       hardtime = {
-         # enable = true;
-         settings = {
-           # disableMouse = true;
-           # enabled = false;
-           restrictionMode = "hint";
-           hint = true;
-           maxCount = 40;
-           maxTime = 1000;
-         };
-       };
-
-       nix.enable = true;
-       lsp = {
-         enable = true;
-          servers = {
-          nil_ls.enable = true;
-          clangd.enable = true;
-          };
-       };
-     };
-
-    opts = {
-      number = true;
-      relativenumber = true;
-      termguicolors = true;
-      # mouse = "a";
-      ignorecase = true;
-      smartcase = true;
-      expandtab = true;
-      shiftwidth = 2;
-      encoding = "utf-8";
-      fileencoding = "utf-8";
-      undofile = true;
-      swapfile = true;
-      backup = false;
-      autoread = true;
-      cursorline = true;
-      ruler = true;
-      gdefault = true;
-      scrolloff = 5;
-      clipboard = {
-        providers.wl-copy.enable = true;
-        register = "unnamedplus";
-      };
-    };
-  };
-}
diff --git a/modules/hm/editors/nvf.nix b/modules/hm/editors/nvf.nix
deleted file mode 100644
index ab805ca..0000000
--- a/modules/hm/editors/nvf.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ pkgs, neovim-nightly-overlay, ... }:
-
-{
-  programs.nvf = {
-    enable = true;
-
-    settings.vim = {
-      package = neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default;
-
-      viAlias = true;
-      vimAlias = true;
-      
-      theme = {
-        enable = true;
-        name = "gruvbox";
-        style = "dark";
-      };
-     
-      statusline = {
-        lualine = {
-          enable = true;
-          theme = "gruvbox-material";
-        };
-      };
-
- autopairs.nvim-autopairs.enable = true;
-
-      lsp.enable = true;
-
-    languages = {
-      nix = {
-        enable = true;
-        format = {
-          enable = true;
-          type = "alejandra";
-          };
-        };
-      clang.enable = true;
-      };
-    };
-  };
-}
diff --git a/modules/hm/git.nix b/modules/hm/git.nix
deleted file mode 100644
index dc11881..0000000
--- a/modules/hm/git.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ ... }:
-{
-  programs.git = {
-    enable = true;
-    settings = {
-      user.name = "adikro";
-      user.email = "adikro@disroot.org";
-      init.defaultBranch = "main";
-    };
-  };
-}
diff --git a/modules/hm/programs/default.nix b/modules/hm/programs/default.nix
deleted file mode 100644
index df6fb8b..0000000
--- a/modules/hm/programs/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./nixcord.nix
-    ./satty.nix
-    ./spicetify.nix
-    ./yazi.nix
-  ];
-}
diff --git a/modules/hm/programs/nixcord.nix b/modules/hm/programs/nixcord.nix
deleted file mode 100644
index d7978af..0000000
--- a/modules/hm/programs/nixcord.nix
+++ /dev/null
@@ -1,204 +0,0 @@
-{ inputs, pkgs, ... }:
-{
-  imports = [ inputs.nixcord.homeModules.nixcord ];
-  programs.nixcord = {
-    enable = true;
-    package = pkgs.discord-krisp;
-    discord = {
-      enable = true;
-      vencord.enable = false;
-      equicord.enable = true;
-    };
-    config = {
-      frameless = true;
-      plugins = {
-        alwaysExpandRoles = {
-          enable = true;
-          hideArrow = true;
-        };
-        alwaysTrust = {
-          enable = true;
-          domain = false;
-        };
-        anammox.enable = true;
-        betterAudioPlayer.enable = true;
-        betterGifAltText.enable = true;
-        betterGifPicker.enable = true;
-        betterInvites.enable = true;
-        betterNotesBox = {
-          enable = true;
-          hide = true;
-        };
-        betterQuickReact = {
-          enable = true;
-          columns = 6.0;
-          rows = 1.0;
-          compactMode = true;
-        };
-        betterRoleContext.enable = true;
-        betterUploadButton.enable = true;
-        biggerStreamPreview.enable = true;
-        callTimer.enable = true;
-        characterCounter = {
-          enable = true;
-          colorEffects = false;
-        };
-        cleanChannelName.enable = true;
-        clearUrLs.enable = true;
-        copyFileContents.enable = true;
-        copyStickerLinks.enable = true;
-        crashHandler.enable = true;
-        customTimestamps.enable = true;
-        disableCallIdle.enable = true;
-        disableDeepLinks.enable = true;
-        # dontFilterMe.enable = true;
-        dontRoundMyTimestamps.enable = true;
-        equicordHelper = {
-          enable = true;
-          noMirroredCamera = true;
-        };
-    # equicordToolbox.enable = true;
-        expressionCloner.enable = true;
-        fakeNitro = {
-          enable = true;
-          enableEmojiBypass = false;
-          enableStickerBypass = false;
-        };
-        favoriteEmojiFirst.enable = true;
-    fixCodeblockGap.enable = true;
-        fixFileExtensions.enable = true;
-        fixImagesQuality.enable = true;
-        fixSpotifyEmbeds.enable = true;
-        fixYoutubeEmbeds.enable = true;
-        forceOwnerCrown.enable = true;
-        friendsSince.enable = true;
-        fullSearchContext.enable = true;
-        fullUserInChatbox.enable = true;
-        gifCollections = {
-          enable = true;
-          preventDuplicates = true;
-          showCopyImageLink = true;
-        };
-        gifRoulette = {
-          enable = true;
-          pingOwnerChance = true;
-        };
-        guildTagSettings.enable = true;
-        homeTyping.enable = true;
-        ignoreTerms.enable = true;
-        iLoveSpam.enable = true;
-        imageFilename.enable = true;
-        imageLink.enable = true;
-        imageZoom = {
-          enable = true;
-          nearestNeighbour = true;
-          saveZoomValues = true;
-          square = true;
-        };
-        imgToGif.enable = true;
-        inRole.enable = true;
-        inviteDefaults.enable = true;
-    # keyboardNavigation = {
-    #   enable = true;
-    #   hotkey = [ "Alt+Q" ];
-    # };
-        memberCount.enable = true;
-        mentionAvatars = {
-          enable = true;
-          showAtSymbol = true;
-        };
-        messageLinkEmbeds.enable = true;
-        messageLogger = {
-          enable = true;
-          ignoreSelf = true;
-        };
-    # messageLoggerEnhanced.enable = true;
-        moyai.enable = true;
-        musicControls.enable = true;
-        neverPausePreviews.enable = true;
-        newGuildSettings = {
-          enable = true;
-          messages = 1;
-        };
-        newPluginsManager.enable = true;
-        noF1.enable = true;
-        noMaskedUrlPaste.enable = true;
-        noModalAnimation.enable = true;
-        noNitroUpsell.enable = true;
-    # noOnboarding.enable = true;
-        noOnboardingDelay.enable = true;
-        noMosaic.enable = true;
-        noProfileThemes.enable = true;
-        noSystemBadge.enable = true;
-        noTypingAnimation.enable = true;
-        overrideForumDefaults = {
-          enable = true;
-          defaultLayout = 2;
-        };
-        onePingPerDm.enable = true;
-        openInApp.enable = true;
-        pauseInvitesForever.enable = true;
-        permissionFreeWill = {
-          enable = true;
-          lockout = false;
-        };
-        permissionsViewer.enable = true;
-        pinDMs = {
-          enable = true;
-          canCollapseDmSection = true;
-        };
-        pinIcon.enable = true;
-        platformIndicators.enable = true;
-        quoter.enable = true;
-        relationshipNotifier.enable = true;
-        roleColorEverywhere.enable = true;
-        saveFavoriteGiFs.enable = true;
-        sendTimestamps.enable = true;
-        serverInfo.enable = true;
-        showConnections.enable = true;
-        showHiddenChannels = {
-          enable = true;
-          # channelStyle = 2;
-        };
-        showHiddenThings.enable = true;
-        showResourceChannels.enable = true;
-        showTimeoutDuration.enable = true;
-    # soggy = {
-    #   enable = true;
-    #   imageLink = "https://codeberg.org/adikro/wallpapers/raw/branch/main/kirkinator.gif";
-    #   songLink = "https://video.twimg.com/amplify_video/1976076971651268608/vid/avc1/1080x720/KGLQcBQQDvLZUGKI.mp4";
-    # };
-        spotifyCrack = {
-          enable = true;
-          noSpotifyAutoPause = false;
-        };
-        streamerModeOnStream.enable = true;
-        typingIndicator = {
-          enable = true;
-          indicatorMode = 2;
-        };
-        typingTweaks.enable = true;
-    unindent.enable = true;
-        universalMention = {
-          enable = true;
-          globalMention = true;
-        };
-        unlimitedAccounts.enable = true;
-        unlockedAvatarZoom.enable = true;
-        userVoiceShow.enable = true;
-        validReply.enable = true;
-        validUser.enable = true;
-        viewIcons = {
-          enable = true;
-          format = "png";
-        };
-        voiceMessages.enable = true;
-        volumeBooster.enable = true;
-        whoReacted.enable = true;
-        whosWatching.enable = true;
-        youtubeAdblock.enable = true;
-        youtubeDescription.enable = true;
-      };
-    };
-  };
-}
diff --git a/modules/hm/programs/satty.nix b/modules/hm/programs/satty.nix
deleted file mode 100644
index facb35d..0000000
--- a/modules/hm/programs/satty.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-
-}
diff --git a/modules/hm/programs/spicetify.nix b/modules/hm/programs/spicetify.nix
deleted file mode 100644
index 9d66181..0000000
--- a/modules/hm/programs/spicetify.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, inputs, ... }:
-
-let
-  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-in {
-  imports = [
-    inputs.spicetify-nix.homeManagerModules.spicetify
-  ];
-
-  programs.spicetify = {
-    enable = true;
-
-    enabledExtensions = with spicePkgs.extensions; [
-      adblockify
-      hidePodcasts
-    ];
-
-    theme = spicePkgs.themes.catppuccin;
-    colorScheme = "mocha";
-  };
-}
diff --git a/modules/hm/programs/yazi.nix b/modules/hm/programs/yazi.nix
deleted file mode 100644
index a8e2911..0000000
--- a/modules/hm/programs/yazi.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ inputs, ... }:
-{
-# nixpkgs.overlays = [ inputs.yazi.overlays.default ];
-  programs.yazi = {
-    enable = true;
-  };
-}
diff --git a/modules/hm/terminal/btop.nix b/modules/hm/terminal/btop.nix
deleted file mode 100644
index dcd59ed..0000000
--- a/modules/hm/terminal/btop.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }:
-{
-  programs.btop = {
-    enable = true;
-  };
-}
diff --git a/modules/hm/terminal/default.nix b/modules/hm/terminal/default.nix
deleted file mode 100644
index 635f75e..0000000
--- a/modules/hm/terminal/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./btop.nix
-    ./fish.nix
-    ./foot.nix
-    ./starship.nix
-    ./utils.nix
-  ];
-}
diff --git a/modules/hm/terminal/fish.nix b/modules/hm/terminal/fish.nix
deleted file mode 100644
index ec75de8..0000000
--- a/modules/hm/terminal/fish.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.fish = {
-    enable = true;
-
-    interactiveShellInit = ''
-      set fish_greeting
-      fastfetch
-    '';
-
-    shellAliases = {
-      nos = "nh os switch";
-      nob = "nh os boot";
-      nfu = "nix flake update";
-      ll = "ls -lah";
-      la = "ls -A";
-      md = "mkdir -p";
-      rmf = "rm -rf";
-      gl = "git log --oneline --graph --decorate";
-      untar = "tar -xzvf";
-      tarc = "tar -czvf";
-      ff = "fastfetch";
-      cat = "bat";
-      ls = "eza";
-    };
-
-    plugins = [
-      {
-        name = "transient-fish";
-        src = pkgs.fishPlugins.transient-fish.src;
-      }
-      {
-        name = "fishbang";
-        src = pkgs.fishPlugins.fishbang.src;
-      }
-      {
-        name = "puffer";
-        src = pkgs.fishPlugins.puffer.src;
-      }
-      {
-        name = "pisces";
-        src = pkgs.fishPlugins.pisces.src;
-      }
-      {
-        name = "fzf-fish";
-        src = pkgs.fishPlugins.fzf-fish.src;
-      }
-      {
-        name = "fish-you-should-use";
-        src = pkgs.fishPlugins.fish-you-should-use.src;
-      }
-      {
-        name = "colored-man-pages";
-        src = pkgs.fishPlugins.colored-man-pages.src;
-      }
-      {
-        name = "fifc";
-        src = pkgs.fishPlugins.fifc.src;
-      }
-    ];
-  };
-}
diff --git a/modules/hm/terminal/foot.nix b/modules/hm/terminal/foot.nix
deleted file mode 100644
index 5c3098b..0000000
--- a/modules/hm/terminal/foot.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{pkgs, ...}:
-let
-  footTheme = pkgs.fetchurl {
-    url = "https://codeberg.org/dnkl/foot/raw/branch/master/themes/gruvbox-dark";
-    sha256 = "sha256-ubvnLgDEPGvNrwQdZRNguftg2SF5qcO1iVK0Tb5ZveI=";
-  };
-in
-{
-  programs.foot = {
-    enable = true;
-    settings = {
-      main = {
-        font="JetBrainsMonoNFM-Regular:size=14";
-#        font-bold = "${font}:style=Bold:${withSize}";
-#        font-italic = "${fontItalic}:style=Italic:${withSize}";
-#        font-bold-italic = "${fontItalic}:style=BoldItalic:${withSize}";
-        box-drawings-uses-font-glyphs = true;
-        include = "${footTheme}";
-};
-      scrollback = {
-        lines = 10000;
-      };
-      };
-    };
-  }
diff --git a/modules/hm/terminal/starship.nix b/modules/hm/terminal/starship.nix
deleted file mode 100644
index 82ab84e..0000000
--- a/modules/hm/terminal/starship.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{ ... }:
-{
-  programs.starship = {
-    enable = true;
-    settings = {
-      add_newline = true;
-      aws.disabled = true;
-      battery.disabled = true;
-      buf.disabled = true;
-      bun.disabled = true;
-      c.format = "[$symbol ]($style)";
-      cpp = {
-        disabled = false;
-        format = "[$symbol ]($style)";
-      };
-      cmake.disabled = true;
-      cobol.disabled = true;
-      # cmd_duration = {
-      #   min_time = 3;
-      #   show_notifications = true;
-      #   min_time_to_notify = 30;
-      # };
-      conda.disabled = true;
-      container.disabled = true;
-      crystal.disabled = true;
-      daml.disabled = true; 
-      dart.disabled = true;
-      deno.disabled = true;
-      directory = {
-        truncate_to_repo = false;
-        read_only = "";
-      };
-      docker_context = {
-        format =  "[$symbol ]($style)";
-        symbol = "";
-      };
-      dotnet.disabled = true;
-      elixir.disabled = true;
-      elm.disabled = true;
-      erlang.disabled = true;
-      fennel.disabled = true;
-      fortran.disabled = true;
-      gcloud.disabled = true;
-      git_commit.tag_symbol = "";
-      git_status = {
-        conflicted = "󰦎";
-        ahead = "";
-        behind = "";
-        diverged = "";
-        renamed = "";
-        deleted = "x";
-      };
-      gleam.disabled = true;
-      golang.disabled = true;
-      guix_shell.disabled = true;
-      gradle.disabled = true;
-      haskell.disabled = true;
-      haxe.disabled = true;
-      helm.disabled = true;
-      hostname.format = "[$hostname ]($style) ";
-      java.disabled = true;
-      jobs.symbol = "󰓎";
-      julia.disabled = true;
-      kotlin.disabled = true;
-      lua.disabled = true;
-      meson.disabled = true;
-      mojo.disabled = true;
-      nats.disabled = true;
-      netns.disabled = true;
-      nim.disabled = true;
-      nix_shell.format = "[$symbol$state ]($style)";
-      nodejs.disabled = true;
-      ocaml.disabled = true;
-      odin.disabled = true;
-      opa.disabled = true;
-      openstack.disabled = true;
-      package.disabled = true;
-      perl.disabled = true;
-      php.disabled = true;
-      pixi.disabled = true;
-      pulumi.disabled = true;
-      purescript.disabled = true;
-      python = {
-        symbol = "";
-        format = "[$symbol ]($style)";
-      };
-      quarto.disabled = true;
-      rlang.disabled = true;
-      raku.disabled = true;
-      red.disabled = true;
-      ruby.disabled = true;
-      rust.symbol = "";
-      scala.disabled = true;
-      singularity.disabled = true;
-      solidity.disabled = true;
-      spack.disabled = true;
-      # sudo = {
-      #   format = "[sudo ]($style)";
-      #   disabled = false;
-      # };
-      swift.disabled = true;
-      terraform.disabled = true;
-      typst.disabled = true;
-      vagrant.disabled = true;
-      vlang.disabled = true;
-      vcsh.disabled = true;
-      xmake.disabled = true;
-      zig.disabled = true;
-    };
-  };
-}
diff --git a/modules/hm/terminal/utils.nix b/modules/hm/terminal/utils.nix
deleted file mode 100644
index c408e4a..0000000
--- a/modules/hm/terminal/utils.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.zoxide = {
-    enable = true;
-    options = [
-      "--cmd cd"
-    ];
-  };
-  programs.bat = {
-    enable = true;
-    config = {
-      theme = "gruvbox-dark";
-      tabs = "2";
-    };
-  };
-  home.packages = with pkgs; [
-    fzf
-    fd
-    chafa
-    hexyl
-    eza
-    ripgrep
-    procs
-    fastfetch
-  ];
-}
diff --git a/modules/hm/wayland/default.nix b/modules/hm/wayland/default.nix
deleted file mode 100644
index a42476b..0000000
--- a/modules/hm/wayland/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./niri/default.nix
-
-    ./waybar.nix
-  ];
-}
diff --git a/modules/hm/wayland/niri/binds.nix b/modules/hm/wayland/niri/binds.nix
deleted file mode 100644
index 1ff3a38..0000000
--- a/modules/hm/wayland/niri/binds.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-{ config, pkgs, ... }:
-{
-  programs.niri.settings.binds = with config.lib.niri.actions;    
-  let
-    set-volume = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@";
-    playerctl = spawn "${pkgs.playerctl}/bin/playerctl";
-  in
-  {
-    # Overview / help
-    "Mod+O" = {
-      action = toggle-overview;
-      repeat = false;
-    };
-    "Mod+Slash".action = show-hotkey-overlay;
-
-    # Audio
-    # XF86AudioRaiseVolume.action = set-volume "2%+";
-    # XF86AudioLowerVolume.action = set-volume "2%-";
-    XF86AudioRaiseVolume.action = playerctl "volume" "0.02+";
-    XF86AudioLowerVolume.action = playerctl "volume" "0.02-";
-    XF86AudioMute.action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle";
-    XF86AudioMicMute.action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle";
-
-    # Media keys
-    XF86AudioPlay.action = playerctl "play-pause";
-    XF86AudioPrev.action = playerctl "previous";
-    XF86AudioNext.action = playerctl "next";
-
-    # Column sizing
-    "Mod+Minus".action = set-column-width "-10%";
-    "Mod+Equal".action = set-column-width "+10%";
-
-    # Finer height adjustments when in column with other windows.
-    "Mod+Shift+Minus".action = set-window-height "-10%";
-    "Mod+Shift+Equal".action = set-window-height "+10%";
-
-    # Misc
-    "Mod+Shift+V".action = toggle-window-floating;
-    "Mod+Shift+P".action = power-off-monitors;
-    "Mod+W".action = toggle-column-tabbed-display;
-
-    "Mod+S".action = spawn "sh" "-c"
-    ''
-      filename="/media/pics/ss/$(date +%Y-%m-%d_%H-%M-%S).png"
-      grim -g "$(slurp)" - | tee "$filename" | wl-copy
-    '';
-
-    "Mod+Shift+S".action = spawn "sh" "-c"
-    ''
-      filename="/media/pics/ss/$(date +%Y-%m-%d_%H-%M-%S).png"
-      grim -g "$(slurp)" "$filename"
-
-      edited="/media/pics/ss/$(date +%Y-%m-%d_%H-%M-%S)-edited.png"
-      satty --filename "$filename" --output-filename "$edited"
-    '';
-
-    "Mod+Shift+D".action = spawn "sh" "-c"
-    ''
-      cliphist list | fuzzel --dmenu | cliphist decode | wl-copy
-    '';
-
-    # --- System / General ---
-    "Mod+Return".action = spawn "foot";
-    "Mod+D".action = spawn "fuzzel";
-    "Mod+C".action = spawn "qalculate-gtk";
-    "Mod+BracketLeft".action = consume-or-expel-window-left;
-    "Mod+BracketRight".action = consume-or-expel-window-right;
-
-    "Mod+R".action = switch-preset-column-width;
-    "Mod+Shift+R".action = reset-window-height;
-    "Mod+F".action = maximize-column;
-    "Mod+Shift+F".action = fullscreen-window;
-
-    "Mod+Comma".action = consume-window-into-column;
-    "Mod+Period".action = expel-window-from-column;
-
-    "Mod+Shift+E".action = quit;
-
-    # --- Window Navigation (Focus) ---
-    "Mod+H".action = focus-column-left;
-    "Mod+L".action = focus-column-right;
-    "Mod+J".action = focus-workspace-down;
-    "Mod+K".action = focus-workspace-up;
-
-    # --- Window Management (Move) ---
-    "Mod+Shift+H".action = move-column-left;
-    "Mod+Shift+L".action = move-column-right;
-    "Mod+Shift+J".action = move-window-down-or-to-workspace-down;
-    "Mod+Shift+K".action = move-window-up-or-to-workspace-up;
-
-    # --- Window State ---
-    "Mod+Shift+Q".action = close-window;
-
-    "Mod+1".action = focus-workspace 1;
-    "Mod+2".action = focus-workspace 2;
-    "Mod+3".action = focus-workspace 3;
-    "Mod+4".action = focus-workspace 4;
-    "Mod+5".action = focus-workspace 5;
-    "Mod+6".action = focus-workspace 6;
-
-    "Mod+Shift+1".action.move-column-to-workspace = [ 1 ];
-    "Mod+Shift+2".action.move-column-to-workspace = [ 2 ];
-    "Mod+Shift+3".action.move-column-to-workspace = [ 3 ];
-    "Mod+Shift+4".action.move-column-to-workspace = [ 4 ];
-    "Mod+Shift+5".action.move-column-to-workspace = [ 5 ];
-    "Mod+Shift+6".action.move-column-to-workspace = [ 6 ];
-  };
-}
diff --git a/modules/hm/wayland/niri/default.nix b/modules/hm/wayland/niri/default.nix
deleted file mode 100644
index 61e7799..0000000
--- a/modules/hm/wayland/niri/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./niri.nix
-    ./binds.nix
-  ];
-}
diff --git a/modules/hm/wayland/niri/niri.nix b/modules/hm/wayland/niri/niri.nix
deleted file mode 100644
index e6c8619..0000000
--- a/modules/hm/wayland/niri/niri.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ lib, pkgs, ... }:
-{
-  programs.niri.settings = {
-    prefer-no-csd = true;
-    hotkey-overlay.skip-at-startup = true;
-    input = {
-      mouse = {
-        accel-profile = "flat";
-        accel-speed = -0.6;
-        middle-emulation = true;
-        scroll-factor = 1.5;
-      };
-      focus-follows-mouse = {
-        enable = true;
-        max-scroll-amount = "10%";
-      };
-      mod-key = "Alt";
-      keyboard = {
-        xkb.layout = "pl";
-        repeat-delay = 400;
-        repeat-rate = 60;
-      };
-      power-key-handling.enable = false;
-    };
-    outputs = {
-      "DP-1" = {
-        focus-at-startup = true;
-        # backdrop-color = "";
-        variable-refresh-rate = "on-demand";
-        mode = {
-          width = 2560;
-          height = 1440;
-          refresh = 239.998;
-        };
-      };
-    };
-    cursor = {
-      hide-when-typing = true;
-      size = 8;
-      # theme = "";
-    };
-    layout = {
-      border = {
-        width = 2;
-        # active = <decoration>;
-      };
-      focus-ring = {
-        width = 2;
-        # active = <decoration>;
-      };
-      preset-column-widths = [
-        { proportion = 1. / 3.; }
-        { proportion = 1. / 2.; }
-        { proportion = 2. / 3.; }
-      ];
-      preset-window-heights = [
-        { proportion = 1. / 3.; }
-        { proportion = 1. / 2.; }
-        { proportion = 2. / 3.; }
-      ];
-      default-column-width.proportion = 0.5;
-      tab-indicator = {
-        gaps-between-tabs = 3;
-        position = "top";
-      };
-    };
-    spawn-at-startup = [
-      { command = [ "${lib.getExe pkgs.xwayland-satellite}" ]; }
-      { command = [ "awww-daemon" ]; }
-    ];
-  };
-}
diff --git a/modules/hm/wayland/waybar.nix b/modules/hm/wayland/waybar.nix
deleted file mode 100644
index 17a2f46..0000000
--- a/modules/hm/wayland/waybar.nix
+++ /dev/null
@@ -1,151 +0,0 @@
-{ lib, pkgs, ... }:
-{
-  programs.waybar = {
-    enable = true;
-    # settings = [
-    #   {
-    #     layer = "top";
-    #     position = "top";
-    #
-    #     modules-center = [ "niri/workspaces" ];
-    #     modules-right = [
-    #       "idle_inhibitor"
-    #       "pulseaudio"
-    #       "disk"
-    #       "battery"
-    #       "custom/notification"
-    #       "tray"
-    #       "clock"
-    #     ];
-    #
-    #     "niri/workspaces" = {
-    #       format = "{icon} {value}";
-    #       format-icons = {
-    #         active = "";
-    #         default = "";
-    #       };
-    #     };
-    #
-    #     "niri/window" = {
-    #       icon = true;
-    #     };
-    #
-    #     "pulseaudio" = {
-    #       format = "{icon}";
-    #       format-bluetooth = "{icon} ";
-    #       format-muted = "󰝟";
-    #       format-icons = {
-    #         headphone = "";
-    #         default = [
-    #           ""
-    #           ""
-    #         ];
-    #       };
-    #       scroll-step = 1;
-    #       on-click = "${lib.getExe pkgs.pwvucontrol}";
-    #     };
-    #
-    #     clock = {
-    #       format = "{:%H:%M}  ";
-    #       format-alt = "{:%A; %B %d, %Y (%R)}  ";
-    #       tooltip-format = "<tt><small>{calendar}</small></tt>";
-    #       calendar = {
-    #         mode = "year";
-    #         mode-mon-col = 3;
-    #         weeks-pos = "right";
-    #         on-scroll = 1;
-    #         on-click-right = "mode";
-    #         format = {
-    #           months = "<span color='#ffead3'><b>{}</b></span>";
-    #           days = "<span color='#ecc6d9'><b>{}</b></span>";
-    #           weeks = "<span color='#99ffdd'><b>W{}</b></span>";
-    #           weekdays = "<span color='#ffcc66'><b>{}</b></span>";
-    #           today = "<span color='#ff6699'><b><u>{}</u></b></span>";
-    #         };
-    #       };
-    #       actions = {
-    #         on-click-right = "mode";
-    #         on-click-forward = "tz_up";
-    #         on-click-backward = "tz_down";
-    #         on-scroll-up = "shift_up";
-    #         on-scroll-down = "shift_down";
-    #       };
-    #     };
-    #
-    #     battery = {
-    #       format = "{icon}";
-    #
-    #       format-icons = [
-    #         "󰁺"
-    #         "󰁻"
-    #         "󰁼"
-    #         "󰁽"
-    #         "󰁾"
-    #         "󰁿"
-    #         "󰂀"
-    #         "󰂁"
-    #         "󰂂"
-    #         "󰁹"
-    #       ];
-    #       states = {
-    #         battery-10 = 10;
-    #         battery-20 = 20;
-    #         battery-30 = 30;
-    #         battery-40 = 40;
-    #         battery-50 = 50;
-    #         battery-60 = 60;
-    #         battery-70 = 70;
-    #         battery-80 = 80;
-    #         battery-90 = 90;
-    #         battery-100 = 100;
-    #       };
-    #
-    #       format-plugged = "󰚥";
-    #       format-charging-battery-10 = "󰢜";
-    #       format-charging-battery-20 = "󰂆";
-    #       format-charging-battery-30 = "󰂇";
-    #       format-charging-battery-40 = "󰂈";
-    #       format-charging-battery-50 = "󰢝";
-    #       format-charging-battery-60 = "󰂉";
-    #       format-charging-battery-70 = "󰢞";
-    #       format-charging-battery-80 = "󰂊";
-    #       format-charging-battery-90 = "󰂋";
-    #       format-charging-battery-100 = "󰂅";
-    #       tooltip-format = "{capacity}% {timeTo}";
-    #     };
-    #
-    #     "custom/notification" = {
-    #       format = "{icon}  {}  ";
-    #       tooltip-format = "Left: Open Notification Center\nRight: Toggle Do not Disturb\nMiddle: Clear Notifications";
-    #       format-icons = {
-    #         notification = "<span foreground='red'><sup></sup></span>";
-    #         none = "";
-    #         dnd-notification = "<span foreground='red'><sup></sup></span>";
-    #         dnd-none = "";
-    #         inhibited-notification = "<span foreground='red'><sup></sup></span>";
-    #         inhibited-none = "";
-    #         dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
-    #         dnd-inhibited-none = "";
-    #       };
-    #       return-type = "json";
-    #       exec-if = "which swaync-client";
-    #       exec = "swaync-client -swb";
-    #       on-click = "swaync-client -t -sw";
-    #       on-click-right = "swaync-client -d -sw";
-    #       on-click-middle = "swaync-client -C";
-    #       escape = true;
-    #     };
-    #
-    #     tray = {
-    #       icon-size = 21;
-    #       spacing = 10;
-    #     };
-    #   }
-    # ];
-    # style = ''
-    #   #workspaces button {
-    #       color: @base05;
-    #   }
-    # '';
-  };
-}
diff --git a/modules/hm/xdg.nix b/modules/hm/xdg.nix
deleted file mode 100644
index 07b78f1..0000000
--- a/modules/hm/xdg.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ ... }:
-{
-  xdg.userDirs = {
-    enable = true;
-
-    createDirectories = true;
-    download = "$HOME/dl";
-    documents = "$HOME/docs";
-    pictures = "/media/pics";
-    videos = "/media/vids";
-
-    desktop = null;
-    music = null;
-    publicShare = null;
-    templates = null;
-
-    extraConfig = {
-      XDG_PROJECTS_DIR = "$HOME/proj";
-      XDG_GAMES_DIR = "$HOME/games";
-      XDG_MEDIA_DIR = "/media";
-      XDG_SS_DIR = "/media/pics/ss";
-      XDG_CLIPS_DIR = "/media/vids/clips";
-      XDG_ARCHIVE_DIR = "/media/archive";
-    };
-  };
-    home.sessionVariables = { 
-      XDG_PROJECTS_DIR = "$HOME/proj";
-      XDG_GAMES_DIR = "$HOME/games";
-      XDG_MEDIA_DIR = "/media";
-      XDG_SS_DIR = "/media/pics/ss";
-      XDG_CLIPS_DIR = "/media/vids/clips";
-      XDG_ARCHIVE_DIR = "/media/archive";
-      };
-}