From 5d17c0202acb208deefeb11d44498f9c87c22d20 Mon Sep 17 00:00:00 2001 From: coast Date: Fri, 3 Oct 2025 10:12:25 +0330 Subject: [PATCH] updates --- config/foot/foot.ini | 30 ++++++++++++++ config/kitty/kitty.conf | 2 +- config/nvim/init.vim | 26 ++++++++++-- config/nvim/vim-graft/config.rb | 3 +- config/sway/config | 9 +++-- etc/nixos/configuration.nix | 60 ++++++++++++++++------------ etc/nixos/hardware-configuration.nix | 33 --------------- local/bin/prism | 2 + 8 files changed, 97 insertions(+), 68 deletions(-) create mode 100644 config/foot/foot.ini delete mode 100644 etc/nixos/hardware-configuration.nix create mode 100755 local/bin/prism diff --git a/config/foot/foot.ini b/config/foot/foot.ini new file mode 100644 index 0000000..d04dab4 --- /dev/null +++ b/config/foot/foot.ini @@ -0,0 +1,30 @@ +font=UbuntuMono:size=14 +pad=8x8 + +[colors] +foreground=ebdbb2 # light foreground (text) +background=282828 # dark background + +## Normal/regular colors (color palette 0-7) +regular0=1d2021 # black +regular1=fb4934 # red +regular2=b8bb26 # green +regular3=fabd2f # yellow +regular4=83a598 # blue +regular5=d3869b # magenta +regular6=8ec07c # cyan +regular7=ffffff # white + +## Bright colors (color palette 8-15) +bright0=7c6f64 # bright black +bright1=fb4934 # bright red +bright2=b8bb26 # bright green +bright3=fabd2f # bright yellow +bright4=83a598 # bright blue +bright5=d3869b # bright magenta +bright6=8ec07c # bright cyan +bright7=ffffff # bright white + +## dimmed colors (see foot.ini(5) man page) +dim0=fe8019 +dim1=fb4934 diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index ce0cab6..a147494 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -1,5 +1,5 @@ font_family family="Ubuntu Mono" -font_size 20 +font_size 15 bold_font auto italic_font auto bold_italic_font auto diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 2aff66e..653b05e 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -1,13 +1,22 @@ se notgc bg=light color vim -let mapleader="," +let mapleader=" " se nu rnu se fillchars=eob:\ -set undofile -set undodir=~/.config/nvim/undodir +se undofile +se undodir=~/.config/nvim/undodir + +filetype plugin indent on +se expandtab +se shiftwidth=4 +se softtabstop=4 +se tabstop=4 +se smartindent + +syntax on if !isdirectory(expand("~/.config/nvim/undodir")) call mkdir(expand("~/.config/nvim/undodir")) @@ -16,3 +25,14 @@ endif let g:minimap_width = 10 let g:minimap_auto_start = 1 let g:minimap_auto_start_win_enter = 1 + +nnoremap cd :ex + +if executable('nil') + autocmd User lsp_setup call lsp#register_server({ + \ 'name': 'nil', + \ 'cmd': {server_info->['nil']}, + \ 'whitelist': ['nix'], + \ }) +endif + diff --git a/config/nvim/vim-graft/config.rb b/config/nvim/vim-graft/config.rb index dfe3362..65bf3a4 100644 --- a/config/nvim/vim-graft/config.rb +++ b/config/nvim/vim-graft/config.rb @@ -12,6 +12,7 @@ CONFIG = { "tpope/vim-commentary", "tpope/vim-vinegar", "lilydjwg/colorizer", - "wfxr/minimap.vim" + "prabirshrestha/vim-lsp", + "mattn/vim-lsp-settings", ] } diff --git a/config/sway/config b/config/sway/config index 01d40a2..f44711b 100644 --- a/config/sway/config +++ b/config/sway/config @@ -1,4 +1,5 @@ exec autotiling +exec foot -s input "1267:12448:ELAN0709:00_04F3:30A0_Touchpad" { dwt enabled tap enabled @@ -6,15 +7,15 @@ input "1267:12448:ELAN0709:00_04F3:30A0_Touchpad" { } gaps inner 5 -gaps outer 2 +gaps outer 15 set $mod Mod4 set $left h set $down j set $up k set $right l -set $term kitty -set $filemgr kitty -e ranger +set $term footclient +set $filemgr footclient -e yazi set $filemgr2 caja set $menu wmenu-run -f "UbuntuMono 15" -N "#1c1c1c" -n "#B0B0B0" -S "#2d2d2d" -s "#ffffff" -l 10 set $browser brave @@ -22,7 +23,7 @@ set $browser brave output eDP-1 disable output HDMI-A-1 pos 1920 0 -output * bg /home/coast/Pictures/painting1.png stretch +output * bg /home/coast/Pictures/nature4.png fill output HDMI-A-1 resolution 1920x1080 position 1920,0 exec swayidle -w \ diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix index 3ed8055..ed5b876 100644 --- a/etc/nixos/configuration.nix +++ b/etc/nixos/configuration.nix @@ -7,13 +7,18 @@ in { (import "${home-manager}/nixos") ]; - home-manager.useUserPackages = true; - home-manager.useGlobalPkgs = true; - home-manager.backupFileExtension = "backup"; - home-manager.users.coast = import ./home.nix; + home-manager = { + useUserPackagaes = true; + useGlobalPkgs = true; + backupFileExtension = "backup"; + users.coast = import ./home.nix; + }; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot = { + loader.systemd-boot.enable = true; + loader.efi.canTouchEfiVariables = true; + kernelModules = ["kvm-intel"]; + }; networking.hostName = "core"; networking.enableIPv6 = false; @@ -22,12 +27,19 @@ in { services.xserver.enable = true; services.displayManager.ly.enable = true; - services.jellyfin.enable = true; - services.printing.enable = false; - services.pipewire = { - enable = true; - pulse.enable = true; - }; + services = { + xserver = { + enable = true; + videoDrivers = ["nvidia"]; + }; + + blueman.enable = true; + printing.enable = false; + jellyfin.enable = true; + pipewire = { + enable = true; + pulse.enable = true; + }; nixpkgs.config.allowUnfree = true; @@ -39,8 +51,6 @@ in { hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; - services.blueman.enable = true; - virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = [ "coast" ]; @@ -57,23 +67,22 @@ in { wget adwaita-icon-theme qemu + nil (pkgs.runCommand "vim-wrapper" { } '' mkdir -p $out/bin ln -s ${pkgs.neovim}/bin/nvim $out/bin/vim '') ]; - boot.kernelModules = [ - "kvm-intel" - ]; - - programs.zsh.enable = true; - programs.zsh.syntaxHighlighting.enable = true; - programs.foot.enable = false; - programs.nekoray.enable = true; - programs.nekoray.tunMode.enable = true; - programs.nano.enable = false; - programs.sway.enable = true; + programs = { + zsh.enable = true; + zsh.syntaxHighlighting.enable = true; + foot.enable = true; + nekoray.enable = true; + nekoray.tunMode.enable = true; + nano.enable = false; + sway.enable = true; + }; fonts.packages = with pkgs; [ ubuntu-sans @@ -83,7 +92,6 @@ in { ]; hardware.graphics.enable = true; - services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia = { modesetting.enable = true; powerManagement.enable = false; diff --git a/etc/nixos/hardware-configuration.nix b/etc/nixos/hardware-configuration.nix deleted file mode 100644 index bee3e96..0000000 --- a/etc/nixos/hardware-configuration.nix +++ /dev/null @@ -1,33 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/8a574ece-d362-484c-b72a-bd17ce935986"; - fsType = "ext4"; - }; - - swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.eno1.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/local/bin/prism b/local/bin/prism new file mode 100755 index 0000000..00bada4 --- /dev/null +++ b/local/bin/prism @@ -0,0 +1,2 @@ +#!/bin/sh +appimage-run /home/coast/AppImages/PrismLauncher-Linux-x86_64.AppImage