diff --git a/configuration.nix b/configuration.nix index a9f67c5..dac215e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -84,20 +84,8 @@ # Enable touchpad support (enabled default in most desktopManager). services.libinput.enable = true; hardware.opentabletdriver = { - enable = false; - }; - programs.xppen = { enable = true; - package = pkgs.xppen_4.overrideAttrs (old: { - src = pkgs.fetchurl { - url = "https://download01.xp-pen.com/file/2026/04/XPPenLinux4.0.15-260422.tar.gz"; - hash = "sha256-Jady+pbqnzmVMuM0Io4/aE5B7dqNlDKPsnRj/Fbln6U="; - }; - buildInputs = (old.buildInputs or [ ]) ++ [ - pkgs.libXtst - pkgs.libXrandr - ]; - }); + daemon.enable = true; }; # Define a user account. Don't forget to set a password with ‘passwd’. @@ -162,7 +150,6 @@ cargo gnomeExtensions.user-themes gnomeExtensions.blur-my-shell - digital ]; environment.gnome.excludePackages = with pkgs; [ cheese # photo booth diff --git a/home/fastfetch.nix b/home/fastfetch.nix deleted file mode 100644 index ac6424d..0000000 --- a/home/fastfetch.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ config, lib, ... }: - -{ - programs.fastfetch = { - enable = true; - settings = { - logo = { - type = "small"; - padding = { - top = 1; - right = 2; - }; - }; - display = { - separator = " "; - }; - modules = [ - { - key = "╭────────╮"; - type = "custom"; - } - { - key = "│{#34} distro {#keys}│"; - type = "os"; - format = "{name} {version}"; - } - { - key = "│{#35} kernel {#keys}│"; - type = "kernel"; - } - { - key = "│{#36} host {#keys}│"; - type = "host"; - } - { - key = "│{#33} wm {#keys}│"; - type = "wm"; - } - { - key = "│{#32} ip {#keys}│"; - type = "localip"; - showIpv6 = false; - format = "{ipv4}"; - } - { - key = "├────────┤"; - type = "custom"; - } - { - key = "│{#39} colors {#keys}│"; - type = "colors"; - symbol = "circle"; - } - { - key = "╰────────╯"; - type = "custom"; - } - ]; - }; - }; -} diff --git a/home/home.nix b/home/home.nix index bed1b64..2094849 100644 --- a/home/home.nix +++ b/home/home.nix @@ -8,7 +8,6 @@ { imports = [ ./stylix.nix - ./fastfetch.nix inputs.nixcord.homeModules.nixcord ]; # Home Manager needs a bit of information about you and the @@ -16,10 +15,8 @@ home.packages = with pkgs; [ rnote git - inputs.late-sh.packages.${stdenv.hostPlatform.system}.late + inputs.late-sh.packages.${pkgs.system}.late spotify - fastfetch - hyfetch ]; home.username = "lucy"; home.homeDirectory = "/home/lucy"; diff --git a/home/stylix.nix b/home/stylix.nix index b1c422a..628cd40 100644 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -4,14 +4,12 @@ autoEnable = false; targets = { gnome.enable = true; - gnome.image.enable = false; gtk.enable = true; ghostty.enable = true; firefox.enable = true; firefox.profileNames = [ "lucy" ]; firefox.colorTheme.enable = true; nixcord.enable = true; - xresources.enable = true; }; }; } diff --git a/nixvim/keymaps.nix b/nixvim/keymaps.nix index 5c29e88..0609ab5 100644 --- a/nixvim/keymaps.nix +++ b/nixvim/keymaps.nix @@ -1,3 +1,9 @@ +{ + config, + lib, + pkgs, + ... +}: { programs.nixvim = { keymaps = [ @@ -15,8 +21,8 @@ mode = "t"; } { - key = "w"; - action = "bdelete! "; + key = ""; + action = " lua bdelete! "; } ]; }; diff --git a/nixvim/nixvim.nix b/nixvim/nixvim.nix index 8cb1afe..63c405c 100644 --- a/nixvim/nixvim.nix +++ b/nixvim/nixvim.nix @@ -10,12 +10,11 @@ ./keymaps.nix ]; programs.nixvim = { - nixpkgs.config.allowUnfree = true; enable = true; extraConfigLuaPost = '' local map = vim.keymap.set for i = 1, 10 do - map('n', '', ' BufferGoto ' .. i .. '') + map('n', '', ' LualineBuffersJump! ' .. i .. '') end ''; opts = { diff --git a/nixvim/plugins.nix b/nixvim/plugins.nix index 808a6d5..9d07e42 100644 --- a/nixvim/plugins.nix +++ b/nixvim/plugins.nix @@ -1,8 +1,13 @@ +{ + lib, + config, + pkgs, + ... +}: { programs.nixvim = { plugins = { lspconfig.enable = true; - web-devicons.enable = true; blink-cmp = { enable = true; }; @@ -20,21 +25,13 @@ }; }; }; - barbar = { - enable = true; - settings = { - icons = { - buffer_index = true; - }; - }; - }; lualine = { enable = true; settings = { options = { section_separators = { - left = "▎"; - right = "▕"; + left = ""; + right = ""; }; component_separators = { left = ""; @@ -60,6 +57,14 @@ "location" ]; }; + tabline = { + lualine_a = [ "buffers" ]; + lualine_b = [ "branch" ]; + lualine_c = [ ]; + lualine_x = [ ]; + lualine_y = [ ]; + lualine_z = [ "tabs" ]; + }; }; }; };