prescientmoon/satellite
1
Fork 0
Code Activity

Updated stuff, kotlin, fixed warning in xmonad config, idk what else

Browse source
This commit is contained in:
Matei Adriel 2022-08-18 10:53:29 +03:00
parent 26b211b643
commit db117a39bb
9 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configuration.nix
View file

@ -5,7 +5,7 @@ in
{ {
imports = [ ./modules ]; imports = [ ./modules ];
boot.tmpOnTmpfs = true; boot.tmpOnTmpfs = false;
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;

3
dotfiles/neovim/lua/my/plugins/lspconfig.lua
View file

@ -102,7 +102,8 @@ local servers = {
} }
}, },
rnix = {}, rnix = {},
cssls = {} cssls = {},
kotlin_language_server = {}
-- agda = {}, Haven't gotten this one to work yet -- agda = {}, Haven't gotten this one to work yet
} }

30
flake.lock
View file

@ -529,11 +529,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1660114525, "lastModified": 1660711471,
"narHash": "sha256-u0cIHXZREfc5h0r1qDYHXswPAoXfYNRE01twXkYyUgw=", "narHash": "sha256-KcSufGje9D2EWAFq5EkPQoDqzQsfNsSg/m5gIkS7IKU=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "3ee6c05b4b5fa253bdf64fff68c71763b5d816b7", "rev": "bccb5de89da452d9136b3c813be584f15d3018ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -552,11 +552,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1660119382, "lastModified": 1660724221,
"narHash": "sha256-DMeHVU8bH03js932AU14mfEEIMJvr/DnrgyG0xtLhZc=", "narHash": "sha256-XywsLM2OxjCGARNlyvAvgO3ZjD+iF6AsLnJ4mJQZ6LM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "39a5400f30c95c04805df8f6f8fc5527decd49af", "rev": "6a8790f60859a7ba074af3d0bc373813f2eac15b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -567,11 +567,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1660071133, "lastModified": 1660646295,
"narHash": "sha256-XX6T9wcvEZIVWY4TO5O1d2MgFyFrF2v4TpCFs7fjdn8=", "narHash": "sha256-V4G+egGRc3elXPTr7QLJ7r7yrYed0areIKDiIAlMLC8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "36cc29d837e7232e3176e4651e8e117a6f231793", "rev": "762b003329510ea855b4097a37511eb19c7077f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -583,11 +583,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1660187857, "lastModified": 1660749083,
"narHash": "sha256-+Qmz6wx9qVGpbodRUOFs+ROTXlG/LbasiH+IikF1OQ8=", "narHash": "sha256-GHLFMGH+r3OmI4tV0x/RtxN7DkHcH2ZOhK8uzQeSLiY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b946a106c1c62988c69832faae10e491a7817e0b", "rev": "a55a7db823959cf509d55325201f1864af4574b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -599,11 +599,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1660137652, "lastModified": 1660639432,
"narHash": "sha256-L92gcG6Ya4bqjJmStl/HTENhc0PR9lmVgTmeVpk13Os=", "narHash": "sha256-2WDiboOCfB0LhvnDVMXOAr8ZLDfm3WdO54CkoDPwN1A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a7f89ddd6313ef88fc9c6534ac2511ba9da85fdb", "rev": "6c6409e965a6c883677be7b9d87a95fab6c3472e",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
modules/applications/neovim.nix
View file

@ -17,6 +17,7 @@ let
sumneko-lua-language-server # lua sumneko-lua-language-server # lua
rnix-lsp # nix rnix-lsp # nix
haskell-language-server # haskell haskell-language-server # haskell
kotlin-language-server # kotlin
# vscode-langservers-extracted # css and shit # vscode-langservers-extracted # css and shit
# Formatters # Formatters

4
modules/applications/xmonad/Main.hs
View file

@ -6,7 +6,7 @@ import System.Environment
import System.Process import System.Process
import XMonad import XMonad
import XMonad.Actions.SpawnOn import XMonad.Actions.SpawnOn
import XMonad.Config (defaultConfig) import XMonad.Config
import XMonad.Config.Kde import XMonad.Config.Kde
import XMonad.Hooks.EwmhDesktops (ewmh, fullscreenEventHook) import XMonad.Hooks.EwmhDesktops (ewmh, fullscreenEventHook)
import XMonad.Hooks.ManageDocks import XMonad.Hooks.ManageDocks
@ -25,7 +25,7 @@ main =
xmonad $ xmonad $
ewmh $ ewmh $
docks $ docks $
defaultConfig def
{ modMask = mod4Mask, { modMask = mod4Mask,
layoutHook = myLayoutHook, layoutHook = myLayoutHook,
startupHook = startup, startupHook = startup,

1
modules/dev/default.nix
View file

@ -8,6 +8,7 @@
./dhall.nix ./dhall.nix
./haskell ./haskell
./fsharp.nix ./fsharp.nix
./kotlin.nix
# ./racket.nix # ./racket.nix
# ./elm.nix # ./elm.nix

8
modules/dev/kotlin.nix Normal file
View file

@ -0,0 +1,8 @@
{ pkgs, ... }: {
home-manager.users.adrielus = {
home.packages = with pkgs; [
kotlin
gradle
];
};
}

1
modules/nix.nix
View file

@ -8,6 +8,7 @@
extraOptions = '' extraOptions = ''
keep-outputs = true keep-outputs = true
keep-derivations = true keep-derivations = true
experimental-features = nix-command flakes
''; '';
settings = { settings = {

3
modules/themes/themes.nix
View file

@ -7,7 +7,8 @@ lib.lists.map (theme: pkgs.callPackage theme { }) [
(catppuccin { (catppuccin {
# wallpaper = "os/nix-magenta-pink-1920x1080.png"; # wallpaper = "os/nix-magenta-pink-1920x1080.png";
# wallpaper = "minimalistic/tetris.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/forrest.png";
# wallpaper = "landscapes/salty_mountains.png"; # wallpaper = "landscapes/salty_mountains.png";
# wallpaper = "misc/rainbow.png"; # wallpaper = "misc/rainbow.png";