From db117a39bb75d003d74945bd64e1d5f0f143ccff Mon Sep 17 00:00:00 2001 From: Matei Adriel Date: Thu, 18 Aug 2022 10:53:29 +0300 Subject: [PATCH] Updated stuff, kotlin, fixed warning in xmonad config, idk what else --- configuration.nix | 2 +- dotfiles/neovim/lua/my/plugins/lspconfig.lua | 3 +- flake.lock | 30 ++++++++++---------- modules/applications/neovim.nix | 1 + modules/applications/xmonad/Main.hs | 4 +-- modules/dev/default.nix | 1 + modules/dev/kotlin.nix | 8 ++++++ modules/nix.nix | 1 + modules/themes/themes.nix | 3 +- 9 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 modules/dev/kotlin.nix diff --git a/configuration.nix b/configuration.nix index 6fd44a1..f5f2ebd 100644 --- a/configuration.nix +++ b/configuration.nix @@ -5,7 +5,7 @@ in { imports = [ ./modules ]; - boot.tmpOnTmpfs = true; + boot.tmpOnTmpfs = false; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/dotfiles/neovim/lua/my/plugins/lspconfig.lua b/dotfiles/neovim/lua/my/plugins/lspconfig.lua index 2cfce09..72b4f06 100644 --- a/dotfiles/neovim/lua/my/plugins/lspconfig.lua +++ b/dotfiles/neovim/lua/my/plugins/lspconfig.lua @@ -102,7 +102,8 @@ local servers = { } }, rnix = {}, - cssls = {} + cssls = {}, + kotlin_language_server = {} -- agda = {}, Haven't gotten this one to work yet } diff --git a/flake.lock b/flake.lock index 7e444ab..4d17a28 100644 --- a/flake.lock +++ b/flake.lock @@ -529,11 +529,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1660114525, - "narHash": "sha256-u0cIHXZREfc5h0r1qDYHXswPAoXfYNRE01twXkYyUgw=", + "lastModified": 1660711471, + "narHash": "sha256-KcSufGje9D2EWAFq5EkPQoDqzQsfNsSg/m5gIkS7IKU=", "owner": "neovim", "repo": "neovim", - "rev": "3ee6c05b4b5fa253bdf64fff68c71763b5d816b7", + "rev": "bccb5de89da452d9136b3c813be584f15d3018ba", "type": "github" }, "original": { @@ -552,11 +552,11 @@ ] }, "locked": { - "lastModified": 1660119382, - "narHash": "sha256-DMeHVU8bH03js932AU14mfEEIMJvr/DnrgyG0xtLhZc=", + "lastModified": 1660724221, + "narHash": "sha256-XywsLM2OxjCGARNlyvAvgO3ZjD+iF6AsLnJ4mJQZ6LM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "39a5400f30c95c04805df8f6f8fc5527decd49af", + "rev": "6a8790f60859a7ba074af3d0bc373813f2eac15b", "type": "github" }, "original": { @@ -567,11 +567,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1660071133, - "narHash": "sha256-XX6T9wcvEZIVWY4TO5O1d2MgFyFrF2v4TpCFs7fjdn8=", + "lastModified": 1660646295, + "narHash": "sha256-V4G+egGRc3elXPTr7QLJ7r7yrYed0areIKDiIAlMLC8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "36cc29d837e7232e3176e4651e8e117a6f231793", + "rev": "762b003329510ea855b4097a37511eb19c7077f0", "type": "github" }, "original": { @@ -583,11 +583,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660187857, - "narHash": "sha256-+Qmz6wx9qVGpbodRUOFs+ROTXlG/LbasiH+IikF1OQ8=", + "lastModified": 1660749083, + "narHash": "sha256-GHLFMGH+r3OmI4tV0x/RtxN7DkHcH2ZOhK8uzQeSLiY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b946a106c1c62988c69832faae10e491a7817e0b", + "rev": "a55a7db823959cf509d55325201f1864af4574b9", "type": "github" }, "original": { @@ -599,11 +599,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1660137652, - "narHash": "sha256-L92gcG6Ya4bqjJmStl/HTENhc0PR9lmVgTmeVpk13Os=", + "lastModified": 1660639432, + "narHash": "sha256-2WDiboOCfB0LhvnDVMXOAr8ZLDfm3WdO54CkoDPwN1A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a7f89ddd6313ef88fc9c6534ac2511ba9da85fdb", + "rev": "6c6409e965a6c883677be7b9d87a95fab6c3472e", "type": "github" }, "original": { diff --git a/modules/applications/neovim.nix b/modules/applications/neovim.nix index 3382606..ed3415b 100644 --- a/modules/applications/neovim.nix +++ b/modules/applications/neovim.nix @@ -17,6 +17,7 @@ let sumneko-lua-language-server # lua rnix-lsp # nix haskell-language-server # haskell + kotlin-language-server # kotlin # vscode-langservers-extracted # css and shit # Formatters diff --git a/modules/applications/xmonad/Main.hs b/modules/applications/xmonad/Main.hs index b3f207f..755c4f6 100644 --- a/modules/applications/xmonad/Main.hs +++ b/modules/applications/xmonad/Main.hs @@ -6,7 +6,7 @@ import System.Environment import System.Process import XMonad import XMonad.Actions.SpawnOn -import XMonad.Config (defaultConfig) +import XMonad.Config import XMonad.Config.Kde import XMonad.Hooks.EwmhDesktops (ewmh, fullscreenEventHook) import XMonad.Hooks.ManageDocks @@ -25,7 +25,7 @@ main = xmonad $ ewmh $ docks $ - defaultConfig + def { modMask = mod4Mask, layoutHook = myLayoutHook, startupHook = startup, diff --git a/modules/dev/default.nix b/modules/dev/default.nix index b203c5c..4e849f8 100644 --- a/modules/dev/default.nix +++ b/modules/dev/default.nix @@ -8,6 +8,7 @@ ./dhall.nix ./haskell ./fsharp.nix + ./kotlin.nix # ./racket.nix # ./elm.nix diff --git a/modules/dev/kotlin.nix b/modules/dev/kotlin.nix new file mode 100644 index 0000000..f001a3b --- /dev/null +++ b/modules/dev/kotlin.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: { + home-manager.users.adrielus = { + home.packages = with pkgs; [ + kotlin + gradle + ]; + }; +} diff --git a/modules/nix.nix b/modules/nix.nix index e18b0e5..a51e3a3 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -8,6 +8,7 @@ extraOptions = '' keep-outputs = true keep-derivations = true + experimental-features = nix-command flakes ''; settings = { diff --git a/modules/themes/themes.nix b/modules/themes/themes.nix index fc152a6..8983d47 100644 --- a/modules/themes/themes.nix +++ b/modules/themes/themes.nix @@ -7,7 +7,8 @@ lib.lists.map (theme: pkgs.callPackage theme { }) [ (catppuccin { # wallpaper = "os/nix-magenta-pink-1920x1080.png"; # wallpaper = "minimalistic/tetris.png"; - wallpaper = "os/nix-black-4k.png"; + # wallpaper = "os/nix-black-4k.png"; + wallpaper = "misc/comfy-home.png"; # wallpaper = "landscapes/forrest.png"; # wallpaper = "landscapes/salty_mountains.png"; # wallpaper = "misc/rainbow.png";