Compare commits

..

No commits in common. "f40abdb31f8a46e542e746542cf799e8273fd60f" and "7106e15052f0b44d9d81a0829eb47b299afdca14" have entirely different histories.

12 changed files with 52 additions and 131 deletions

View file

@ -391,7 +391,7 @@ colors:
# #
# Window opacity as a floating point number from `0.0` to `1.0`. # Window opacity as a floating point number from `0.0` to `1.0`.
# The value `0.0` is completely transparent and `1.0` is opaque. # The value `0.0` is completely transparent and `1.0` is opaque.
background_opacity: 0.9 #background_opacity: 1.0
#selection: #selection:
# This string contains all characters that are used as separators for # This string contains all characters that are used as separators for

View file

@ -91,7 +91,6 @@ ln -s $PWD/vpn ~/.config/vpn
printf "\033[33m[info] Linking config files\033[39m" printf "\033[33m[info] Linking config files\033[39m"
ln -s $PWD/kitty/ ~/.config/kitty ln -s $PWD/kitty/ ~/.config/kitty
ln -s $PWD/alacritty ~/.config/alacritty ln -s $PWD/alacritty ~/.config/alacritty
ln -s $PWD/wezterm ~/.config/wezterm
ln -s $PWD/nyxt/ ~/.config/next ln -s $PWD/nyxt/ ~/.config/next
ln -s $PWD/mako/ ~/.config/mako ln -s $PWD/mako/ ~/.config/mako
ln -s $PWD/.urlview ~/.urlview ln -s $PWD/.urlview ~/.urlview

View file

@ -63,7 +63,7 @@
# }; # };
# ------------ kernel ------------------------------------------------------- # ------------ kernel -------------------------------------------------------
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_10; boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_8;
services.fwupd.enable = true; services.fwupd.enable = true;
@ -162,7 +162,7 @@
security.pam.u2f = { security.pam.u2f = {
enable = true; enable = true;
settings.cue = true; cue = true;
}; };
programs.gnupg.agent = { programs.gnupg.agent = {
@ -247,14 +247,13 @@
neomutt urlscan neomutt urlscan
notmuch notmuch
aspell # spell checking in mail aspell # spell checking in mail
thunderbird
## Rust ## Rust
rustup rustup
cargo-flamegraph cargo-flamegraph
cargo-watch cargo-watch
unstable.rust-analyzer unstable.rust-analyzer
helix #unstable.helix
## other programming languages and compilers ## other programming languages and compilers
stack stack
@ -296,14 +295,13 @@
difftastic difftastic
## terminal, browsers, text editing, note taking ## terminal, browsers, text editing, note taking
alacritty alacritty
wezterm
# TODO(feliix42): Fix at some point! # TODO(feliix42): Fix at some point!
# unstable.vscode.fhs unstable.vscode.fhs
tree-sitter # for NVIM completions tree-sitter # for NVIM completions
ghostwriter ghostwriter
unstable.obsidian unstable.obsidian
## file managers ## file managers
# lol ranger
## file sharing ## file sharing
nextcloud-client nextcloud-client
## document viewers ## document viewers
@ -317,11 +315,13 @@
## LaTeX ## LaTeX
texlive.combined.scheme-full texlive.combined.scheme-full
## Citation management ## Citation management
zotero # TODO: Enable again when CVE is fixed
#zotero
## the eternal pain continues ## the eternal pain continues
libreoffice-fresh libreoffice-fresh
## video and media applications ## video and media applications
zoom-us zoom-us
#unstable.teams
spotify spotify
mpv mpv
ffmpeg-full ffmpeg-full

View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1722354303, "lastModified": 1710148658,
"narHash": "sha256-TxIDL4orO9Gy1Uct9VQ+rinzQGN6891aJt4vJQE9QXk=", "narHash": "sha256-C+fdGzsCfZBoeUrETdyFMqqmYz+bJFpAA2yRPKA/7W4=",
"owner": "Feliix42", "owner": "Feliix42",
"repo": "mlir.nix", "repo": "mlir.nix",
"rev": "54bb99e4ebe56d589a76544c347bde16d1dee7d2", "rev": "1c2fca6c0a5d4996f4cd29156b7ca09bc7a13683",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -21,11 +21,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1726650330, "lastModified": 1717995329,
"narHash": "sha256-UbHzmaOQ18O/kCizipU70N0UQVFIfv8AiFKXw07oZ9Y=", "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "abb448608a56a60075468e90d8acec2a7cb689b1", "rev": "58b52b0dd191af70f538c707c66c682331cfdffc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -37,11 +37,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1722062969, "lastModified": 1709961763,
"narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -52,11 +52,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1726463316, "lastModified": 1717974879,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,11 +75,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1726463316, "lastModified": 1717974879,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -2,7 +2,7 @@
{ {
# Enable sound. # Enable sound.
#sound.enable = true; sound.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
pavucontrol pavucontrol

View file

@ -1,5 +1,5 @@
# This file is not linked # This file is not linked
{ pkgs, lib, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; environment.systemPackages = with pkgs;
@ -19,11 +19,10 @@
( (
buildPythonPackage rec { buildPythonPackage rec {
pname = "xdsl"; pname = "xdsl";
version = "0.21.1"; version = "0.12.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-oh618MGF7YmQ0Y8tl7IKSu7c1n0DnW+oRbx5eeDV18w="; sha256 = "sha256-ZpZ7DTwlDTHeMUJ2SSe3PR+8iaZBShYelP5TkutKWS0=";
#sha256 = lib.fakeSha256;
}; };
doCheck = false; doCheck = false;
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -17,7 +17,7 @@
# allow unfree licenced packges # allow unfree licenced packges
allowUnfree = true; allowUnfree = true;
}; };
hardware.graphics = { hardware.opengl = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-compute-runtime intel-compute-runtime

View file

@ -57,10 +57,10 @@ require('nvim-treesitter.configs').setup {
-- lualine theme -- lualine theme
require('lualine').setup { require('lualine').setup {
options = { options = {
theme = 'gruvbox-baby', theme = 'gruvbox',
-- no separators between lualine elements -- no separators between lualine elements
--section_separators = '', section_separators = '',
--component_separators = '' component_separators = ''
} }
} }

View file

@ -1,38 +1,38 @@
{ {
"Nvim-R": { "branch": "stable", "commit": "346fda8ade9f743f65a6805136deb3db70dc5fae" }, "Nvim-R": { "branch": "stable", "commit": "346fda8ade9f743f65a6805136deb3db70dc5fae" },
"bufferline.nvim": { "branch": "main", "commit": "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c" }, "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" },
"clangd_extensions.nvim": { "branch": "main", "commit": "a8500531c4ed3a207e744a374ea038744a0f93eb" }, "clangd_extensions.nvim": { "branch": "main", "commit": "f36d788f05cfb73d4fd2e606e6ad15f8b842124f" },
"cmake-tools.nvim": { "branch": "master", "commit": "4be3c229fe932043fd83ad52fdf0ba9af7297789" }, "cmake-tools.nvim": { "branch": "master", "commit": "8853f796b0173f34689dd07c8bd654b8fb3f1dc1" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"editorconfig-vim": { "branch": "master", "commit": "8b7da79e9daee7a3f3a8d4fe29886b9756305aff" }, "editorconfig-vim": { "branch": "master", "commit": "8b7da79e9daee7a3f3a8d4fe29886b9756305aff" },
"fzf": { "branch": "master", "commit": "e28f5aa45baf20ffdba469e11a998d3016c8cb42" }, "fzf": { "branch": "master", "commit": "3ee1fc203406debab432dbf3cb67f37ea7cb3d30" },
"fzf.vim": { "branch": "master", "commit": "6f28c8c7bb551161a0315a76488522204f39c1f4" }, "fzf.vim": { "branch": "master", "commit": "0a80e43f9027ec64213d602dbb0b22d65a072ca8" },
"gruvbox-baby": { "branch": "main", "commit": "bd52e62d8134647090108189e69c8b3cd18bdbbf" }, "gruvbox-baby": { "branch": "main", "commit": "bd52e62d8134647090108189e69c8b3cd18bdbbf" },
"haskell-vim": { "branch": "master", "commit": "f35d02204b4813d1dbe8b0e98cc39701a4b8e15e" }, "haskell-vim": { "branch": "master", "commit": "f35d02204b4813d1dbe8b0e98cc39701a4b8e15e" },
"hledger-vim": { "branch": "master", "commit": "165eb483a10fd610bd9cad5d5246e457bf5fe285" }, "hledger-vim": { "branch": "master", "commit": "165eb483a10fd610bd9cad5d5246e457bf5fe285" },
"lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazy.nvim": { "branch": "main", "commit": "ebbf84eb23d796ffd92ad88b980d3cf89921add4" },
"lingua-franca.vim": { "branch": "main", "commit": "439b92a13744ee21cb3cd9c399e179efbcaa2967" }, "lingua-franca.vim": { "branch": "main", "commit": "439b92a13744ee21cb3cd9c399e179efbcaa2967" },
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
"neoformat": { "branch": "master", "commit": "b3b38589b39038dc12c2f5a59a828ed43439363a" }, "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" },
"nerdcommenter": { "branch": "master", "commit": "3f860f2d981547c18f2c9599e3c358ea488c3be4" }, "nerdcommenter": { "branch": "master", "commit": "7bb1f72e802a80e37bdda5f6906c69b5a93de1eb" },
"nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
"nvim-lspconfig": { "branch": "master", "commit": "ff97d376b1d22b2eaf9274605531babf0cd0cf21" }, "nvim-lspconfig": { "branch": "master", "commit": "74e14808cdb15e625449027019406e1ff6dda020" },
"nvim-treesitter": { "branch": "master", "commit": "e5a05ba5e298cc1e1dad8eb8095b8d4d89a7f793" }, "nvim-treesitter": { "branch": "master", "commit": "a80fe081b4c5890980561e0de2458f64aaffbfc7" },
"nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
"nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" }, "nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
"oil.nvim": { "branch": "master", "commit": "fcca212c2e966fc3dec1d4baf888e670631d25d1" }, "oil.nvim": { "branch": "master", "commit": "d3a365c950be31a0d46920ce4ff6f23e78939b67" },
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
"vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
"vim-llvm": { "branch": "master", "commit": "c5d6c6a9ef21df2a32aad0f3b5ca5389f92d06d1" }, "vim-llvm": { "branch": "master", "commit": "c5d6c6a9ef21df2a32aad0f3b5ca5389f92d06d1" },
"vim-nix": { "branch": "master", "commit": "e25cd0f2e5922f1f4d3cd969f92e35a9a327ffb0" }, "vim-nix": { "branch": "master", "commit": "e25cd0f2e5922f1f4d3cd969f92e35a9a327ffb0" },
"vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" }, "vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" },
"vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" }, "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" },
"vimtex": { "branch": "master", "commit": "93448dd2617c1407f66b08610db520ecb8a28073" } "vimtex": { "branch": "master", "commit": "366ba106795db13879fdbfb4d6e4b8e1d616b684" }
} }

View file

@ -1,11 +1,7 @@
return require('lazy').setup({ return require('lazy').setup({
-- theme -- theme
-- use {'morhetz/gruvbox', config = function() vim.cmd.colorscheme("gruvbox") end } -- use {'morhetz/gruvbox', config = function() vim.cmd.colorscheme("gruvbox") end }
{ 'luisiacc/gruvbox-baby', config = function() { 'luisiacc/gruvbox-baby', config = function() vim.cmd.colorscheme("gruvbox-baby") end },
-- Enable transparent mode
vim.g.gruvbox_baby_transparent_mode = 1
vim.cmd.colorscheme("gruvbox-baby")
end },
-- use 'drewtempelmeyer/palenight.vim' -- use 'drewtempelmeyer/palenight.vim'
{ 'stevedylandev/flexoki-nvim', name = 'flexoki', enabled = false, lazy = true}, { 'stevedylandev/flexoki-nvim', name = 'flexoki', enabled = false, lazy = true},
@ -75,7 +71,7 @@ return require('lazy').setup({
popup_border_style = "rounded", popup_border_style = "rounded",
enable_git_status = true, enable_git_status = true,
enable_diagnostics = true, enable_diagnostics = true,
--enable_normal_mode_for_inputs = true, -- Enable normal mode for input dialogs. enable_normal_mode_for_inputs = true, -- Enable normal mode for input dialogs.
open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, -- when opening files, do not use windows containing these filetypes or buftypes open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, -- when opening files, do not use windows containing these filetypes or buftypes
sort_case_insensitive = false, -- used when sorting files and directories in the tree sort_case_insensitive = false, -- used when sorting files and directories in the tree
sort_function = nil , -- use a custom function for sorting files and directories in the tree sort_function = nil , -- use a custom function for sorting files and directories in the tree
@ -86,18 +82,6 @@ return require('lazy').setup({
-- return a.type > b.type -- return a.type > b.type
-- end -- end
-- end , -- this sorts files and directories descendantly -- end , -- this sorts files and directories descendantly
event_handlers = {
{
event = "neo_tree_popup_input_ready",
---@param args { bufnr: integer, winid: integer }
handler = function(args)
vim.cmd("stopinsert")
vim.keymap.set("i", "<esc>", vim.cmd.stopinsert, { noremap = true, buffer = args.bufnr })
end,
}
},
default_component_configs = { default_component_configs = {
container = { container = {
enable_character_fade = true enable_character_fade = true

View file

@ -14,8 +14,7 @@ set $down j
set $up k set $up k
set $right l set $right l
# Your preferred terminal emulator # Your preferred terminal emulator
set $term wezterm set $term alacritty
# set $term alacritty
# Your preferred application launcher # Your preferred application launcher
# Note: pass the final command to swaymsg so that the resulting window can be opened # Note: pass the final command to swaymsg so that the resulting window can be opened
# on the original workspace that the command was run on. # on the original workspace that the command was run on.

View file

@ -1,60 +0,0 @@
-- Import the wezterm module
local wezterm = require 'wezterm'
-- Creates a config object which we will be adding our config to
local config = wezterm.config_builder()
config.enable_wayland = true
-- Find them here: https://wezfurlong.org/wezterm/colorschemes/index.html
-- config.color_scheme = 'Ayu Dark (Gogh)'
config.color_scheme = 'GruvboxDarkHard'
-- Choose your favourite font, make sure it's installed on your machine
config.font = wezterm.font({ family = 'Iosevka Medium' })
-- And a font size that won't have you squinting
config.font_size = 9
-- Slightly transparent and blurred background
config.window_background_opacity = 0.9
config.macos_window_background_blur = 30
-- Removes the title bar, leaving only the tab bar. Keeps
-- the ability to resize by dragging the window's edges.
-- On macOS, 'RESIZE|INTEGRATED_BUTTONS' also looks nice if
-- you want to keep the window controls visible and integrate
-- them into the tab bar.
config.window_decorations = 'RESIZE'
-- Sets the font for the window frame (tab bar)
config.window_frame = {
-- Berkeley Mono for me again, though an idea could be to try a
-- serif font here instead of monospace for a nicer look?
font = wezterm.font({ family = 'Iosevka Medium', weight = 'Bold' }),
font_size = 11,
}
wezterm.on('update-status', function(window)
-- Grab the utf8 character for the "powerline" left facing
-- solid arrow.
local SOLID_LEFT_ARROW = utf8.char(0xe0b2)
-- Grab the current window's configuration, and from it the
-- palette (this is the combination of your chosen colour scheme
-- including any overrides).
local color_scheme = window:effective_config().resolved_palette
local bg = color_scheme.background
local fg = color_scheme.foreground
window:set_right_status(wezterm.format({
-- First, we draw the arrow...
{ Background = { Color = 'none' } },
{ Foreground = { Color = bg } },
{ Text = SOLID_LEFT_ARROW },
-- Then we draw our text
{ Background = { Color = bg } },
{ Foreground = { Color = fg } },
{ Text = ' ' .. wezterm.hostname() .. ' ' },
}))
end)
-- Returns our config to be evaluated. We must always do this at the bottom of this file
return config