fixups to get to a usable system

This commit is contained in:
Sebastian Moser
2023-10-28 19:04:42 +00:00
parent 112ef46fd2
commit 02ae59ea1a
16 changed files with 568 additions and 77 deletions

View File

@@ -1,5 +1,5 @@
{ pkgs, workDir, confDir, secretsDir, ... }:
{ pkgs, workDir, confDir, secretsDir, inputs, ... }:
{
imports = [
@@ -8,7 +8,7 @@
./programms/alacritty.nix
./programms/bash.nix
./programms/emacs.nix
./programms/rofi.nix
./programms/rofi/default.nix
./programms/zathura.nix
./programms/ssh.nix
./programms/neovim.nix
@@ -39,6 +39,7 @@
home.file = {
".config/rclone".source = config.lib.file.mkOutOfStoreSymlink "${secretsDir}/rclone-conf";
".xmobarrc".source = "${confDir}/misc/xmobar.hs";
};
};
@@ -103,6 +104,8 @@
lolcat
android-tools
inputs.firefox.packages.${pkgs.system}.firefox-nightly-bin
# python....
(python310.withPackages (p: with p; [
pandas
@@ -132,7 +135,8 @@
# xmonad
services.xserver.windowManager.xmonad = {
enable = true;
config = builtins.readFile ../misc/xmobar.hs;
config = ../misc/xmonad.hs;
#config = "${confDir}/misc/xmo";
enableContribAndExtras = true;
extraPackages = hpkgs: [
hpkgs.xmobar

View File

@@ -1,6 +1,6 @@
{ ... }:
{
home-manager.users.me.programms.alacritty = {
home-manager.users.me.programs.alacritty = {
enable = true;
settings = {
font = {
@@ -100,9 +100,9 @@
{ key = "V"; mods = "Control|Shift"; action = "Paste"; }
{ key = "C"; mods = "Control|Shift"; action = "Copy"; }
{ key = "J"; mods = "Control"; chars = ''\x1b\x5b\x42''; }
{ key = "K"; mods = "Control"; chars = ''x1b\x5b\x41''; }
{ key = "H"; mods = "Control"; chars = ''x1b\x5b\x44''; }
{ key = "L"; mods = "Control"; chars = ''x1b\x5b\x43''; }
{ key = "K"; mods = "Control"; chars = ''\x1b\x5b\x41''; }
{ key = "H"; mods = "Control"; chars = ''\x1b\x5b\x44''; }
{ key = "L"; mods = "Control"; chars = ''\x1b\x5b\x43''; }
];
};
};

View File

@@ -7,7 +7,7 @@
historyFile = "${persistentDir}/bash-history";
historyFileSize = 100000;
historyControl = "ignoredups";
historyControl = [ "ignoredups" ];
historyIgnore = [
"ls"
"cd"
@@ -28,17 +28,23 @@
];
sessionVariables = {
# this does not work aparently....
# is needed to that ssh works
TREM = "xterm";
# my prompt
PS1 = ''\[\033[01;34m\]\W\[\033[00m\]\[\033[01;32m\]\[\033[00m\] '';
TEST = "hiiiiiiiiiiiiiiiiiiiiiiiiiii";
HIII = "hiiiiiiiiiiiiiiiiiiiiii";
};
shellAliases = {
shutdown = "echo try harder.... xD";
npw = "nmcli c up pw";
nixre = "sd nixos-rebuild switch --flake ~/work/config/nix --impure";
nixre = "sd nixos-rebuild switch --flake ~/work/config/ --impure";
flex = "neofetch | lolcat";
kwoche = "curl https://kalenderwoche.celll.net/?api=1; echo";
psg = "ps -e | grep";
@@ -62,6 +68,12 @@
};
bashrcExtra = ''
export TREM="xterm"
# my prompt
export PS1="\[\033[01;34m\]\W\[\033[00m\]\[\033[01;32m\]\[\033[00m\] "
# If not running interactively, don't do anything
case $- in
*i*) ;;

View File

@@ -1,6 +1,6 @@
{ inputs, ... }:
{
home-manager.users.me.programms.emcas = {
enable = true;
};
#home-manager.users.me.programs.emcas = {
#enable = true;
#};
}

View File

@@ -1,11 +1,11 @@
{ ... }:
{
home-manager.users.me.programms.git = {
home-manager.users.me.programs.git = {
enable = true;
userName = "Sebastian Moser";
userEmail = "sewi.moser@gmail.com";
userEmail = "me@c2vi.dev";
extraConfig.core.editor = "nvim";
extraConfig.core.excludesfile = "gitignore";
extraConfig.core.excludesfile = "~/.config/git/gitignore";
};
}

View File

@@ -3,7 +3,7 @@
home-manager.users.me.programs.lf = {
package = pkgs.lf.overrideAttrs (final: prev: {
patches = (prev.patches or [ ]) ++ [
lib/patches/lf-filter.patch
./lf-filter.patch
];
checkPhase = "";
});
@@ -34,5 +34,5 @@
ee = "editor-open";
V = ''$${pkgs.bat}/bin/bat --paging=always --theme=gruvbox "$f"'';
};
};
}

View File

@@ -1,6 +1,6 @@
{ pkgs, ... }:
{
home-manager.users.me.programms.neovim = {
home-manager.users.me.programs.neovim = {
enable = true;
withPython3 = true;
withNodeJs = true;

View File

@@ -1,14 +0,0 @@
{ ... }:
{
home-manager.users.me.programs.rofi = {
enable = true;
theme = "Ark-Dark by leofa";
extraConfig = ''
modi: "run,filebrowser";
color-normal: "#1c2023, #919ba0, #1c2023, #a4a4a4, #1c2023";
color-urgent: "argb:00000000, #f43753, argb:00000000, argb:00000000, #e29a49";
color-active: "argb:00000000, #49bbfb, argb:00000000, argb:00000000, #e29a49";
color-window: "#1c2023, #919ba0, #1c2023";
'';
};
}

View File

@@ -0,0 +1,14 @@
{ ... }:
{
home-manager.users.me.programs.rofi = {
enable = true;
theme = "Arc-Dark";
extraConfig = {
modi = "run,filebrowser";
color-normal = "#1c2023, #919ba0, #1c2023, #a4a4a4, #1c2023";
color-urgent = "argb:00000000, #f43753, argb:00000000, argb:00000000, #e29a49";
color-active = "argb:00000000, #49bbfb, argb:00000000, argb:00000000, #e29a49";
color-window = "#1c2023, #919ba0, #1c2023";
};
};
}

View File

@@ -1,12 +1,13 @@
{ secretsDir, ... }:
{
home-manager.users.me.programms.ssh = {
home-manager.users.me.programs.ssh = {
enable = true;
includes = [ "./current_rpi_config" ];
/*
matchBlocks = {
hpm = {
hostame = "192.168.1.56";
use = "root";
user = "root";
};
servers = {
@@ -39,9 +40,10 @@
identityFIle = "${secretsDir}/private-key-ocib";
};
};
*/
};
home-manager.users.me.home.".ssh/rpi/local".text = ''
home-manager.users.me.home.file.".ssh/rpi/local".text = ''
Host config
HostName 192.168.1.2
User config
@@ -76,7 +78,7 @@
IdentityFile ${secretsDir}/private-key-main
'';
home-manager.users.me.home.".ssh/rpi/remote".text = ''
home-manager.users.me.home.file.".ssh/rpi/remote".text = ''
Host config
HostName sebastian.dns.army
User config
@@ -111,7 +113,7 @@
IdentityFile ${secretsDir}/private-key-main
'';
home-manager.users.me.home.".ssh/rpi/wstunnel".text = ''
home-manager.users.me.home.file.".ssh/rpi/wstunnel".text = ''
Host config
HostName localhost
User config

View File

@@ -1,6 +1,6 @@
{ ... }:
{
home-manager.users.me.programms.zathura = {
home-manager.users.me.programs.zathura = {
enable = true;
options = {
selection-clipboard = "clipboard";