diff --git a/i3/brightness.py b/i3/brightness.py new file mode 100755 index 0000000..0f234a0 --- /dev/null +++ b/i3/brightness.py @@ -0,0 +1,14 @@ +#!/usr/bin/env python + +list = [ + "hehe", + "hoho", + "haha", + "peepeepoopoo", + "beeeeeep", + "boooooooop", + "slfjksdfj", + "sjfdksjfksdjfksd", + "dskjfksdjfkdsjf", + "sfkjsdkfjlkdsjfdsf", +] diff --git a/i3/settings.nix b/i3/settings.nix index 7b5b15d..92087fd 100644 --- a/i3/settings.nix +++ b/i3/settings.nix @@ -2,8 +2,8 @@ let myConfig = import ./config.nix; in -{ - package = pkgs.i3-gaps; - enable = true; - config = myConfig; -} + { + package = pkgs.i3-gaps; + enable = true; + config = myConfig; + } diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json index 184ecf2..13fcd89 100644 --- a/nvim/coc-settings.json +++ b/nvim/coc-settings.json @@ -1,10 +1,5 @@ { - "languageserver": { - "haskell": { - "command": "haskell-language-server-wrapper", - "args": ["--lsp"], - "rootPatterns": ["*.cabal", "stack.yaml", "cabal.project", "package.yaml", "hie.yaml"], - "filetypes": ["haskell", "lhaskell"] - } - } + "python.formatting.provider": "black", + "coc.preferences.formatOnType": true, + "coc.preferences.formatOnSaveFiletypes": ["python"] } diff --git a/nvim/settings.lua b/nvim/settings.lua index 10db955..e690bf8 100644 --- a/nvim/settings.lua +++ b/nvim/settings.lua @@ -18,6 +18,9 @@ opt.autoread = true --reload files when they are changed on disk -- autoformat g.rustfmt_autosave = true -- rustfmt on save +vim.cmd[[ +au BufWrite * :Autoformat +]] -- highlight yanked text for 200ms using the "Visual" highlight group vim.cmd[[ diff --git a/nvim/settings.nix b/nvim/settings.nix index 71c7170..8f863fb 100644 --- a/nvim/settings.nix +++ b/nvim/settings.nix @@ -17,6 +17,12 @@ pkgs: # autocompletion coc-nvim + # formatting + vim-autoformat + + # linting + ale + # rust coc-rust-analyzer @@ -38,13 +44,7 @@ pkgs: # colorize brackets rainbow - # format rust stuff - rust-vim - # theme gruvbox - - # linting - ale ]; } diff --git a/sync.sh b/sync.sh index dbc5e76..dd77b01 100755 --- a/sync.sh +++ b/sync.sh @@ -3,14 +3,11 @@ # update in case i was fucking around somewhere else git pull -# format everything to look nice -nixpkgs-fmt *.nix ./*/*.nix - # make a backup just in case # cp -r /etc/nixos/ ./backup # copy over all the files to /etc/nixos/ -sudo cp -r ./configuration.nix ./wallpaper.png ./dunst ./rofi ./i3 ./fish ./kitty ./nvim/ ./packages.nix ./home.nix ./services.nix ./user.nix /etc/nixos/ +sudo cp -r ./configuration.nix ./wallpaper.png ./dunst ./rofi ./i3 ./fish ./kitty ./nvim/ ./packages.nix ./home.nix ./services.nix ./user.nix /etc/nixos/ # build penrose and copy it to nixos folder # cd ./penrose