primrose/.files
1
0
Fork 0
mirror of https://codeberg.org/leana8959/.files.git synced 2026-02-01 14:39:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: primrose:58ffb4a7afb31886e15107ab8dc68bc959d34c9d
Branches Tags
primrose:trunk
primrose:easyscan2
primrose:manage.hs
primrose:26.05
primrose:licence
primrose:iron-init
primrose:upgrade-25.11
primrose:btrfs-without-lvm
primrose:nixos-anywhere-hetzner-benchmark
primrose:hydrogen
primrose:runner-test
primrose:update-locale-taiwan
primrose:s3cache
primrose:scopedImport
primrose:tungsten-btrfs-test
primrose:module-graph
primrose:xmonad-cursor-theme-repr
..
compare: primrose:02ed4b61236a037b12a4f1060cb6461c1e5c4e39
Branches Tags
primrose:easyscan2
primrose:trunk
primrose:manage.hs
primrose:26.05
primrose:licence
primrose:iron-init
primrose:upgrade-25.11
primrose:btrfs-without-lvm
primrose:nixos-anywhere-hetzner-benchmark
primrose:hydrogen
primrose:runner-test
primrose:update-locale-taiwan
primrose:s3cache
primrose:scopedImport
primrose:tungsten-btrfs-test
primrose:module-graph
primrose:xmonad-cursor-theme-repr

No commits in common. "58ffb4a7afb31886e15107ab8dc68bc959d34c9d" and "02ed4b61236a037b12a4f1060cb6461c1e5c4e39" have entirely different histories.
58ffb4a7af ... 02ed4b6123

17 changed files with 53 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Justfile
View file

@ -1,5 +1,6 @@
# Note: # Note:
# add `--option substitute false` and or `--no-net` to the command so it builds properly offline # add `--option substitute false` to the command so it builds properly offline
# rfkill block all helps too
os host action: os host action:
#!/usr/bin/env bash #!/usr/bin/env bash
set -euo pipefail set -euo pipefail

1
nix/configurations/vanadium.nix
View file

@ -177,7 +177,6 @@ in
../homeModules/common/git.nix ../homeModules/common/git.nix
../homeModules/common/gpg.nix ../homeModules/common/gpg.nix
../homeModules/common/kitty.nix ../homeModules/common/kitty.nix
../homeModules/common/ghostty.nix
../homeModules/common/leana.nix ../homeModules/common/leana.nix
../homeModules/common/locale.nix ../homeModules/common/locale.nix
../homeModules/common/lazygit.nix ../homeModules/common/lazygit.nix

2
nix/configurations/vanadium/home/dev.nix
View file

@ -40,7 +40,7 @@
enable = true; enable = true;
# We don't deal with worktree folders anyway # We don't deal with worktree folders anyway
repositories = lib.map (path: "${config.home.homeDirectory}/r/${path}") [ repositories = lib.map (path: "${config.home.homeDirectory}/r/${path}") [
"NixOS/nixpkgs" "nixos/nixpkgs"
"ghc/ghc" "ghc/ghc"
"haskell/cabal" "haskell/cabal"
]; ];

10
nix/configurations/vanadium/home/programs.nix
View file

@ -166,16 +166,8 @@
feh.enable = true; feh.enable = true;
sioyek.enable = true; sioyek.enable = true;
ghostty = {
enable = true;
settings = {
font-size = 12; # sweet spot for framework 13
command = lib.getExe config.programs.fish.package;
};
};
kitty = { kitty = {
enable = false; enable = true;
font.size = 12; # sweet spot for framework 13 font.size = 12; # sweet spot for framework 13
settings = { settings = {
shell = lib.getExe config.programs.fish.package; shell = lib.getExe config.programs.fish.package;

4
nix/configurations/vanadium/home/xmobar/xmobar.hs
View file

@ -106,7 +106,7 @@ config =
, Run XMonadLog , Run XMonadLog
, Run $ , Run $
Weather Weather
"LFRN" "RCSS"
[ "-t", "<station>: <tempC>°C" [ "-t", "<station>: <tempC>°C"
, "-L", "10" , "-L", "10"
, "-H", "25" , "-H", "25"
@ -123,7 +123,7 @@ config =
" %XMonadLog% " " %XMonadLog% "
<> alignSep config <> alignSep config
<> intercalate "|" <> intercalate "|"
[ " %LFRN% " [ " %RCSS% "
, " %battery%, %powerprofilesctl%) " , " %battery%, %powerprofilesctl%) "
, " %hereClock% (%tomorrow%, %hrt-time%) " , " %hereClock% (%tomorrow%, %hrt-time%) "
] ]

20
nix/configurations/vanadium/home/xmonad/xmonad.hs
View file

@ -381,17 +381,7 @@ keybinds =
) )
myTerm :: String myTerm :: String
myTerm = "ghostty" myTerm = "kitty"
mkTermProgramCommand :: String -> String -> String
mkTermProgramCommand termTitle progName =
unwords
[ "ghostty"
, "--title=" <> quote termTitle
, "--command=" <> quote progName
]
where
quote x = "\"" <> x <> "\""
superMask, altMask :: KeyMask superMask, altMask :: KeyMask
superMask = mod4Mask superMask = mod4Mask
@ -432,22 +422,22 @@ myScratchpads :: [NamedScratchpad]
myScratchpads = myScratchpads =
[ NS [ NS
"cmus" "cmus"
(mkTermProgramCommand "cmus" "cmus") (myTerm ++ " -T 'cmus' cmus")
(title =? "cmus") (title =? "cmus")
(customFloating centeredFloat) (customFloating centeredFloat)
, NS , NS
"btop" "btop"
(mkTermProgramCommand "btop" "btop") (myTerm ++ " -T 'btop' btop")
(title =? "btop") (title =? "btop")
(customFloating fullFloat) (customFloating fullFloat)
, NS , NS
"pass" "pass"
(mkTermProgramCommand "pass" "fish -i -c 'while :; fzf-pass; end'") (myTerm ++ " -T 'pass' -- fish -i -c 'while :; fzf-pass; end'")
(title =? "pass") (title =? "pass")
(customFloating smallFloat) (customFloating smallFloat)
, NS , NS
"emoji-picker" "emoji-picker"
(mkTermProgramCommand "emoji-picker" "fish -i -c 'while :; emoji-picker; end'") (myTerm ++ " -T 'emoji-picker' -- fish -i -c 'while :; emoji-picker; end'")
(title =? "emoji-picker") (title =? "emoji-picker")
(customFloating smallFloat) (customFloating smallFloat)
] ]

3
nix/configurations/vanadium/nixos/connectivity.nix
View file

@ -67,6 +67,9 @@
0.0.0.0 instagram.com 0.0.0.0 instagram.com
0.0.0.0 www.instagram.com 0.0.0.0 www.instagram.com
0.0.0.0 youtube.com
0.0.0.0 www.youtube.com
# The "people who you viewed can see you" thing is weird af # The "people who you viewed can see you" thing is weird af
0.0.0.0 linkedin.com 0.0.0.0 linkedin.com
0.0.0.0 www.linkedin.com 0.0.0.0 www.linkedin.com

6
nix/configurations/vanadium/nixos/fs.nix
View file

@ -10,9 +10,9 @@
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
# tmux-sessionizer directories # tmux-sessionizer directories
"d /home/leana/r 0700 leana leana - -" "d /home/leana/r 0700 leana leana - -"
"d /home/leana/wt 0700 leana leana - -" "d /home/leana/pg 0700 leana leana 4w -"
"d /home/leana/pg 0700 leana leana - -" # not only used as "playground" because I put other stuff here too, it's a fourre-tout "d /home/leana/wt 0700 leana leana - -"
]; ];
fileSystems = { fileSystems = {

7
nix/homeModules/common/fish/functions/nix-build.fish
View file

@ -1,7 +0,0 @@
function nix-build
if type -q nix-build
nom-build $argv
else
nix-build $argv
end
end

7
nix/homeModules/common/fish/functions/nix-shell.fish
View file

@ -1,7 +0,0 @@
function nix-shell
if type -q nix-shell
nom-shell $argv
else
nix-shell $argv
end
end

54
nix/homeModules/common/ghostty.nix
View file

@ -1,54 +0,0 @@
{
lib,
pkgs,
config,
...
}:
let
cfg = config.programs.ghostty;
in
{
config = lib.mkIf cfg.enable {
home.packages = [
pkgs.nerd-fonts.iosevka
];
programs.ghostty.settings = {
# Declutter
gtk-titlebar = false;
window-decoration = "none";
confirm-close-surface = false;
resize-overlay = "never";
# Fonts
font-family = "Iosevka NFM";
adjust-cursor-thickness = 2;
keybind = [
"ctrl+shift+==increase_font_size:1"
"ctrl+-=decrease_font_size:1"
];
# Theme
background = "#fdf6e3";
foreground = "#073642";
palette = [
"0=#073642"
"1=#af005f"
"2=#859900"
"3=#ba9b23"
"4=#268bd2"
"5=#5f5faf"
"6=#2aa198"
"7=#a0a1a7"
"8=#4d4d4d"
"9=#d33682"
"10=#29a350"
"11=#d6b429"
"12=#469edd"
"13=#6060d1"
"14=#4bccc1" # a platupus? perry the platupus?
"15=#eeeadd"
];
};
};
}

2
nix/homeModules/common/kitty.nix
View file

@ -13,7 +13,7 @@ in
pkgs.nerd-fonts.iosevka pkgs.nerd-fonts.iosevka
]; ];
programs.kitty = { programs.kitty = lib.mkIf cfg.enable {
font.name = "family=\"Iosevka NFM\""; font.name = "family=\"Iosevka NFM\"";
settings = rec { settings = rec {

17
nix/lib/mkNerdFont.nix
View file

@ -6,7 +6,8 @@
}: }:
{ {
font, font,
patcherArgs ? [ ], extraArgs ? [ ],
useDefaultsArgs ? true,
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
/* /*
@ -26,15 +27,19 @@ stdenvNoCC.mkDerivation {
buildPhase = buildPhase =
let let
allPatcherArgs = [ args =
"--no-progressbars" lib.optionals useDefaultsArgs [
] "--careful"
++ patcherArgs; "--complete"
"--quiet"
"--no-progressbars"
]
++ extraArgs;
in in
'' ''
mkdir -p nerd-font mkdir -p nerd-font
find \( -name \*.ttf -o -name \*.otf \) | parallel --jobs=$NIX_BUILD_CORES nerd-font-patcher {} \ find \( -name \*.ttf -o -name \*.otf \) | parallel --jobs=$NIX_BUILD_CORES nerd-font-patcher {} \
--outputdir nerd-font ${builtins.concatStringsSep " " allPatcherArgs} --outputdir nerd-font ${builtins.concatStringsSep " " args}
''; '';
installPhase = '' installPhase = ''

12
nix/overlays/iosevka.nix
View file

@ -7,11 +7,9 @@ final: prev: rec {
// { // {
iosevka = mkNerdFont { iosevka = mkNerdFont {
font = iosevka; font = iosevka;
patcherArgs = [ extraArgs = [
"--complete"
"--careful"
"--name {/.}-NFM" "--name {/.}-NFM"
"--mono" "--use-single-width-glyphs"
]; ];
}; };
}; };
@ -51,9 +49,9 @@ final: prev: rec {
}; };
weights = { weights = {
Regular.shape = 580; Regular.shape = 500;
Regular.menu = 580; Regular.menu = 500;
Regular.css = 580; Regular.css = 500;
Bold.shape = 700; Bold.shape = 700;
Bold.menu = 700; Bold.menu = 700;
Bold.css = 700; Bold.css = 700;

2
nix/overlays/wired-notify.nix
View file

@ -1,4 +1,4 @@
let let
sources = import ../../npins; sources = import ../../npins;
in in
sources.wired-notify.asFlake.overlays.default (import sources.wired-notify).overlays.default

11
nix/packages/by-name/easyscan/easyscan.sh
View file

@ -11,13 +11,6 @@ tempdir="$(mktemp -d)"
filenames=() filenames=()
counter=1 counter=1
function clean() {
# Make sure I don't remove things other than pdf
rm "$tempdir/"*.pdf
rm -d "$tempdir"
}
trap clean EXIT
while :; do while :; do
ok="true" ok="true"
echo "Scanning page $counter" echo "Scanning page $counter"
@ -58,4 +51,6 @@ pdfunite "${filenames[@]}" "$merged_filename"
mkdir -p "$(dirname "$OUTPUT_FILE")" mkdir -p "$(dirname "$OUTPUT_FILE")"
cp "$merged_filename" "$OUTPUT_FILE" cp "$merged_filename" "$OUTPUT_FILE"
clean # Make sure I don't remove things other than pdf
rm "$tempdir/"*.pdf
rm -d "$tempdir"

30
npins/sources.json
View file

@ -114,9 +114,9 @@
}, },
"branch": "release-25.11", "branch": "release-25.11",
"submodules": false, "submodules": false,
"revision": "d49d2543f02dbd789ed032188c84570d929223cb", "revision": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e",
"url": "https://github.com/nix-community/home-manager/archive/d49d2543f02dbd789ed032188c84570d929223cb.tar.gz", "url": "https://github.com/nix-community/home-manager/archive/0999ed8f965bbbd991437ad9c5ed3434cecbc30e.tar.gz",
"hash": "04vcga33w8nvs3912vzza85xadhq9dalym24rly4mrlmvcqrhrk2" "hash": "1rzgy9qmrvh9l3jrcjv14kva8sj3imzrpm2vmwcfzp40bk9wdfb5"
}, },
"infuse": { "infuse": {
"type": "GitRelease", "type": "GitRelease",
@ -171,9 +171,9 @@
}, },
"branch": "master", "branch": "master",
"submodules": false, "submodules": false,
"revision": "40b1a28dce561bea34858287fbb23052c3ee63fe", "revision": "c5db9569ac9cc70929c268ac461f4003e3e5ca80",
"url": "https://github.com/NixOS/nixos-hardware/archive/40b1a28dce561bea34858287fbb23052c3ee63fe.tar.gz", "url": "https://github.com/NixOS/nixos-hardware/archive/c5db9569ac9cc70929c268ac461f4003e3e5ca80.tar.gz",
"hash": "197v6xxdq5j4w8kil6q21ij9x6ng8z6j72brkwwjim23798c2c4n" "hash": "16p1m6avlp4iyw7cfzwwjfm421mns9ab9a1kkg59rvn3pqvnsxai"
}, },
"nixpkgs": { "nixpkgs": {
"type": "Git", "type": "Git",
@ -184,9 +184,9 @@
}, },
"branch": "nixos-25.11-small", "branch": "nixos-25.11-small",
"submodules": false, "submodules": false,
"revision": "51754d3ce24751e6542e699da9ccab5676ae0bbd", "revision": "bc805d6053df597d14851e919dd22137abf33e44",
"url": "https://github.com/nixos/nixpkgs/archive/51754d3ce24751e6542e699da9ccab5676ae0bbd.tar.gz", "url": "https://github.com/nixos/nixpkgs/archive/bc805d6053df597d14851e919dd22137abf33e44.tar.gz",
"hash": "04iw8w28mzxqmynb809xpcakvzkz6jbzfbrj3nfcpndzrm71i3vm" "hash": "0m78vibcry1lkj9zfglvp11ld3wvarsl92d99fcsc6322z1nd520"
}, },
"nur": { "nur": {
"type": "Git", "type": "Git",
@ -197,9 +197,9 @@
}, },
"branch": "main", "branch": "main",
"submodules": false, "submodules": false,
"revision": "7dbb9dc3bfc5c7d5a83b7f66022eb70c13cb8806", "revision": "6580345ce88dd3b98aaaefc253ea3c0c712e0dc2",
"url": "https://github.com/nix-community/nur/archive/7dbb9dc3bfc5c7d5a83b7f66022eb70c13cb8806.tar.gz", "url": "https://github.com/nix-community/nur/archive/6580345ce88dd3b98aaaefc253ea3c0c712e0dc2.tar.gz",
"hash": "16qj1j3y26bwglza4947iqdk6944md1gl8sk3yvbj8plwnv7dqjl" "hash": "1xbman6fy7r355wzmf0h95ryij2wir902zpc68nn3b9vw5xj1f7l"
}, },
"pin-emacs28": { "pin-emacs28": {
"type": "Git", "type": "Git",
@ -362,9 +362,9 @@
}, },
"branch": "main", "branch": "main",
"submodules": false, "submodules": false,
"revision": "c1bd63771a866f29fdc33e0fa80e7fb8536ba5f0", "revision": "fe8d1a61a904b336f453d7ab5ae7d691a21c5cbf",
"url": "https://github.com/0xc000022070/zen-browser-flake/archive/c1bd63771a866f29fdc33e0fa80e7fb8536ba5f0.tar.gz", "url": "https://github.com/0xc000022070/zen-browser-flake/archive/fe8d1a61a904b336f453d7ab5ae7d691a21c5cbf.tar.gz",
"hash": "0j3z482xnmv1h3kbk5nw5fr1h5nwagvrq0ibq3racgw712fis1cl" "hash": "1wh060savyr2v4kb9c1b01ylhz955qzflxsfq8a7c82y1l74cgcq"
} }
}, },
"version": 5 "version": 5