diff options
| -rw-r--r-- | config/alacritty/alacritty.toml | 3 | ||||
| -rw-r--r-- | config/dwl.nix | 6 | ||||
| -rw-r--r-- | config/nvim/init.lua | 71 | ||||
| -rw-r--r-- | config/way-displays/cfg.yaml | 4 | ||||
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | machines/x/configuration.nix | 4 | ||||
| -rw-r--r-- | modules/amdgpu.nix | 2 | ||||
| -rw-r--r-- | modules/laptop.nix | 2 | ||||
| -rw-r--r-- | packages/dwl.nix | 2 |
9 files changed, 51 insertions, 55 deletions
diff --git a/config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml index 3c39090..6700cab 100644 --- a/config/alacritty/alacritty.toml +++ b/config/alacritty/alacritty.toml @@ -9,3 +9,6 @@ bold_italic = { family = "UbuntuMono Nerd Font Mono", style = "Bold Italic" } [cursor] style = { shape = "Beam" } + +[env] +TERM = "xterm-256color" diff --git a/config/dwl.nix b/config/dwl.nix index d9f7b96..ba0cd8a 100644 --- a/config/dwl.nix +++ b/config/dwl.nix @@ -4,9 +4,9 @@ let dwl = (pkgs.callPackage ../packages/dwl.nix {}); dwlb = (pkgs.callPackage ../packages/dwlb.nix {}); in { - /* xdg.portal.enable = true; - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal ]; - xdg.portal.config.common.default = "wlr"; */ + xdg.portal.enable = true; + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr pkgs.xdg-desktop-portal ]; + xdg.portal.config.common.default = "wlr"; home.packages = [ dwl dwlb ]; } diff --git a/config/nvim/init.lua b/config/nvim/init.lua index ccc010d..50ae369 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,6 +1,6 @@ -- General Settings vim.opt.number = true -vim.opt.mouse = '' +vim.opt.mouse= '' vim.opt.ignorecase = true vim.opt.smartcase = true vim.opt.hlsearch = false @@ -12,7 +12,7 @@ vim.opt.expandtab = true vim.opt.termguicolors = true vim.opt.splitbelow = true vim.opt.scrolloff = 5 -vim.opt.mouse = 'a' +vim.opt.mouse= 'a' vim.api.nvim_set_option('clipboard','unnamedplus') vim.opt.ruler = false @@ -24,41 +24,42 @@ vim.api.nvim_create_autocmd('VimLeave',{ }) -- Setup Packages -require('packer').startup(function(use) - use 'wbthomason/packer.nvim' - use 'lukas-reineke/indent-blankline.nvim' - use 'windwp/nvim-autopairs' - use 'numToStr/Comment.nvim' - - use 'romgrk/barbar.nvim' - use 'nvim-tree/nvim-web-devicons' - - use 'kvrohit/rasmus.nvim' - - use 'hrsh7th/cmp-nvim-lsp' - use 'hrsh7th/nvim-cmp' - use 'neovim/nvim-lspconfig' - use 'hrsh7th/cmp-nvim-lsp-signature-help' - use 'L3MON4D3/LuaSnip' - use { - 'nvim-telescope/telescope.nvim', - requires = { {'nvim-lua/plenary.nvim'} } - } - - use 'stevearc/oil.nvim' - - use 'akinsho/toggleterm.nvim' - use 'christoomey/vim-tmux-navigator' - - if install_plugins then - require('packer').sync() - end -end) - -if install_plugins then - return +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) end +vim.opt.rtp:prepend(lazypath) +require("lazy").setup({ + 'lukas-reineke/indent-blankline.nvim', + 'windwp/nvim-autopairs', + 'numToStr/Comment.nvim', + + 'romgrk/barbar.nvim', + 'nvim-tree/nvim-web-devicons', + + 'kvrohit/rasmus.nvim', + + 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/nvim-cmp', + 'neovim/nvim-lspconfig', + 'hrsh7th/cmp-nvim-lsp-signature-help', + 'L3MON4D3/LuaSnip', + 'nvim-telescope/telescope.nvim', + 'nvim-lua/plenary.nvim', + + 'stevearc/oil.nvim', + + 'akinsho/toggleterm.nvim', + 'christoomey/vim-tmux-navigator' +}) local oil = require('oil') _G.oil = oil diff --git a/config/way-displays/cfg.yaml b/config/way-displays/cfg.yaml index 74e247b..c959d88 100644 --- a/config/way-displays/cfg.yaml +++ b/config/way-displays/cfg.yaml @@ -20,9 +20,5 @@ MODE: - NAME_DESC: eDP-1 MAX: TRUE -# Laptop displays usually start with eDP e.g. eDP-1. This may be overridden if -# your laptop is different. -LAPTOP_DISPLAY_PREFIX: 'eDP-1' - # One of: ERROR, WARNING, INFO (default), DEBUG LOG_THRESHOLD: INFO @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1714679908, - "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix index e2caa0e..1785e04 100644 --- a/machines/x/configuration.nix +++ b/machines/x/configuration.nix @@ -34,10 +34,6 @@ home-manager.users.compromyse = import ./home.nix; - xdg.portal.enable = true; - xdg.portal.wlr.enable = true; - xdg.portal.config.common.default = "*"; - environment.variables = { XCURSOR_SIZE = "16"; }; diff --git a/modules/amdgpu.nix b/modules/amdgpu.nix index bc29a29..0dc6f61 100644 --- a/modules/amdgpu.nix +++ b/modules/amdgpu.nix @@ -24,6 +24,6 @@ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ]; - boot.kernelPackages = pkgs.linuxPackages_xanmod; + boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; boot.kernelParams = [ "pcie_acs_override=downstream,multifunction" ]; } diff --git a/modules/laptop.nix b/modules/laptop.nix index 4eb401b..3d6f00e 100644 --- a/modules/laptop.nix +++ b/modules/laptop.nix @@ -22,7 +22,7 @@ CPU_MIN_PERF_ON_AC = 0; CPU_MAX_PERF_ON_AC = 100; CPU_MIN_PERF_ON_BAT = 0; - CPU_MAX_PERF_ON_BAT = 20; + CPU_MAX_PERF_ON_BAT = 35; }; }; diff --git a/packages/dwl.nix b/packages/dwl.nix index fc90591..7d6b96b 100644 --- a/packages/dwl.nix +++ b/packages/dwl.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "compromyse"; repo = "dwl"; rev = "master"; - hash = "sha256-Ut1/uik8YzvySpKKfWG+rScHLk93qtDC0VXfJ+h8JqA="; + hash = "sha256-62Y65REaDOqc5znN2kvD3HfGpEeAj9lRx667LaWaoMQ="; }; nativeBuildInputs = [ |