odie
/
nixos-combined-flake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add sleeptimer, update nixvim, neovim and nixpkgs

This commit is contained in:
Patrick Neff 2024-04-13 23:01:41 +02:00
parent c0eca37f9d
commit 377b435eb5
3 changed files with 101 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
flake.lock
View File

@ -16,6 +16,32 @@
"type": "github" "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": { "devshell": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_5",
@ -168,11 +194,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709336216, "lastModified": 1712014858,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -360,11 +386,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711625603, "lastModified": 1712989663,
"narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -383,11 +409,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1712529338, "lastModified": 1712963920,
"narHash": "sha256-5/E8yWlb6XiQcT8LIhf1IoMQvCsJ+YI3ydNdDteh+xU=", "narHash": "sha256-5Rh+bUrpeQLYtvnFlMFmUFkV/H6b+I22Bei8oNa+dBw=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "541c2d3816cdef9aba7f55f74908fa07d0cfa3ec", "rev": "66220d164a40791a5131d4660e6ffbee431070d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -408,11 +434,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712534643, "lastModified": 1712966609,
"narHash": "sha256-nOR2DxznyiBQ1sDxjIk8D5nrJhD/z+PwlBfc8YonSr4=", "narHash": "sha256-XkNBbh8x1niHtVILUiNlGJHN9N2JkY+a8MR8w0/mhrI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "4cb2a8580de0498dd38eb90791728547b5826331", "rev": "c83e531b908c1fe71a95830bbad6db8a1e5b5b6b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -507,11 +533,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712439257, "lastModified": 1712791164,
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -567,11 +593,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1712517143, "lastModified": 1713038713,
"narHash": "sha256-fC+spgEJpRBvLzTLiqOVBhcIHVWZWqQfxAG1aM2calo=", "narHash": "sha256-xijgNVqLYXUbpSsGXh7bzx6zCRVf+WGlTcGMG04mQjA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "0d85838d204d0f3d1cda22059d3fed0cd757d0ab", "rev": "1da2087d9b8a89c310d093207afd41114d6727e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -610,11 +636,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711760932, "lastModified": 1712897695,
"narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=", "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "c11e43aed6f17336c25cd120eac886b96c455731", "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -625,6 +651,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"csleeptimer": "csleeptimer",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",

16
flake.nix
View File

@ -87,6 +87,7 @@
profile = ./profiles/home-manager/desktop-dev.nix; profile = ./profiles/home-manager/desktop-dev.nix;
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
inputs.csleeptimer.homeManagerModules.default
{ {
desktop = { desktop = {
enable = true; enable = true;
@ -98,8 +99,11 @@
firefox.enable = false; firefox.enable = false;
keepassxc.enable = false; keepassxc.enable = false;
}; };
services.nixGL.enable = true; services = {
services.borgmatic.enable = true; nixGL.enable = true;
borgmatic.enable = true;
nextcloud-client.enable = false;
};
theme.cursor.enable = false; theme.cursor.enable = false;
theme.gtk.enable = false; theme.gtk.enable = false;
} }
@ -145,5 +149,13 @@
url = "github:nix-community/NixOS-WSL"; url = "github:nix-community/NixOS-WSL";
inputs.nixpkgs.follows = "nixpkgs"; 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";
};
};
}; };
} }

76
modules/nixvim/colorscheme.nix
View File

@ -1,44 +1,46 @@
{ {
colorschemes.catppuccin = { colorschemes.catppuccin = {
enable = true; enable = true;
integrations = { settings = {
cmp = true; integrations = {
gitsigns = true; cmp = true;
harpoon = true; gitsigns = true;
neotree = true; harpoon = true;
noice = true; neotree = true;
treesitter = true; noice = true;
rainbow_delimiters = true; treesitter = true;
indent_blankline = { rainbow_delimiters = true;
enabled = true; indent_blankline = {
colored_indent_levels = true; 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
'';
}; };
} }