Compare commits
No commits in common. "a742bdc12a8a3c39d0f6ad11c974853fba4a9e1c" and "8f60b4ad42e8179c97b1c051fa1a1954296879e1" have entirely different histories.
a742bdc12a
...
8f60b4ad42
7 changed files with 21 additions and 155 deletions
30
flake.lock
30
flake.lock
|
|
@ -150,11 +150,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734011192,
|
||||
"narHash": "sha256-NghuiWXx6Q3gwLiudiNwDpYQ1CPEUK7J+f9dWREN8KA=",
|
||||
"lastModified": 1733168902,
|
||||
"narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "0f31ad735e784315a22d9899d3ba24340ce64220",
|
||||
"rev": "785c1e02c7e465375df971949b8dcbde9ec362e5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -430,11 +430,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734043726,
|
||||
"narHash": "sha256-e9YAMReFV1fDPcZLFC2pa4k/8TloSXeX0z2VysNMAoA=",
|
||||
"lastModified": 1733951607,
|
||||
"narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3066cc58f552421a2c5414e78407fa5603405b1e",
|
||||
"rev": "6e5b2d9e8014b5572e3367937a329e7053458d34",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -454,11 +454,11 @@
|
|||
"spectrum": "spectrum"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734041466,
|
||||
"narHash": "sha256-51bhaMe8BZuNAStUHvo07nDO72wmw8PAqkSYH4U31Yo=",
|
||||
"lastModified": 1733868086,
|
||||
"narHash": "sha256-CeYsC8J2dNiV2FCQOxK1oZ/jNpOF2io7aCEFHmfi95U=",
|
||||
"owner": "astro",
|
||||
"repo": "microvm.nix",
|
||||
"rev": "3910e65c3d92c82ea41ab295c66df4c0b4f9e7b3",
|
||||
"rev": "870cb181719aa12baf478d7cde6068ec7ed144ae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -566,11 +566,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1733940404,
|
||||
"narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=",
|
||||
"lastModified": 1733759999,
|
||||
"narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713",
|
||||
"rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -742,11 +742,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734057252,
|
||||
"narHash": "sha256-fpSFuiW+O2L0ru2GrXBS0wcAYV9+yDE0Gf800UsWutY=",
|
||||
"lastModified": 1733970833,
|
||||
"narHash": "sha256-sPEKtSaZk2CtfF9cdhtbY93S6qGq+d2PKI1fcoDfDaI=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "1f56a5c88e4dcaa0ab1ba04c4bc5a977cff840b2",
|
||||
"rev": "f7f4c59ccdf1bec3f1547d27398e9589aa94e3e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@
|
|||
flake = {
|
||||
lib = import ./lib inputs;
|
||||
|
||||
overlays.default = import ./overlays inputs;
|
||||
overlays.default = import ./overlays;
|
||||
|
||||
nixosModules = builtins.listToAttrs (
|
||||
map (x: {
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.eboskma.programs.ghostty;
|
||||
iniFormat = pkgs.formats.iniWithGlobalSection { listsAsDuplicateKeys = true; };
|
||||
in
|
||||
{
|
||||
options.eboskma.programs.ghostty = {
|
||||
enable = lib.mkEnableOption "ghostty";
|
||||
package = lib.mkPackageOption pkgs "ghostty" { };
|
||||
|
||||
settings = lib.mkOption {
|
||||
description = "Ghostty config.";
|
||||
type = lib.types.submodule {
|
||||
freeformType = iniFormat.type;
|
||||
};
|
||||
default = { };
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
home.packages = [ cfg.package ];
|
||||
|
||||
xdg.configFile.ghostty-config = {
|
||||
target = "ghostty/config";
|
||||
source = iniFormat.generate "ghostty-config" { globalSection = cfg.settings; };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.eboskma.programs.starship;
|
||||
|
|
@ -170,13 +165,13 @@ in
|
|||
'
|
||||
'';
|
||||
when = "jj root";
|
||||
symbol = "jj ";
|
||||
symbol = "jj";
|
||||
};
|
||||
|
||||
jjstate = {
|
||||
when = "jj root";
|
||||
command = ''
|
||||
jj log -r@ -n1 --no-graph -T "" --stat | tail -n1 | ${lib.getExe pkgs.sd} "(\d+) files? changed, (\d+) insertions?\(\+\), (\d+) deletions?\(-\)" ' ''${1}m ''${2}+ ''${3}-' | ${lib.getExe pkgs.sd} " 0." ""
|
||||
jj log -r@ -n1 --no-graph -T "" --stat | tail -n1 | sd "(\d+) files? changed, (\d+) insertions?\(\+\), (\d+) deletions?\(-\)" ' ''${1}m ''${2}+ ''${3}-' | sd " 0." ""
|
||||
'';
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -119,20 +119,6 @@
|
|||
device = "/dev/disk/by-label/yocto";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
"/mnt/horus/Public" = {
|
||||
device = "//horusnas1/Horusdata/Public";
|
||||
fsType = "cifs";
|
||||
options =
|
||||
let
|
||||
automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
|
||||
in
|
||||
[
|
||||
"${automount_opts},credentials=/etc/nixos/smb-secrets"
|
||||
"uid=1000"
|
||||
"gid=500"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
inputs: _final: prev: {
|
||||
_final: prev: {
|
||||
backscrub = prev.pkgs.callPackage ../pkgs/backscrub {
|
||||
inherit (prev.pkgs)
|
||||
gcc
|
||||
|
|
@ -29,6 +29,4 @@ inputs: _final: prev: {
|
|||
|
||||
pds = prev.pkgs.callPackage ../pkgs/pds { };
|
||||
pdsadmin = prev.pkgs.callPackage ../pkgs/pdsadmin { };
|
||||
|
||||
ghostty = inputs.ghostty.packages.${prev.system}.ghostty;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,86 +68,6 @@ in
|
|||
server = false;
|
||||
fontSize = 16;
|
||||
};
|
||||
ghostty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
# font-family = "Iosevka NF";
|
||||
# font-size = 16;
|
||||
# theme = "catppuccin-mocha";
|
||||
# background-opacity = 0.9;
|
||||
# keybind = [
|
||||
# "ctrl+comma=open_config"
|
||||
# "ctrl+shift+comma=reload_config"
|
||||
# "ctrl+shift+q=quit"
|
||||
# "ctrl+enter=toggle_fullscreen"
|
||||
|
||||
# "ctrl+shift+v=paste_from_clipboard"
|
||||
# "shift+insert=paste_from_selection"
|
||||
# "ctrl+shift+a=select_all"
|
||||
# "shift+up=adjust_selection:up"
|
||||
# "shift+right=adjust_selection:right"
|
||||
# "shift+down=adjust_selection:down"
|
||||
# "shift+left=adjust_selection:left"
|
||||
|
||||
# "alt+one=goto_tab:1"
|
||||
# "alt+two=goto_tab:2"
|
||||
# "alt+three=goto_tab:3"
|
||||
# "alt+four=goto_tab:4"
|
||||
# "alt+five=goto_tab:5"
|
||||
# "alt+six=goto_tab:6"
|
||||
# "alt+seven=goto_tab:7"
|
||||
# "alt+eight=goto_tab:8"
|
||||
# "alt+nine=goto_tab:9"
|
||||
|
||||
# "ctrl+minus=decrease_font_size:1"
|
||||
# "ctrl+equal=increase_font_size:1"
|
||||
# "ctrl+plus=increase_font_size:1"
|
||||
# "ctrl+zero=reset_font_size"
|
||||
|
||||
# "ctrl+shift+n=new_window"
|
||||
# "ctrl+shift+t=new_tab"
|
||||
# "ctrl+shift+o=new_split:right"
|
||||
# "ctrl+shift+e=new_split:down"
|
||||
# "ctrl+shift+c=copy_to_clipboard"
|
||||
|
||||
# "ctrl+shift+tab=previous_tab"
|
||||
# "ctrl+shift+left=previous_tab"
|
||||
# "ctrl+page_up=previous_tab"
|
||||
# "ctrl+tab=next_tab"
|
||||
# "ctrl+page_down=next_tab"
|
||||
# "ctrl+shift+right=next_tab"
|
||||
|
||||
# "super+ctrl+right_bracket=goto_split:next"
|
||||
# "super+ctrl+left_bracket=goto_split:previous"
|
||||
# "ctrl+alt+up=goto_split:top"
|
||||
# "ctrl+alt+right=goto_split:right"
|
||||
# "ctrl+alt+down=goto_split:bottom"
|
||||
# "ctrl+alt+left=goto_split:left"
|
||||
|
||||
# "super+ctrl+shift+up=resize_split:up,10"
|
||||
# "super+ctrl+shift+right=resize_split:right,10"
|
||||
# "super+ctrl+shift+down=resize_split:down,10"
|
||||
# "super+ctrl+shift+left=resize_split:left,10"
|
||||
# "super+ctrl+shift+equal=equalize_splits"
|
||||
|
||||
# "ctrl+shift+page_down=jump_to_prompt:1"
|
||||
# "ctrl+shift+page_up=jump_to_prompt:-1"
|
||||
|
||||
# "ctrl+alt+shift+j=write_scrollback_file:open"
|
||||
# "ctrl+shift+w=close_surface"
|
||||
|
||||
# "shift+page_up=scroll_page_up"
|
||||
# "shift+home=scroll_to_top"
|
||||
# "shift+end=scroll_to_bottom"
|
||||
# "shift+page_down=scroll_page_down"
|
||||
# "ctrl+shift+j=write_scrollback_file:paste"
|
||||
# "alt+f4=close_window"
|
||||
# "ctrl+shift+enter=toggle_split_zoom"
|
||||
# "ctrl+shift+i=inspector:toggle"
|
||||
# ];
|
||||
# window-decoration = false;
|
||||
};
|
||||
};
|
||||
git = {
|
||||
enable = true;
|
||||
name = "Erwin Boskma";
|
||||
|
|
@ -325,7 +245,7 @@ in
|
|||
easyeffects
|
||||
fd
|
||||
ffmpeg-full
|
||||
# inputs.ghostty.packages.${pkgs.system}.ghostty
|
||||
inputs.ghostty.packages.${pkgs.system}.ghostty
|
||||
icemon
|
||||
imagemagick
|
||||
(imv.override {
|
||||
|
|
|
|||
Loading…
Reference in a new issue