Compare commits
37 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 85fa00a2e1 | |||
|
1d558f3f7c
|
|||
| ddaeb1beff | |||
|
5e3867b227
|
|||
| 7f58c16441 | |||
|
2edc62ff13
|
|||
|
27fb719555
|
|||
| 5ab603b726 | |||
|
a3e09d0019
|
|||
|
ae895dc55f
|
|||
|
cb0645dd81
|
|||
| 0daf4eec9a | |||
|
59a83f550c
|
|||
| 6ceaf560ca | |||
|
553d748f91
|
|||
| fac89ff665 | |||
|
af42bdc7a3
|
|||
|
45ae50d7a5
|
|||
|
965de98adb
|
|||
| 53c39bb8f8 | |||
|
e1a06eee71
|
|||
|
8605bf7a6b
|
|||
| 8b275aac66 | |||
|
31806ca62d
|
|||
| 738dc4d8bd | |||
|
3fd7fba7f9
|
|||
|
56231797cc
|
|||
| b1cf8a9d7f | |||
|
1afbb9115f
|
|||
|
e0e2d99951
|
|||
|
a6034ee47a
|
|||
|
975bccfe5f
|
|||
|
9db2c9d76e
|
|||
|
8f1cc582e9
|
|||
| ae5276444e | |||
|
393c4ccfc5
|
|||
| 6dcbe4e7c7 |
Generated
+22
-21
@@ -8,11 +8,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775087534,
|
"lastModified": 1778716662,
|
||||||
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
|
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
|
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -28,11 +28,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1777004352,
|
"lastModified": 1780593650,
|
||||||
"narHash": "sha256-SV+9PgNwZ8jHVCjK6YaCBzaheLSW7cDnm5DpOYrD8Vw=",
|
"narHash": "sha256-CHo7k65YTL3HY+WQVedDTupji+LMgNlKCdrtRHZFAK4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "6012cf1fed3eba66115f3fd117b9be6bd2a15b2f",
|
"rev": "447fd9ff62501dae7206dfe180ee89f8de27b7d5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -43,11 +43,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776548001,
|
"lastModified": 1780243769,
|
||||||
"narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
|
"narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
|
"rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -66,11 +66,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1777051818,
|
"lastModified": 1780421606,
|
||||||
"narHash": "sha256-2tuHuYmcg8HQSYamI1FoLLVFFOSYK2Alqr/cGiVIfG4=",
|
"narHash": "sha256-ZRAMRXQE1UKBtpnPwwOqV8teaPDD/fdABvUXMjcyhow=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "b684241888d9271ab5196383e24098ad4400a372",
|
"rev": "b7521616f15ad73c6bec458d64ed7f06f4095edb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -87,11 +87,11 @@
|
|||||||
"noctalia-qs": "noctalia-qs"
|
"noctalia-qs": "noctalia-qs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776888984,
|
"lastModified": 1780371321,
|
||||||
"narHash": "sha256-Up2F/eoMuPUsZnPVYdH5TMHe1TBP2Ue1QuWd0vWZoxY=",
|
"narHash": "sha256-WCaU6npdMdjZSZHe3XATNDFijmzRnsV8V+iR80e5deg=",
|
||||||
"owner": "noctalia-dev",
|
"owner": "noctalia-dev",
|
||||||
"repo": "noctalia-shell",
|
"repo": "noctalia-shell",
|
||||||
"rev": "2c1808f9f8937fc0b82c54af513f7620fec56d71",
|
"rev": "3aab45a2f34fd47666b05892b95054952e788de1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -110,11 +110,11 @@
|
|||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776585574,
|
"lastModified": 1780194487,
|
||||||
"narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=",
|
"narHash": "sha256-M+YtjKCTkHrkplNaKVyaxfa8hAWjRF6wFOUBAZvxQ4U=",
|
||||||
"owner": "noctalia-dev",
|
"owner": "noctalia-dev",
|
||||||
"repo": "noctalia-qs",
|
"repo": "noctalia-qs",
|
||||||
"rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add",
|
"rev": "07398e12b54f194e3a2d47c87e3fd10b8eeaa27d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -133,15 +133,16 @@
|
|||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1774449309,
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
"narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "default",
|
"repo": "default",
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
"rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
|
"ref": "future-26.11",
|
||||||
"repo": "default",
|
"repo": "default",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
../../modules/nixos/audio.nix
|
../../modules/nixos/audio.nix
|
||||||
../../modules/nixos/bootloader.nix
|
../../modules/nixos/bootloader.nix
|
||||||
../../modules/nixos/calibre.nix
|
../../modules/nixos/calibre.nix
|
||||||
|
../../modules/nixos/claudecode.nix
|
||||||
../../modules/nixos/certificates.nix
|
../../modules/nixos/certificates.nix
|
||||||
../../modules/nixos/drives.nix
|
../../modules/nixos/drives.nix
|
||||||
../../modules/nixos/gnupg.nix
|
../../modules/nixos/gnupg.nix
|
||||||
@@ -20,6 +21,8 @@
|
|||||||
../../modules/nixos/protonvpn.nix
|
../../modules/nixos/protonvpn.nix
|
||||||
../../modules/nixos/services.nix
|
../../modules/nixos/services.nix
|
||||||
../../modules/nixos/settings.nix
|
../../modules/nixos/settings.nix
|
||||||
|
../../modules/nixos/stellarium.nix
|
||||||
|
../../modules/nixos/thunar.nix
|
||||||
../../modules/nixos/steam.nix
|
../../modules/nixos/steam.nix
|
||||||
../../modules/nixos/users.nix
|
../../modules/nixos/users.nix
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -13,9 +13,11 @@
|
|||||||
../../modules/nixos/noctalia.nix
|
../../modules/nixos/noctalia.nix
|
||||||
../../modules/nixos/openssh.nix
|
../../modules/nixos/openssh.nix
|
||||||
../../modules/nixos/packages.nix
|
../../modules/nixos/packages.nix
|
||||||
|
../../modules/nixos/protonvpn.nix
|
||||||
../../modules/nixos/sddm.nix
|
../../modules/nixos/sddm.nix
|
||||||
../../modules/nixos/services.nix
|
../../modules/nixos/services.nix
|
||||||
../../modules/nixos/settings.nix
|
../../modules/nixos/settings.nix
|
||||||
|
../../modules/nixos/stellarium.nix
|
||||||
../../modules/nixos/steam.nix
|
../../modules/nixos/steam.nix
|
||||||
../../modules/nixos/users.nix
|
../../modules/nixos/users.nix
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -2,10 +2,13 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
programs.nixvim = {
|
programs.nixvim = {
|
||||||
globals.mapleader = " ";
|
|
||||||
enable = true;
|
enable = true;
|
||||||
viAlias = false;
|
|
||||||
|
# set aliases
|
||||||
|
viAlias = true;
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
|
|
||||||
|
# default vim options
|
||||||
opts = {
|
opts = {
|
||||||
number = true;
|
number = true;
|
||||||
relativenumber = true;
|
relativenumber = true;
|
||||||
@@ -14,14 +17,81 @@
|
|||||||
expandtab = true;
|
expandtab = true;
|
||||||
incsearch = true;
|
incsearch = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# nvim mapleader for all command below
|
||||||
|
globals.mapleader = " ";
|
||||||
|
# set colorscheme to nord
|
||||||
colorschemes.nord.enable = true;
|
colorschemes.nord.enable = true;
|
||||||
|
|
||||||
|
# nvim plugins
|
||||||
|
plugins.indent-blankline.enable = true;
|
||||||
plugins.lualine.enable = true;
|
plugins.lualine.enable = true;
|
||||||
plugins.nix.enable = true;
|
plugins.nix.enable = true;
|
||||||
plugins.nvim-tree.enable = true;
|
plugins.nvim-tree.enable = true;
|
||||||
plugins.treesitter.enable = true;
|
|
||||||
plugins.telescope.enable = true;
|
|
||||||
plugins.web-devicons.enable = true;
|
plugins.web-devicons.enable = true;
|
||||||
plugins.indent-blankline.enable = true;
|
plugins.telescope = {
|
||||||
extraPlugins = [ pkgs.vimPlugins.plenary-nvim ];
|
enable = true;
|
||||||
|
keymaps = {
|
||||||
|
"<leader>ff" = "find_files";
|
||||||
|
"<leader>fg" = "live_grep";
|
||||||
|
"<leader>fb" = "buffers";
|
||||||
|
"<leader>fh" = "help_tags";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
plugins.lsp = {
|
||||||
|
enable = true;
|
||||||
|
servers.tinymist = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
formatterMode = "typstyle";
|
||||||
|
exportPdf = "onSave";
|
||||||
|
semanticTokens = "disable"; # treesitter handles highlighting better
|
||||||
|
};
|
||||||
|
};
|
||||||
|
servers.pyright.enable = true;
|
||||||
|
servers.ruff.enable = true;
|
||||||
|
keymaps.lspBuf = {
|
||||||
|
"<leader>K" = "hover";
|
||||||
|
"<leader>gd" = "definition";
|
||||||
|
"<leader>gr" = "references";
|
||||||
|
"<leader>f" = "format";
|
||||||
|
"<leader>rn" = "rename";
|
||||||
|
"<leader>ca" = "code_action";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
plugins.treesitter = {
|
||||||
|
enable = true;
|
||||||
|
settings.ensure_installed = [ "markdown" "markdown_inline" "typst" ];
|
||||||
|
};
|
||||||
|
plugins.typst-preview = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
open_cmd = "firefox %s";
|
||||||
|
dependencies_bin = {
|
||||||
|
tinymist = "tinymist";
|
||||||
|
websocat = null;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
plugins.typst-vim = {
|
||||||
|
enable = true;
|
||||||
|
settings.pdf_viewer = "zathura";
|
||||||
|
};
|
||||||
|
plugins.render-markdown = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
# render in normal mode, raw source in insert
|
||||||
|
render_modes = [ "n" "c" "t"];
|
||||||
|
pipe_table.preset = "round";
|
||||||
|
heading.width = "block";
|
||||||
|
file_types = [ "markdown" ];
|
||||||
|
completions.lsp.enabled = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# install dependencies
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
ripgrep
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,8 @@
|
|||||||
fastfetch
|
fastfetch
|
||||||
keepassxc
|
keepassxc
|
||||||
teamspeak6-client
|
teamspeak6-client
|
||||||
|
typst
|
||||||
|
zathura
|
||||||
];
|
];
|
||||||
|
|
||||||
# services and other software
|
# services and other software
|
||||||
@@ -16,5 +18,8 @@
|
|||||||
|
|
||||||
# browsers
|
# browsers
|
||||||
programs.chromium.enable = true;
|
programs.chromium.enable = true;
|
||||||
programs.firefox.enable = true;
|
programs.firefox = {
|
||||||
|
enable = true;
|
||||||
|
configPath = "${config.xdg.configHome}/mozilla/firefox";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{ config, lib, pkgs, inputs, ... }:
|
{ config, lib, pkgs, inputs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# configure z-shell to use omz with some plugins
|
# configure z-shell to use omz with some plugins
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
@@ -8,18 +8,21 @@
|
|||||||
syntaxHighlighting.enable = true;
|
syntaxHighlighting.enable = true;
|
||||||
oh-my-zsh = {
|
oh-my-zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# theme will be set below
|
# add git and agents as plugins
|
||||||
theme = "";
|
|
||||||
plugins = [ "git" "ssh-agent" "gpg-agent" ];
|
plugins = [ "git" "ssh-agent" "gpg-agent" ];
|
||||||
|
# everything here lands before `source $ZSH/oh-my-zsh.sh`
|
||||||
|
extraConfig = ''
|
||||||
|
# make omz faster on large repositories
|
||||||
|
DISABLE_UNTRACKED_FILES_DIRTY=true
|
||||||
|
|
||||||
|
# only display a fancy theme when glyphs are rendered
|
||||||
|
if [[ "$TERM" == "linux" || "$TERM" == "screen" ]]; then
|
||||||
|
ZSH_THEME="gentoo"
|
||||||
|
else
|
||||||
|
ZSH_THEME="agnoster"
|
||||||
|
fi
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
# only display a fancy theme when glyphs are rendered
|
|
||||||
initContent = lib.mkOrder 550 ''
|
|
||||||
if [[ "$TERM" == "linux" || "$TERM" == "screen" ]]; then
|
|
||||||
ZSH_THEME="gentoo"
|
|
||||||
else
|
|
||||||
ZSH_THEME="agnoster"
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# set important env vars
|
# set important env vars
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
claude-code
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -31,6 +31,9 @@
|
|||||||
options = "--delete-older-than 7d";
|
options = "--delete-older-than 7d";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# add trusted users (able to modify the nix store)
|
||||||
|
nix.settings.trusted-users = [ "root" "@wheel" ];
|
||||||
|
|
||||||
# allow unfree packages (steam, protonvpn, discord, etc.)
|
# allow unfree packages (steam, protonvpn, discord, etc.)
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
# install stellarium for stargazing and sky simulation
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
stellarium
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
# Enable Thunar
|
||||||
|
programs.thunar.enable = true;
|
||||||
|
|
||||||
|
# Install Tumbler thumbnailer service
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
tumbler
|
||||||
|
];
|
||||||
|
|
||||||
|
# Ensure Thunar can locate the thumbnailer extensions
|
||||||
|
environment.pathsToLink = [ "share/thumbnailers" ];
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user