Compare commits
8 commits
1052f85942
...
199d5a6367
Author | SHA1 | Date | |
---|---|---|---|
199d5a6367 | |||
913406302e | |||
88267a0897 | |||
f56e6f5b9b | |||
37a417bd97 | |||
73906f8f95 | |||
90ea61ed1d | |||
b67d0edb30 |
10 changed files with 142 additions and 150 deletions
170
flake.lock
170
flake.lock
|
@ -27,16 +27,15 @@
|
|||
"crane": "crane",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725300620,
|
||||
"narHash": "sha256-IdM+pZ6BnmD3o1fTJZ2BD43k7dwi1BbVfLDLpM1nE5s=",
|
||||
"lastModified": 1725815284,
|
||||
"narHash": "sha256-nVWCR86XDjx9Tq6RHsNvhD03nNzIeKKc7UTPnXLyrDY=",
|
||||
"owner": "zhaofengli",
|
||||
"repo": "attic",
|
||||
"rev": "bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234",
|
||||
"rev": "aec90814a4ecbc40171d57eeef97c5cab4aaa7b4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -74,7 +73,7 @@
|
|||
"colmena": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
|
@ -218,11 +217,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725555506,
|
||||
"narHash": "sha256-9HIRqIPSHNMu9dfNrSkmatRtXKxmiddm/VXFvFFhSz4=",
|
||||
"lastModified": 1725933847,
|
||||
"narHash": "sha256-pZbXVN8cqvlnI1qPMtiVvd/nAxrRWX3SGXMV2/iBRR8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "302264062ca73851e9306b70daeed6d9f1ae3ff9",
|
||||
"rev": "bf4ae226fc2ca4d264fe4688004ffc1d00d2e7d8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -255,28 +254,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"microvm",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722580276,
|
||||
"narHash": "sha256-VaNcSh7n8OaFW/DJsR6Fm23V+EGpSei0DyF71RKB+90=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "286f371b3cfeaa5c856c8e6dfb893018e86cc947",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
@ -434,6 +411,21 @@
|
|||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1659877975,
|
||||
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
|
@ -451,21 +443,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1659877975,
|
||||
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_3": {
|
||||
"inputs": {
|
||||
"systems": "systems_3"
|
||||
|
@ -484,24 +461,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_4": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"git-fs-monitor": {
|
||||
"inputs": {
|
||||
"crane": "crane_2",
|
||||
|
@ -592,11 +551,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725180166,
|
||||
"narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
|
||||
"lastModified": 1725948275,
|
||||
"narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
|
||||
"rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -607,7 +566,6 @@
|
|||
},
|
||||
"microvm": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
|
@ -617,11 +575,11 @@
|
|||
"spectrum": "spectrum"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725388988,
|
||||
"narHash": "sha256-hjO/ZpmaXUHUzTSefzbj0Bosj6inFHRplbb+YqQQULc=",
|
||||
"lastModified": 1725664757,
|
||||
"narHash": "sha256-kUMgeF3hHJM8aBpdazNgtCeeOTrWext6lHfrYmC6otU=",
|
||||
"owner": "astro",
|
||||
"repo": "microvm.nix",
|
||||
"rev": "d52082cc2668b8cd788e3133526c8693ee71f6a5",
|
||||
"rev": "caac7808d1e31f8a0fa408338cd3736947cb226d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -679,7 +637,7 @@
|
|||
"nix-ld-rs": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_5",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
|
@ -700,11 +658,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1725477728,
|
||||
"narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=",
|
||||
"lastModified": 1725885300,
|
||||
"narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce",
|
||||
"rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -759,11 +717,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1725407940,
|
||||
"narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=",
|
||||
"lastModified": 1725826545,
|
||||
"narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3",
|
||||
"rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -791,11 +749,11 @@
|
|||
},
|
||||
"nixpkgs-stable_4": {
|
||||
"locked": {
|
||||
"lastModified": 1721524707,
|
||||
"narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
|
||||
"lastModified": 1725762081,
|
||||
"narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
|
||||
"rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -807,11 +765,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1725432240,
|
||||
"narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
|
||||
"lastModified": 1725634671,
|
||||
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ad416d066ca1222956472ab7d0555a6946746a80",
|
||||
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -882,7 +840,7 @@
|
|||
"emacs-overlay": "emacs-overlay",
|
||||
"eww": "eww",
|
||||
"flake-parts": "flake-parts_3",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"git-fs-monitor": "git-fs-monitor",
|
||||
"ha-now-playing": "ha-now-playing",
|
||||
"home-manager": "home-manager",
|
||||
|
@ -899,23 +857,6 @@
|
|||
"treefmt-nix": "treefmt-nix"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1722521768,
|
||||
"narHash": "sha256-FvJ4FaMy1kJbZ3Iw1RyvuiUAsbHJXoU2HwylzaFzj1o=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "f149dc5029d8406fae8b2c541603bcac06e30deb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rust-lang",
|
||||
"ref": "nightly",
|
||||
"repo": "rust-analyzer",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
@ -923,11 +864,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725503082,
|
||||
"narHash": "sha256-sgIkegun2+PwJEDHlvmADhSbxgjVR+8pYSMuXmB3/do=",
|
||||
"lastModified": 1725935143,
|
||||
"narHash": "sha256-mVtTVQMlXkydSXVwFClE0ckxHrOQ9nb2DrCjNwW5pUE=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "17d3930e54a50df2afe52a2d1d1f506edb262bbe",
|
||||
"rev": "c3c175c74cd0e8c2c40a0e22bc6e3005c4d28d64",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -944,11 +885,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725540166,
|
||||
"narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=",
|
||||
"lastModified": 1725922448,
|
||||
"narHash": "sha256-ruvh8tlEflRPifs5tlpa0gkttzq4UtgXkJQS7FusgFE=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "d9d781523a1463965cd1e1333a306e70d9feff07",
|
||||
"rev": "cede1a08039178ac12957733e97ab1006c6b6892",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1034,21 +975,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_4": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
|
@ -277,6 +277,7 @@
|
|||
packages = [
|
||||
age
|
||||
config.packages.git-repo-go
|
||||
fontpreview
|
||||
inputs'.colmena.packages.colmena
|
||||
just
|
||||
libxkbcommon
|
||||
|
|
|
@ -55,9 +55,9 @@ Setting =lexical-binding= to =t= can improve startup time. This has to be first!
|
|||
This sets some variables with my personal preferences for easy customization
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
(defvar my/default-font "MonaspiceNe Nerd Font")
|
||||
(defvar my/default-font "RecMonoLinear Nerd Font")
|
||||
(defvar my/variable-width-font "Iosevka Aile")
|
||||
(defvar my/comment-font "MonaspiceRn Nerd Font")
|
||||
(defvar my/comment-font "RecMonoCasual Nerd Font")
|
||||
(defvar my/default-font-height 120)
|
||||
(defvar my/default-font-weight 'light)
|
||||
(defvar my/default-font-width 'normal)
|
||||
|
@ -431,15 +431,11 @@ Emoji support
|
|||
Enable ligatures
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
(use-package ligature
|
||||
:config
|
||||
;; Enable all Iosevka ligatures in programming modes
|
||||
;; (ligature-set-ligatures 'prog-mode '("<---" "<--" "<<-" "<-" "->" "-->" "--->" "<->" "<-->" "<--->" "<---->" "<!--"
|
||||
;; "<==" "<===" "<=" "=>" "=>>" "==>" "===>" ">=" "<=>" "<==>" "<===>" "<====>" "<!---"
|
||||
;; "<~~" "<~" "~>" "~~>" "::" ":::" "==" "!=" "===" "!=="
|
||||
;; ":=" ":-" ":+" "<*" "<*>" "*>" "<|" "<|>" "|>" "+:" "-:" "=:" "<******>" "++" "+++"))
|
||||
;; Ligatures for Monaspace
|
||||
(ligature-set-ligatures 'prog-mode '(
|
||||
(setq iosevka-ligatures '("<---" "<--" "<<-" "<-" "->" "-->" "--->" "<->" "<-->" "<--->" "<---->" "<!--"
|
||||
"<==" "<===" "<=" "=>" "=>>" "==>" "===>" ">=" "<=>" "<==>" "<===>" "<====>" "<!---"
|
||||
"<~~" "<~" "~>" "~~>" "::" ":::" "==" "!=" "===" "!=="
|
||||
":=" ":-" ":+" "<*" "<*>" "*>" "<|" "<|>" "|>" "+:" "-:" "=:" "<******>" "++" "+++"))
|
||||
(setq monaspace-ligatures '(
|
||||
; ss01
|
||||
"==" "===" "=/=" "!=" "!==" "/=" "/==" "~~" "=~" "!~"
|
||||
; ss02
|
||||
|
@ -458,6 +454,12 @@ Enable ligatures
|
|||
".=" ".-" "..<"
|
||||
; dlig & calt
|
||||
"<!" "**" "::" "=:" "=!" "=/" "--" ".." "//" "&&" "||" ":=" ":>" ":<" "!!" ">:" "<:" "#=" "?:" "?." "??" ";;" "///" ":::" "..." "=!=" "=:=" "..=" "..-"))
|
||||
|
||||
(use-package ligature
|
||||
:config
|
||||
;; Enable all Iosevka ligatures in programming modes
|
||||
(ligature-set-ligatures 'prog-mode iosevka-ligatures)
|
||||
;; Ligatures for Monaspace
|
||||
;; Enables ligature checks globally in all buffers. You can also do it
|
||||
;; per mode with `ligature-mode'.
|
||||
(global-ligature-mode t))
|
||||
|
|
|
@ -12,6 +12,11 @@ in
|
|||
options.eboskma.programs.foot = {
|
||||
enable = mkEnableOption "activate foot";
|
||||
server = mkEnableOption "enable foot server";
|
||||
fontSize = mkOption {
|
||||
description = "font size";
|
||||
type = types.int;
|
||||
default = 12;
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
@ -21,7 +26,7 @@ in
|
|||
|
||||
settings = {
|
||||
main = {
|
||||
font = "Iosevka Nerd Font:size=16, Twitter Color Emoji:size=12";
|
||||
font = "Iosevka Nerd Font:size=${toString cfg.fontSize}, Twitter Color Emoji:size=${toString cfg.fontSize}";
|
||||
dpi-aware = "no";
|
||||
};
|
||||
|
||||
|
|
35
home-manager/modules/gitu/default.nix
Normal file
35
home-manager/modules/gitu/default.nix
Normal file
|
@ -0,0 +1,35 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.eboskma.programs.gitu;
|
||||
|
||||
settingsFormat = pkgs.formats.toml { };
|
||||
|
||||
gituConfig = types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
};
|
||||
in
|
||||
{
|
||||
options.eboskma.programs.gitu = {
|
||||
enable = mkEnableOption "gitu";
|
||||
settings = mkOption {
|
||||
description = "Gitu config according to https://github.com/altsem/gitu/blob/master/src/default_config.toml";
|
||||
default = { };
|
||||
type = gituConfig;
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
xdg.configFile.gitu = {
|
||||
target = "gitu/config.toml";
|
||||
source = settingsFormat.generate "config.toml" cfg.settings;
|
||||
};
|
||||
|
||||
home.packages = [ pkgs.gitu ];
|
||||
};
|
||||
}
|
|
@ -52,7 +52,7 @@ inputs: {
|
|||
# host = "10.0.0.208";
|
||||
host = "k3s-test.barn-beaver.ts.net";
|
||||
targetUser = "erwin";
|
||||
tags = [ "container" ];
|
||||
# tags = [ "container" ];
|
||||
};
|
||||
};
|
||||
loki = {
|
||||
|
|
|
@ -52,7 +52,7 @@
|
|||
river = true;
|
||||
wallpaper = ../../wallpapers/river-2560.png;
|
||||
};
|
||||
guix.enable = false;
|
||||
guix.enable = true;
|
||||
networking = {
|
||||
enable = true;
|
||||
};
|
||||
|
|
|
@ -33,6 +33,7 @@ in
|
|||
"Meslo"
|
||||
"Monaspace"
|
||||
"Noto"
|
||||
"Recursive"
|
||||
];
|
||||
})
|
||||
corefonts
|
||||
|
@ -42,6 +43,7 @@ in
|
|||
material-icons
|
||||
monaspace
|
||||
noto-fonts-emoji
|
||||
recursive
|
||||
ttf_bitstream_vera
|
||||
twitter-color-emoji
|
||||
]
|
||||
|
|
|
@ -61,6 +61,26 @@ in
|
|||
signingKey = "~/.ssh/id_ed25519_sk_personal.pub";
|
||||
signingKeyFormat = "ssh";
|
||||
};
|
||||
gitu = {
|
||||
enable = true;
|
||||
settings = {
|
||||
bindings = {
|
||||
root = {
|
||||
move_down = [
|
||||
"n"
|
||||
"<down>"
|
||||
];
|
||||
move_up = [
|
||||
"p"
|
||||
"<up>"
|
||||
];
|
||||
half_page_down = [ "<ctrl+v>" ];
|
||||
half_page_up = [ "<alt+v>" ];
|
||||
discard = [ "k" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
gpg.enable = true;
|
||||
mpd.enable = true;
|
||||
neovim.enable = true;
|
||||
|
|
|
@ -66,6 +66,7 @@ in
|
|||
foot = {
|
||||
enable = true;
|
||||
server = false;
|
||||
fontSize = 16;
|
||||
};
|
||||
git = {
|
||||
enable = true;
|
||||
|
|
Loading…
Reference in a new issue