From 377b435eb5176aa08d14c000bff50466bd89fa5b Mon Sep 17 00:00:00 2001 From: Patrick Neff Date: Sat, 13 Apr 2024 23:01:41 +0200 Subject: [PATCH] Add sleeptimer, update nixvim, neovim and nixpkgs --- flake.lock | 69 ++++++++++++++++++++---------- flake.nix | 16 ++++++- modules/nixvim/colorscheme.nix | 76 +++++++++++++++++----------------- 3 files changed, 101 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index b913163..0f2d56f 100644 --- a/flake.lock +++ b/flake.lock @@ -16,6 +16,32 @@ "type": "github" } }, + "csleeptimer": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1713041635, + "narHash": "sha256-0euw5FV/eJ5XBlhj2RHEmYA02Rv7/k5rAHMstXnhKWo=", + "ref": "refs/heads/master", + "rev": "735cabc0cd3f3bfc4a5962fd4b69089da1e6982c", + "revCount": 2, + "type": "git", + "url": "ssh://gitea@pi1.odie.intranet/odie/csleeptimer.git" + }, + "original": { + "type": "git", + "url": "ssh://gitea@pi1.odie.intranet/odie/csleeptimer.git" + } + }, "devshell": { "inputs": { "flake-utils": "flake-utils_5", @@ -168,11 +194,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -360,11 +386,11 @@ ] }, "locked": { - "lastModified": 1711625603, - "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", + "lastModified": 1712989663, + "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", + "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0", "type": "github" }, "original": { @@ -383,11 +409,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1712529338, - "narHash": "sha256-5/E8yWlb6XiQcT8LIhf1IoMQvCsJ+YI3ydNdDteh+xU=", + "lastModified": 1712963920, + "narHash": "sha256-5Rh+bUrpeQLYtvnFlMFmUFkV/H6b+I22Bei8oNa+dBw=", "owner": "neovim", "repo": "neovim", - "rev": "541c2d3816cdef9aba7f55f74908fa07d0cfa3ec", + "rev": "66220d164a40791a5131d4660e6ffbee431070d5", "type": "github" }, "original": { @@ -408,11 +434,11 @@ ] }, "locked": { - "lastModified": 1712534643, - "narHash": "sha256-nOR2DxznyiBQ1sDxjIk8D5nrJhD/z+PwlBfc8YonSr4=", + "lastModified": 1712966609, + "narHash": "sha256-XkNBbh8x1niHtVILUiNlGJHN9N2JkY+a8MR8w0/mhrI=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "4cb2a8580de0498dd38eb90791728547b5826331", + "rev": "c83e531b908c1fe71a95830bbad6db8a1e5b5b6b", "type": "github" }, "original": { @@ -507,11 +533,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "type": "github" }, "original": { @@ -567,11 +593,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1712517143, - "narHash": "sha256-fC+spgEJpRBvLzTLiqOVBhcIHVWZWqQfxAG1aM2calo=", + "lastModified": 1713038713, + "narHash": "sha256-xijgNVqLYXUbpSsGXh7bzx6zCRVf+WGlTcGMG04mQjA=", "owner": "nix-community", "repo": "nixvim", - "rev": "0d85838d204d0f3d1cda22059d3fed0cd757d0ab", + "rev": "1da2087d9b8a89c310d093207afd41114d6727e1", "type": "github" }, "original": { @@ -610,11 +636,11 @@ ] }, "locked": { - "lastModified": 1711760932, - "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=", + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "c11e43aed6f17336c25cd120eac886b96c455731", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", "type": "github" }, "original": { @@ -625,6 +651,7 @@ }, "root": { "inputs": { + "csleeptimer": "csleeptimer", "flake-parts": "flake-parts", "flake-utils": "flake-utils", "home-manager": "home-manager", diff --git a/flake.nix b/flake.nix index 42d7237..d7270dc 100644 --- a/flake.nix +++ b/flake.nix @@ -87,6 +87,7 @@ profile = ./profiles/home-manager/desktop-dev.nix; system = "x86_64-linux"; modules = [ + inputs.csleeptimer.homeManagerModules.default { desktop = { enable = true; @@ -98,8 +99,11 @@ firefox.enable = false; keepassxc.enable = false; }; - services.nixGL.enable = true; - services.borgmatic.enable = true; + services = { + nixGL.enable = true; + borgmatic.enable = true; + nextcloud-client.enable = false; + }; theme.cursor.enable = false; theme.gtk.enable = false; } @@ -145,5 +149,13 @@ url = "github:nix-community/NixOS-WSL"; inputs.nixpkgs.follows = "nixpkgs"; }; + csleeptimer = { + url = "git+ssh://gitea@pi1.odie.intranet/odie/csleeptimer.git"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + systems.follows = "systems"; + }; + }; }; } diff --git a/modules/nixvim/colorscheme.nix b/modules/nixvim/colorscheme.nix index ce9bcfb..1d2164a 100644 --- a/modules/nixvim/colorscheme.nix +++ b/modules/nixvim/colorscheme.nix @@ -1,44 +1,46 @@ { colorschemes.catppuccin = { enable = true; - integrations = { - cmp = true; - gitsigns = true; - harpoon = true; - neotree = true; - noice = true; - treesitter = true; - rainbow_delimiters = true; - indent_blankline = { - enabled = true; - colored_indent_levels = true; + settings = { + integrations = { + cmp = true; + gitsigns = true; + harpoon = true; + neotree = true; + noice = true; + treesitter = true; + rainbow_delimiters = true; + indent_blankline = { + enabled = true; + colored_indent_levels = true; + }; }; + custom_highlights = '' + function(colors) + local bg1 = colors.mantle + local bg2 = colors.crust + local fg0 = colors.text + local green = colors.green + local red = colors.red + return { + TelescopePreviewBorder = { fg = bg1, bg = bg1 }, + TelescopePreviewNormal = { bg = bg1 }, + TelescopePreviewTitle = { fg = fg0, bg = green }, + TelescopePromptBorder = { fg = bg2, bg = bg2 }, + TelescopePromptNormal = { fg = fg0, bg = bg2 }, + TelescopePromptPrefix = { fg = red, bg = bg2 }, + TelescopePromptTitle = { fg = fg0, bg = red }, + TelescopeResultsBorder = { fg = bg1, bg = bg1 }, + TelescopeResultsNormal = { bg = bg1 }, + TelescopeResultsTitle = { fg = bg1, bg = bg1 }, + TelescopeSelection = { bg = bg2, fg = colors.text }, + TelescopeResultsDiffAdd = { fg = fg0 }, + TelescopeResultsDiffChange = { fg = fg0 }, + TelescopeResultsDiffDelete = { fg = fg0 }, + NotifyBackground = { bg = bg2 }, + } + end + ''; }; - customHighlights = '' - function(colors) - local bg1 = colors.mantle - local bg2 = colors.crust - local fg0 = colors.text - local green = colors.green - local red = colors.red - return { - TelescopePreviewBorder = { fg = bg1, bg = bg1 }, - TelescopePreviewNormal = { bg = bg1 }, - TelescopePreviewTitle = { fg = fg0, bg = green }, - TelescopePromptBorder = { fg = bg2, bg = bg2 }, - TelescopePromptNormal = { fg = fg0, bg = bg2 }, - TelescopePromptPrefix = { fg = red, bg = bg2 }, - TelescopePromptTitle = { fg = fg0, bg = red }, - TelescopeResultsBorder = { fg = bg1, bg = bg1 }, - TelescopeResultsNormal = { bg = bg1 }, - TelescopeResultsTitle = { fg = bg1, bg = bg1 }, - TelescopeSelection = { bg = bg2, fg = colors.text }, - TelescopeResultsDiffAdd = { fg = fg0 }, - TelescopeResultsDiffChange = { fg = fg0 }, - TelescopeResultsDiffDelete = { fg = fg0 }, - NotifyBackground = { bg = bg2 }, - } - end - ''; }; }