leonv/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: leonv:173f6e446b3b9bbacfcc61c737c5a370e0bbaa79
Branches Tags
leonv:main
leonv:raspberrypi
leonv:nixos-darwin
..
compare: leonv:8632688d6c2979b7717c589fff332ee3a4f6446d
Branches Tags
leonv:main
leonv:raspberrypi
leonv:nixos-darwin

No commits in common. "173f6e446b3b9bbacfcc61c737c5a370e0bbaa79" and "8632688d6c2979b7717c589fff332ee3a4f6446d" have entirely different histories.
173f6e446b ... 8632688d6c

5 changed files with 107 additions and 99 deletions
Show stats Expand all files Collapse all files

162
common/vscode.nix
View file

@ -2,91 +2,103 @@
{ {
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
bbenoist.nix jdinhlife.gruvbox
vscodevim.vim
yzhang.markdown-all-in-one yzhang.markdown-all-in-one
haskell.haskell haskell.haskell
justusadam.language-haskell justusadam.language-haskell
maximedenes.vscoq maximedenes.vscoq
james-yu.latex-workshop james-yu.latex-workshop
bbenoist.nix
mkhl.direnv mkhl.direnv
catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc
valentjn.vscode-ltex valentjn.vscode-ltex
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
{ {
name = "agda-mode"; name = "theme-panda";
publisher = "banacorn"; publisher = "tinkertrain";
version = "0.4.7"; version = "1.3.0";
sha256 = "sha256-gNa3n16lP3ooBRvGaugTua4IXcIzpMk7jBYMJDQsY00="; sha256 = "sha256-ijOXoby3FHgDhF2sibXnGpkldKNPCoEXCY0Iw0ndUtw=";
} }
{ {
name = "yuck"; name = "agda-mode";
publisher = "eww-yuck"; publisher = "banacorn";
version = "0.0.3"; version = "0.4.7";
sha256 = "sha256-DITgLedaO0Ifrttu+ZXkiaVA7Ua5RXc4jXQHPYLqrcM="; sha256 = "sha256-gNa3n16lP3ooBRvGaugTua4IXcIzpMk7jBYMJDQsY00=";
} }
{
name = "yuck";
publisher = "eww-yuck";
version = "0.0.3";
sha256 = "sha256-DITgLedaO0Ifrttu+ZXkiaVA7Ua5RXc4jXQHPYLqrcM=";
}
];
userSettings = {
"agdaMode.connection.agdaLanguageServer" = false;
"agdaMode.highlighting.getHighlightWithThemeColors" = false;
"editor.unicodeHighlight.ambiguousCharacters" = false;
"editor.semanticHighlighting.enabled" = true;
"workbench.colorTheme" = "Catppuccin Mocha";
# "workbench.iconTheme" = "catppuccin-mocha";
"haskell.manageHLS" = "PATH";
"editor.fontFamily" = "Berkeley Mono, DejaVu Sans Mono, monospace, Unifont";
"terminal.integrated.minimumContrastRatio" = 1;
"terminal.integrated.shellIntegration.enabled" = false;
"terminal.integrated.profiles.linux" = {
bash = null;
zsh = {
path = "/run/current-system/sw/bin/zsh";
icon = "terminal-linux";
};
};
"terminal.integrated.defaultProfile.linux" = "zsh";
"vim.handleKeys" = {
"<C-c>" = false;
"<C-x>" = false;
"<C-s>" = false;
"<C-v>" = false;
"<C-a>" = false;
"<C-d>" = false;
};
"vim.overrideCopy" = false;
"window.titleBarStyle" = "custom";
"window.customMenuBarAltFocus" = false;
"window.enableMenuBarMnemonics" = false;
#"ltex.additionalRules.motherTongue" = "de-DE";
#"ltex.language" = "de-DE";
#"ltex.ltex-ls.path" = "/etc/profiles/per-user/leonv/";
"ltex.java.path" = "/etc/profiles/per-user/leonv/";
#"ltex.sentenceCacheSize" = 50000;
#"ltex.java.maximumHeapSize" = 8192;
"editor.tabSize" = 2;
"explorer.excludeGitIgnore" = true;
"files.exclude" = {
"**/*.agdai" = true;
};
# try to fix agda suggestions:
"editor.acceptSuggestionOnCommitCharacter" = false;
"editor.minimap.enabled" = false;
"editor.autoClosingOvertype" = "never";
"editor.autoClosingBrackets" = "never";
"editor.accessibilitySupport" = "off";
};
keybindings = [
{
key = "ctrl+shift+v";
command = "extension.vim_ctrl+v";
when = "editorTextFocus && vim.active && !inDebugRepl";
}
{
key = "ctrl+shift+=";
command = "editor.action.fontZoomIn";
when = "";
}
{
key = "ctrl+shift+-";
command = "editor.action.fontZoomOut";
when = "";
}
]; ];
userSettings = {
"agdaMode.connection.agdaLanguageServer" = false;
"agdaMode.highlighting.getHighlightWithThemeColors" = false;
"editor.unicodeHighlight.ambiguousCharacters" = false;
"editor.semanticHighlighting.enabled" = true;
"workbench.colorTheme" = "Catppuccin Mocha";
"haskell.manageHLS" = "PATH";
"editor.fontFamily" = "Berkeley Mono, DejaVu Sans Mono, monospace, Unifont";
"terminal.integrated.minimumContrastRatio" = 1;
"terminal.integrated.shellIntegration.enabled" = false;
"terminal.integrated.profiles.linux" = {
bash = null;
zsh = {
path = "/run/current-system/sw/bin/zsh";
icon = "terminal-linux";
};
};
"terminal.integrated.defaultProfile.linux" = "zsh";
"vim.handleKeys" = {
"<C-c>" = false;
"<C-x>" = false;
"<C-s>" = false;
"<C-v>" = false;
"<C-a>" = false;
"<C-d>" = false;
};
"vim.overrideCopy" = false;
"window.titleBarStyle" = "custom";
"window.customMenuBarAltFocus" = false;
"window.enableMenuBarMnemonics" = false;
"ltex.sentenceCacheSize" = 50000;
"ltex.java.maximumHeapSize" = 8192;
"editor.tabSize" = 2;
"explorer.excludeGitIgnore" = true;
"files.exclude" = {
"**/*.agdai" = true;
};
# try to fix agda suggestions:
"editor.acceptSuggestionOnCommitCharacter" = false;
"editor.minimap.enabled" = false;
"editor.autoClosingOvertype" = "never";
"editor.autoClosingBrackets" = "never";
"editor.accessibilitySupport" = "off";
};
keybindings = [
{
key = "ctrl+shift+v";
command = "extension.vim_ctrl+v";
when = "editorTextFocus && vim.active && !inDebugRepl";
}
{
key = "ctrl+shift+=";
command = "editor.action.fontZoomIn";
when = "";
}
{
key = "ctrl+shift+-";
command = "editor.action.fontZoomOut";
when = "";
}
];
}; };
} }

36
flake.lock
View file

@ -20,11 +20,11 @@
"cask-fonts": { "cask-fonts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1708820650, "lastModified": 1708274562,
"narHash": "sha256-EUVDLH/H2osewsZvJs+1Z0BEQvJnqTNCZ1h1eZepCMg=", "narHash": "sha256-YVdflhd8BgKRs/rKlRx3D3hOhO5c1vs1DHDGOxfY4bE=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask-fonts", "repo": "homebrew-cask-fonts",
"rev": "ad27d786cde117b31c0d79aa260759703af1fa61", "rev": "16aa7909152e49d7016c8811d98cf70c83d46cb0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,11 +55,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708737761, "lastModified": 1708231718,
"narHash": "sha256-sR/1cYjpgr71ZSrt6Kp5Dg4Ul3mo6pZIG400tuzYks8=", "narHash": "sha256-IZdieFWvhBkxoOFMDejqLUYqD94WN6k0YSpw0DFy+4g=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "bbde06bed1b72eddff063fa42f18644e90a0121e", "rev": "0e6857fa1d632637488666c08e7b02c08e3178f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -128,11 +128,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708806879, "lastModified": 1708451036,
"narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=", "narHash": "sha256-tgZ38NummEdnXvxj4D0StHBzXgceAw8CptytHljH790=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a", "rev": "517601b37c6d495274454f63c5a483c8e3ca6be1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -144,11 +144,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1708886352, "lastModified": 1708497918,
"narHash": "sha256-MOdmmrm8Ay225cMJrfYdlEIeRhzuOTsokGmiUjzjjy4=", "narHash": "sha256-qd/VOBCZ4OCzO8uJ5ijOkR3LLkEOMhNySpTtAHubHNI=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "e6791a3e7c5bef5f3b073736246047a845558d4c", "rev": "f745777bfa3e7c6033d98f651f02a39f54eb939d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,11 +160,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1708884294, "lastModified": 1708501733,
"narHash": "sha256-tyitjFC8C+QZpwIVf2kF3GGP3nQ1vMkQcpQZBGNgUUg=", "narHash": "sha256-B+r/5SugXdw6+y3CejQdgI2qZLDQB3ROicoKOZX0RVE=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "80e175640fb8f432d91bf520a7b37eb3433fbfc9", "rev": "a99f1e03226b7c72cbf5d62b56364999be0a764f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -341,11 +341,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1708807242, "lastModified": 1708296515,
"narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
gunther/configuration.nix
View file

@ -158,7 +158,7 @@
socat socat
]; ];
system.stateVersion = "24.05"; system.stateVersion = "23.11";
# NFS setup # NFS setup
services.rpcbind.enable = true; # needed for NFS services.rpcbind.enable = true; # needed for NFS

3
gunther/leonv.nix
View file

@ -6,7 +6,7 @@
./../common/eww ./../common/eww
]; ];
/* The home.stateVersion option does not have a default and must be set */ /* The home.stateVersion option does not have a default and must be set */
home.stateVersion = "24.05"; home.stateVersion = "23.11";
home.username = "leonv"; home.username = "leonv";
home.homeDirectory = "/home/leonv"; home.homeDirectory = "/home/leonv";
@ -97,7 +97,6 @@
ls = "eza"; ls = "eza";
ll = "eza -l"; ll = "eza -l";
l = "eza -lah"; l = "eza -lah";
code = "codium";
}; };
initExtra = '' initExtra = ''
function rebuild () { function rebuild () {

3
shinx/leonvatthauer.nix
View file

@ -58,9 +58,6 @@
}; };
programs.zsh = { programs.zsh = {
enable = true; enable = true;
shellAliases = {
code = "codium";
};
oh-my-zsh = { oh-my-zsh = {
enable = true; enable = true;
plugins = [ "git" ]; plugins = [ "git" ];