Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
a2118ac486
|
|||
|
a9f73167f3
|
Generated
+80
-20
@@ -8,11 +8,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778716662,
|
||||
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
|
||||
"lastModified": 1775087534,
|
||||
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
|
||||
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -28,11 +28,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781129616,
|
||||
"narHash": "sha256-Hl0Pz/QIKpePSU7SdK3BMe5VNmUhFvfWyg57GyawxzE=",
|
||||
"lastModified": 1777004352,
|
||||
"narHash": "sha256-SV+9PgNwZ8jHVCjK6YaCBzaheLSW7cDnm5DpOYrD8Vw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "7dbd305f8b81050f223f00bcfbc8a6b74e048806",
|
||||
"rev": "6012cf1fed3eba66115f3fd117b9be6bd2a15b2f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -43,11 +43,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1780749050,
|
||||
"narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
|
||||
"lastModified": 1776548001,
|
||||
"narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
|
||||
"rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -66,11 +66,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781034432,
|
||||
"narHash": "sha256-+UuS36un3lXLtKsGCYQnOn51hDhB+dZ1SHoHXClnV/0=",
|
||||
"lastModified": 1777051818,
|
||||
"narHash": "sha256-2tuHuYmcg8HQSYamI1FoLLVFFOSYK2Alqr/cGiVIfG4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "e9fbbd56eab78751ba4c166c31a1667042528ced",
|
||||
"rev": "b684241888d9271ab5196383e24098ad4400a372",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -83,14 +83,15 @@
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
],
|
||||
"noctalia-qs": "noctalia-qs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781181712,
|
||||
"narHash": "sha256-F3r0Ipj0lKU+iEP6mR+BeI93QYN2MOS9oOgDo3S0SUc=",
|
||||
"lastModified": 1776888984,
|
||||
"narHash": "sha256-Up2F/eoMuPUsZnPVYdH5TMHe1TBP2Ue1QuWd0vWZoxY=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"rev": "f319b3ad69eaa470f601cd37ed89cac69344656e",
|
||||
"rev": "2c1808f9f8937fc0b82c54af513f7620fec56d71",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -99,6 +100,29 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"noctalia-qs": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"noctalia",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_2",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1776585574,
|
||||
"narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-qs",
|
||||
"rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-qs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
@@ -109,19 +133,55 @@
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1774449309,
|
||||
"narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"ref": "future-26.11",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default-linux",
|
||||
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default-linux",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"noctalia",
|
||||
"noctalia-qs",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1775636079,
|
||||
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
../../modules/nixos/audio.nix
|
||||
../../modules/nixos/bootloader.nix
|
||||
../../modules/nixos/calibre.nix
|
||||
../../modules/nixos/claudecode.nix
|
||||
../../modules/nixos/certificates.nix
|
||||
../../modules/nixos/drives.nix
|
||||
../../modules/nixos/gnupg.nix
|
||||
@@ -21,8 +20,6 @@
|
||||
../../modules/nixos/protonvpn.nix
|
||||
../../modules/nixos/services.nix
|
||||
../../modules/nixos/settings.nix
|
||||
../../modules/nixos/stellarium.nix
|
||||
../../modules/nixos/thunar.nix
|
||||
../../modules/nixos/steam.nix
|
||||
../../modules/nixos/users.nix
|
||||
];
|
||||
|
||||
@@ -13,11 +13,9 @@
|
||||
../../modules/nixos/noctalia.nix
|
||||
../../modules/nixos/openssh.nix
|
||||
../../modules/nixos/packages.nix
|
||||
../../modules/nixos/protonvpn.nix
|
||||
../../modules/nixos/sddm.nix
|
||||
../../modules/nixos/services.nix
|
||||
../../modules/nixos/settings.nix
|
||||
../../modules/nixos/stellarium.nix
|
||||
../../modules/nixos/steam.nix
|
||||
../../modules/nixos/users.nix
|
||||
];
|
||||
|
||||
@@ -3,12 +3,8 @@
|
||||
{
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
|
||||
# set aliases
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
|
||||
# default vim options
|
||||
opts = {
|
||||
number = true;
|
||||
relativenumber = true;
|
||||
@@ -18,50 +14,41 @@
|
||||
incsearch = true;
|
||||
};
|
||||
|
||||
# nvim mapleader for all command below
|
||||
# nvim mapleader
|
||||
globals.mapleader = " ";
|
||||
# set colorscheme to nord
|
||||
# colorscheme
|
||||
colorschemes.nord.enable = true;
|
||||
|
||||
# nvim plugins
|
||||
plugins.indent-blankline.enable = true;
|
||||
plugins.lualine.enable = true;
|
||||
plugins.nix.enable = true;
|
||||
plugins.nvim-tree.enable = true;
|
||||
plugins.web-devicons.enable = true;
|
||||
plugins.telescope = {
|
||||
enable = true;
|
||||
keymaps = {
|
||||
"<leader>ff" = "find_files";
|
||||
"<leader>fg" = "live_grep";
|
||||
"<leader>fb" = "buffers";
|
||||
"<leader>fh" = "help_tags";
|
||||
};
|
||||
};
|
||||
plugins.lsp = {
|
||||
enable = true;
|
||||
# lsp for typst
|
||||
servers.tinymist = {
|
||||
enable = true;
|
||||
settings = {
|
||||
formatterMode = "typstyle";
|
||||
exportPdf = "onSave";
|
||||
semanticTokens = "disable"; # treesitter handles highlighting better
|
||||
semanticTokens = "disable"; # treesitter handles highlighting better
|
||||
};
|
||||
};
|
||||
servers.pyright.enable = true;
|
||||
servers.ruff.enable = true;
|
||||
# minimal lsp keymaps
|
||||
keymaps.lspBuf = {
|
||||
"<leader>K" = "hover";
|
||||
"<leader>gd" = "definition";
|
||||
"<leader>gr" = "references";
|
||||
"K" = "hover";
|
||||
"gd" = "definition";
|
||||
"gr" = "references";
|
||||
"<leader>f" = "format";
|
||||
"<leader>rn" = "rename";
|
||||
"<leader>ca" = "code_action";
|
||||
};
|
||||
};
|
||||
plugins.nix.enable = true;
|
||||
plugins.nvim-tree.enable = true;
|
||||
plugins.telescope.enable = true;
|
||||
plugins.treesitter = {
|
||||
enable = true;
|
||||
settings.ensure_installed = [ "markdown" "markdown_inline" "typst" ];
|
||||
settings.ensure_installed = [ "typst" ];
|
||||
};
|
||||
plugins.typst-preview = {
|
||||
enable = true;
|
||||
@@ -77,21 +64,8 @@
|
||||
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;
|
||||
};
|
||||
};
|
||||
};
|
||||
plugins.web-devicons.enable = true;
|
||||
|
||||
# install dependencies
|
||||
home.packages = with pkgs; [
|
||||
ripgrep
|
||||
];
|
||||
extraPlugins = [ pkgs.vimPlugins.plenary-nvim ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -18,8 +18,5 @@
|
||||
|
||||
# browsers
|
||||
programs.chromium.enable = true;
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
configPath = "${config.xdg.configHome}/mozilla/firefox";
|
||||
};
|
||||
programs.firefox.enable = true;
|
||||
}
|
||||
|
||||
@@ -8,21 +8,18 @@
|
||||
syntaxHighlighting.enable = true;
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
# add git and agents as plugins
|
||||
# theme will be set below
|
||||
theme = "";
|
||||
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
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
claude-code
|
||||
];
|
||||
}
|
||||
@@ -32,9 +32,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
# add trusted users (able to modify the nix store)
|
||||
nix.settings.trusted-users = [ "root" "@wheel" ];
|
||||
|
||||
# allow unfree packages (steam, protonvpn, discord, etc.)
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# install stellarium for stargazing and sky simulation
|
||||
environment.systemPackages = with pkgs; [
|
||||
stellarium
|
||||
];
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
{ 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