primrose/.files
1
0
Fork 0
mirror of https://codeberg.org/leana8959/.files.git synced 2025-12-06 14:49:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'trunk' into tungsten-btrfs-test

Browse source
This commit is contained in:
Primrose 2025-07-04 22:35:00 +02:00
commit f740985bff
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
44 changed files with 331 additions and 318 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nix/configurations/tungsten.nix
View file

@ -1,6 +1,6 @@
# Entry point to cherry pick modules
let
sources = import ../sources.nix;
sources = import ../../npins;
hostname = "tungsten";
username = "leana";
@ -134,7 +134,6 @@ in
../homeModules/common/vim
../homeModules/common/wired
../homeModules/common/atuin.nix
../homeModules/common/battery-notify.nix
../homeModules/common/direnv.nix
../homeModules/common/feh.nix
../homeModules/common/firefox.nix
@ -144,7 +143,6 @@ in
../homeModules/common/kitty.nix
../homeModules/common/leana.nix
../homeModules/common/locale.nix
../homeModules/common/neovim.nix
../homeModules/common/packages.nix
../homeModules/common/password-store.nix
../homeModules/common/sioyek.nix

7
nix/configurations/tungsten/home/programs.nix
View file

@ -76,7 +76,6 @@
pkgs.xbrightness
pkgs.dmenu
pkgs.xclip
pkgs.playerctl # talk to playerctld
pkgs.xscreensaver # talk to xscreensaver
pkgs.xcolor
@ -104,12 +103,6 @@
enable = true;
components = ["secrets"];
};
battery-notify = {
enable = true;
device_full = "/sys/class/power_supply/BAT0/charge_full";
device_now = "/sys/class/power_supply/BAT0/charge_now";
};
};
}
];

34
nix/configurations/tungsten/home/xmobar.nix
View file

@ -9,20 +9,38 @@
, position = BottomH 30
, commands = [ Run Date "%a %d %H:%M:%S" "date" 10
, Run Battery
[ "-t", "<acstatus>:<left>%"
, "--"
, "-O", "󰂄"
, "-i", "󱟦"
, "-o", "󰁾"
[ "-t", "<left> (<timeleft>)"
, "-H", "70"
, "-L", "20"
, "-h", "green"
, "-m", "yell"
, "-n", "orange"
, "-l", "red"
, "--"
, "-P"
, "-A", "20"
, "-a", "notify-send -u critical \"Battery Low\" \"Please charge your battery\""
] 10
, Run XMonadLog
]
, Run
DynNetwork
[ "--template"
, "<dev>: ↑ <tx> kB/s ↓ <rx> kB/s"
, "--Low"
, "102400"
, "--High"
, "1024000"
, "--low"
, "green"
, "--normal"
, "orange"
, "--high"
, "red"
]
10
]
, sepChar = "%"
, alignSep = "}{"
, template = " %XMonadLog% }{ %battery% | %date% "
, template = " %XMonadLog% }{ %dynnetwork% | %battery% | %date% "
}
'';
};

10
nix/configurations/tungsten/nixos/input.nix
View file

@ -17,9 +17,9 @@
services.fprintd.enable = false;
programs.weylus = {
enable = true;
users = ["leana"];
openFirewall = true;
};
# programs.weylus = {
# enable = true;
# users = ["leana"];
# openFirewall = true;
# };
}

4
nix/configurations/vanadium.nix
View file

@ -1,6 +1,6 @@
# Entry point to cherry pick modules
let
sources = import ../sources.nix;
sources = import ../../npins;
hostname = "vanadium";
username = "leana";
@ -153,7 +153,6 @@ in
../homeModules/common/vim
../homeModules/common/wired
../homeModules/common/atuin.nix
../homeModules/common/battery-notify.nix
../homeModules/common/direnv.nix
../homeModules/common/feh.nix
../homeModules/common/firefox.nix
@ -164,7 +163,6 @@ in
../homeModules/common/leana.nix
../homeModules/common/locale.nix
../homeModules/common/lazygit.nix
../homeModules/common/neovim.nix
../homeModules/common/packages.nix
../homeModules/common/password-store.nix
../homeModules/common/sioyek.nix

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

@ -23,6 +23,10 @@
pkgs.taplo # toml
pkgs.vscode-langservers-extracted # JSON etc
pkgs.yaml-language-server # yaml
# bash
pkgs.shfmt
pkgs.nodePackages.bash-language-server
];
programs.git = {

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

@ -10,8 +10,6 @@ in {
enable = true;
policies = {
RequestedLocales = ["fr" "en-US" "zh-TW"];
SearchEngines = {
Default = "Google en@en";
Remove = ["Google"];

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

@ -77,7 +77,7 @@
emacs = {
enable = true;
package = pkgs.emacs28;
package = pkgs.unsafe-emacs28;
};
lazygit.enable = true;
@ -106,7 +106,6 @@
# productivity / media
pkgs.evolution
pkgs.libreoffice
pkgs.iamb
pkgs.calibre
# pkgs.rawtherapee
pkgs.digikam
@ -159,12 +158,6 @@
enable = true;
components = ["secrets"];
};
battery-notify = {
enable = true;
device_full = "/sys/class/power_supply/BAT1/charge_full";
device_now = "/sys/class/power_supply/BAT1/charge_now";
};
};
}
];

48
nix/configurations/vanadium/home/xmobar.nix
View file

@ -1,6 +1,10 @@
{
programs.xmobar = {
enable = true;
# XMobar's config file is not a segment of valid Haskell source code -- it is instead a DSL
# Note how `Run` handles its arguments properly without parens?
#
# Also xmobar wants GHC if we use it as a library, and I'm lazy, you probably want to keep it this way.
extraConfig = ''
Config { overrideRedirect = False
, font = "Iosevka 13"
@ -9,20 +13,48 @@
, position = BottomH 30
, commands = [ Run Date "%a %d %H:%M:%S" "date" 10
, Run Battery
[ "-t", "<acstatus>:<left>%"
, "--"
, "-O", "󰂄"
, "-i", "󱟦"
, "-o", "󰁾"
[ "-t", "<left> (<timeleft>)"
, "-H", "70"
, "-L", "20"
, "-h", "green"
, "-m", "yell"
, "-n", "orange"
, "-l", "red"
] 10
, "--"
, "-P"
, "-A", "20"
, "-a", "notify-send -u critical \"Battery Low\" \"Please charge your battery\""
]
600
, Run XMonadLog
, Run
DynNetwork
[ "--template"
, "<dev>: ↑ <tx> kB/s ↓ <rx> kB/s"
, "--Low"
, "102400"
, "--High"
, "1024000"
, "--low"
, "green"
, "--normal"
, "orange"
, "--high"
, "red"
]
100
, Run
Weather "LFRN"
[ "-t", "<station>: <tempC>C"
, "-L","10", "-H", "25"
, "--normal", "white"
, "--high", "orange"
, "--low", "blue"
]
9000
]
, sepChar = "%"
, alignSep = "}{"
, template = " %XMonadLog% }{ %battery% | %date% "
, template = " %XMonadLog% }{ %dynnetwork% | %LFRN% | %battery% | %date% "
}
'';
};

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

@ -16,6 +16,7 @@ import XMonad.Util.SpawnOnce (spawnOnce)
import XMonad.Layout.NoBorders (smartBorders)
import XMonad.Layout.Reflect (reflectHoriz)
import XMonad.Layout.Spacing (smartSpacingWithEdge)
import XMonad.Layout.Renamed (named)
import XMonad.Layout.ResizableTile (ResizableTall(ResizableTall), MirrorResize (MirrorShrink, MirrorExpand))
import XMonad.Hooks.ManageHelpers (isFullscreen, (~?), composeOne, (-?>))
@ -93,9 +94,10 @@ main = xmonad
let tallr = reflectMsg . reflectHoriz
$ ResizableTall 1 (1/10) (3/7) []
in smartBorders
( smartSpacingWithEdge 5 tallr
||| Full
)
( named "Normal"
(smartSpacingWithEdge 5 tallr)
||| Full
)
, manageHook =
let
@ -184,9 +186,9 @@ main = xmonad
-- Screenshots
++ (let
fullscreen = "maim | xclip -in -selection clipboard -t image/png"
withSelection = "maim -s -b 5 -o | xclip -in -selection clipboard -t image/png"
toFloat = "maim -s -b 5 -o | feh --auto-zoom -"
fullscreen = "maim -u | xclip -in -selection clipboard -t image/png"
withSelection = "maim -u -s -b 5 -o | xclip -in -selection clipboard -t image/png"
toFloat = "maim -u -s -b 5 -o | feh --auto-zoom -"
in
[ ((0, xK_Print), spawn fullscreen )
, ((superMask .|. shiftMask, xK_3 ), spawn fullscreen )

10
nix/configurations/vanadium/nixos/input.nix
View file

@ -21,9 +21,9 @@
services.fprintd.enable = false;
programs.weylus = {
enable = true;
users = ["leana"];
openFirewall = true;
};
# programs.weylus = {
# enable = true;
# users = ["leana"];
# openFirewall = true;
# };
}

16
nix/configurations/vanadium/overlay.nix
View file

@ -1,5 +1,5 @@
let
sources = import ../../sources.nix;
sources = import ../../../npins;
lib = import (sources.nixpkgs + "/lib");
infuse-lib = import sources.infuse {
@ -54,4 +54,18 @@ in
./patches/fcitx5-chinese-addons/disable-fullwidth.patch
# Note: disabling pinyin helper breaks canjie
];
# TODO: remove this when upstream is updated
sudo.__output.patches.__append = [
(final.fetchpatch {
name = "CVE-2025-32462";
url = "https://github.com/sudo-project/sudo/commit/d530367828e3713d09489872743eb92d31fb11ff.patch";
hash = "sha256-mS8fcPV1QDv9SDuGN7dfDLtVLSBP+apotYW1UsEBPvU=";
})
(final.fetchpatch {
name = "CVE-2025-32463";
url = "https://github.com/sudo-project/sudo/commit/fdafc2ceb36382b07e604c0f39903d56bef54016.patch";
hash = "sha256-4FP8z5pKwcOfJxjJ9X/IbCgriKJm1H/HnswuvYjBlt8=";
})
];
}