diesdas
This commit is contained in:
parent
5fabec3fa3
commit
4fb0d3aa6c
17 changed files with 75 additions and 34 deletions
16
flake.lock
generated
16
flake.lock
generated
|
|
@ -28,32 +28,32 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726989464,
|
||||
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
|
||||
"lastModified": 1734366194,
|
||||
"narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
|
||||
"rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-24.05",
|
||||
"ref": "release-24.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1734529975,
|
||||
"narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=",
|
||||
"lastModified": 1734323986,
|
||||
"narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a",
|
||||
"rev": "394571358ce82dff7411395829aa6a3aad45b907",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.05",
|
||||
"ref": "nixos-24.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
|
|||
12
flake.nix
12
flake.nix
|
|
@ -2,8 +2,8 @@
|
|||
description = "Complete system and home config";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
||||
home-manager.url = "github:nix-community/home-manager/release-24.11";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nur.url = "github:nix-community/nur";
|
||||
};
|
||||
|
|
@ -79,28 +79,28 @@
|
|||
|
||||
homeConfigurations = {
|
||||
till = home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux.extend inputs.nur.overlay;
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux.extend inputs.nur.overlays.default;
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./home
|
||||
];
|
||||
};
|
||||
"till@romulus" = home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux.extend inputs.nur.overlay;
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux.extend inputs.nur.overlays.default;
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./home/slim-desktop.nix
|
||||
];
|
||||
};
|
||||
"till@arielle" = home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux.extend inputs.nur.overlay;
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./home/minimal.nix
|
||||
];
|
||||
};
|
||||
alt = home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux.extend inputs.nur.overlay;
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux.extend inputs.nur.overlays.default;
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./home/alt.nix
|
||||
|
|
|
|||
|
|
@ -121,5 +121,15 @@ in
|
|||
url = "https://crowd.server.uni-frankfurt.de/rest/calendar-services/1.0/calendar/export/subcalendar/private/f3087e14d058267065ebbdf43b096cb31517e9ea.ics";
|
||||
};
|
||||
};
|
||||
"grid" = calDefaults // {
|
||||
khal.enable = true;
|
||||
khal.color = "light green";
|
||||
remote = {
|
||||
type = "caldav";
|
||||
url = "https://cloud.gridisnotajournal.de/remote.php/dav/calendars/till/grid/";
|
||||
passwordCommand = [ "secret-tool" "lookup" "server" "cloud.gridisnotajournal.de" "account" "till" ];
|
||||
userName = "till";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,9 +10,7 @@
|
|||
tdesktop
|
||||
|
||||
# office
|
||||
okular
|
||||
xournalpp
|
||||
zoom-us
|
||||
pdfpc
|
||||
|
||||
# text publishing
|
||||
|
|
@ -22,7 +20,6 @@
|
|||
|
||||
# graphics
|
||||
gimp
|
||||
godot_4
|
||||
inkscape
|
||||
|
||||
# web
|
||||
|
|
|
|||
|
|
@ -39,12 +39,11 @@
|
|||
name = config.home.username;
|
||||
isDefault = true;
|
||||
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||
ublock-origin
|
||||
linkhints
|
||||
auto-tab-discard
|
||||
keepassxc-browser
|
||||
libredirect
|
||||
vimium
|
||||
tampermonkey
|
||||
ublock-origin
|
||||
vimium
|
||||
zotero-connector
|
||||
];
|
||||
search = {
|
||||
|
|
@ -75,7 +74,7 @@
|
|||
definedAliases = [ "@no" ];
|
||||
};
|
||||
"Home manager options" = {
|
||||
urls = [{ template = "https://mipmip.github.io/home-manager-option-search/?query={searchTerms}"; }];
|
||||
urls = [{ template = "https://home-manager-options.extranix.com/?query={searchTerms}&release=release-24.11"; }];
|
||||
iconUpdateURL = "https://mipmip.github.io/home-manager-option-search/images/favicon.png";
|
||||
updateInterval = 24 * 60 * 60 * 1000;
|
||||
definedAliases = [ "@hm" ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
{
|
||||
home.pointerCursor = {
|
||||
name = "Adwaita";
|
||||
package = pkgs.gnome.adwaita-icon-theme;
|
||||
package = pkgs.adwaita-icon-theme;
|
||||
size = 32;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@
|
|||
videos = "${config.home.homeDirectory}/media/vid";
|
||||
documents = "${config.home.homeDirectory}/misc";
|
||||
templates = "${config.xdg.dataHome}/templates";
|
||||
publicShare = "${config.home.homeDirectory}/box";
|
||||
desktop = null;
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
|
|
@ -37,6 +39,7 @@
|
|||
imports = [
|
||||
./fish.nix
|
||||
./tmux
|
||||
./vifm
|
||||
./nvim
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -97,6 +97,7 @@
|
|||
nnoremap <leader>se :UltiSnipsEdit!<return>
|
||||
'';
|
||||
}
|
||||
vifm-vim
|
||||
{
|
||||
plugin = vim-astro;
|
||||
config = ''
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ lua <<EOF
|
|||
|
||||
local nvim_lsp = require('lspconfig')
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
local servers = { "r_language_server", "tsserver", "astro", "texlab" }
|
||||
local servers = { "r_language_server", "ts_ls", "astro", "texlab" }
|
||||
for _, lsp in ipairs(servers) do
|
||||
nvim_lsp[lsp].setup {
|
||||
on_attach = on_attach,
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
zathura
|
||||
pdftk
|
||||
imagemagick
|
||||
feh
|
||||
ghostscript
|
||||
drawing
|
||||
castget
|
||||
|
|
@ -52,14 +53,13 @@
|
|||
bundix
|
||||
nodejs
|
||||
yarn
|
||||
android-studio
|
||||
netlify-cli
|
||||
appimage-run
|
||||
|
||||
# secrets
|
||||
libsecret
|
||||
keepassxc
|
||||
yubikey-manager-qt
|
||||
|
||||
];
|
||||
|
||||
imports = [
|
||||
|
|
@ -72,6 +72,7 @@
|
|||
];
|
||||
|
||||
programs.taskwarrior = {
|
||||
package = pkgs.taskwarrior3;
|
||||
enable = true;
|
||||
dataLocation = "${config.xdg.dataHome}/taskwarrior/tasks";
|
||||
colorTheme = "light-256";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [ nnn ];
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
escapeTime = 0;
|
||||
|
|
@ -27,7 +26,7 @@
|
|||
bind C-c command-prompt -I "#{b:pane_current_path}" "rename-window '%%'"
|
||||
|
||||
# Layouts
|
||||
bind f source-file ~/.config/tmux/nnn.conf
|
||||
bind f source-file ~/.config/tmux/vifm.conf
|
||||
bind R source-file ~/.config/tmux/rloft.conf
|
||||
bind J source-file ~/.config/tmux/jekyll.conf
|
||||
|
||||
|
|
@ -50,7 +49,7 @@
|
|||
set-option -g focus-events on
|
||||
'';
|
||||
};
|
||||
xdg.configFile."tmux/nnn.conf".source = ./nnn.conf;
|
||||
xdg.configFile."tmux/vifm.conf".source = ./vifm.conf;
|
||||
xdg.configFile."tmux/rloft.conf".source = ./rloft.conf;
|
||||
xdg.configFile."tmux/jekyll.conf".source = ./jekyll.conf;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
new-window -c '#{pane_current_path}' nnn
|
||||
rename-window 'nnn'
|
||||
1
home/tmux/vifm.conf
Normal file
1
home/tmux/vifm.conf
Normal file
|
|
@ -0,0 +1 @@
|
|||
new-window -c '#{pane_current_path}' vifm
|
||||
13
home/vifm/default.nix
Normal file
13
home/vifm/default.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.vifm = {
|
||||
enable = true;
|
||||
extraConfig = "
|
||||
colorscheme light
|
||||
set vicmd=nvim
|
||||
filetype * xdg-open
|
||||
";
|
||||
};
|
||||
xdg.configFile."vifm/colors/light.vifm".source = ./light.vifm;
|
||||
}
|
||||
20
home/vifm/light.vifm
Normal file
20
home/vifm/light.vifm
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
highlight clear
|
||||
|
||||
highlight Win cterm=none ctermfg=black ctermbg=default
|
||||
highlight Directory cterm=none ctermfg=cyan ctermbg=default
|
||||
highlight Link cterm=none ctermfg=yellow ctermbg=default
|
||||
highlight BrokenLink cterm=none ctermfg=white ctermbg=red
|
||||
highlight Socket cterm=none ctermfg=red ctermbg=default
|
||||
highlight Device cterm=none ctermfg=red ctermbg=default
|
||||
highlight Fifo cterm=none ctermfg=black ctermbg=cyan
|
||||
highlight Executable cterm=none ctermfg=green ctermbg=default
|
||||
highlight Selected cterm=bold ctermfg=magenta ctermbg=default
|
||||
highlight CurrLine cterm=bold ctermfg=white ctermbg=magenta
|
||||
highlight TopLine cterm=bold ctermfg=magenta ctermbg=default
|
||||
highlight TopLineSel cterm=bold ctermfg=magenta ctermbg=white
|
||||
highlight StatusLine cterm=bold ctermfg=magenta ctermbg=white
|
||||
"highlight WildMenu cterm=underline,reverse ctermfg=white ctermbg=black
|
||||
highlight CmdLine cterm=bold ctermfg=magenta ctermbg=default
|
||||
"highlight ErrorMsg cterm=none ctermfg=red ctermbg=black
|
||||
highlight Border cterm=none ctermfg=default ctermbg=default
|
||||
"highlight JobLine cterm=bold,reverse ctermfg=black ctermbg=white
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
snapshot_dir = "/btrbk_snapshots";
|
||||
target = "/run/media/till/backup/${config.networking.hostName}";
|
||||
target_preserve_min = "latest";
|
||||
target_preserve = "10d 10w *m";
|
||||
target_preserve = "10d 10w 24m";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,13 +7,12 @@
|
|||
services.gnome.gnome-browser-connector.enable = true;
|
||||
environment.gnome.excludePackages = (with pkgs; [
|
||||
gnome-tour
|
||||
]) ++ (with pkgs.gnome; [
|
||||
geary
|
||||
yelp
|
||||
gnome-contacts
|
||||
gnome-initial-setup
|
||||
]);
|
||||
environment.systemPackages = with pkgs.gnome; [
|
||||
environment.systemPackages = with pkgs; [
|
||||
gnome-sound-recorder
|
||||
gnome-tweaks
|
||||
gnome-boxes
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue