deprekated/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updates and minor fixes

Browse source
This commit is contained in:
Kate 2024-12-08 13:28:15 -07:00
parent dade373f20
commit 0f3731d1e3
3 changed files with 62 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
flake.lock generated
View file

@ -162,11 +162,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732603785, "lastModified": 1733570843,
"narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -182,11 +182,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1729678934, "lastModified": 1733098767,
"narHash": "sha256-fSyXeWJ+9IVJJvZztu1suJm/zp/FgfAzh8RVoveVssQ=", "narHash": "sha256-XLxNWOclBjSrzbbLQoOUNWyuF306/R0n4mMGxT3a698=",
"owner": "mirrexagon", "owner": "mirrexagon",
"repo": "nixpkgs-esp-dev", "repo": "nixpkgs-esp-dev",
"rev": "3f748af71ac7890e1f860801fdca2beef65e8353", "rev": "31ee58005f43e93a6264e3667c9bf5c31b368733",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -376,16 +376,16 @@
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713702291, "lastModified": 1732369855,
"narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", "rev": "dadd58f630eeea41d645ee225a63f719390829dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "GNOME", "owner": "GNOME",
"ref": "46.1", "ref": "47.2",
"repo": "gnome-shell", "repo": "gnome-shell",
"type": "github" "type": "github"
} }
@ -418,11 +418,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732884235, "lastModified": 1733484277,
"narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "819f682269f4e002884702b87e445c82840c68f2", "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -440,11 +440,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732482255, "lastModified": 1733085484,
"narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -462,11 +462,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1732899308, "lastModified": 1733448312,
"narHash": "sha256-1jsQqcbMbaWuFim3sqEUdB1/E2KqHa0+cHbTzd/GYFE=", "narHash": "sha256-id5U81bzXk/Lg900nGLM4CQb0wmTdzIvQz7CZk2OcTM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "2e5780ebc848f3b021f11dd94533b0b68362d989", "rev": "2a9e560570982a91937d199af3e7b7a8f3cbe14b",
"revCount": 16545, "revCount": 16575,
"type": "git", "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix" "url": "https://git@git.lix.systems/lix-project/lix"
}, },
@ -505,11 +505,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1732994406, "lastModified": 1733661607,
"narHash": "sha256-mXF8//CnCtl+o7MZU/wAqY0xrKiMbq17dd8V+prapUw=", "narHash": "sha256-qqzyc2jCvzSAsXPfit4PoYAkOn+jLpb+iV7cF/d4qFs=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "6d5abeaaa64f4d2815cd412859ff0ec21b72418b", "rev": "e1f7c6de199eb63df0c12017c0e07179e040cce2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -538,11 +538,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732946256, "lastModified": 1733639139,
"narHash": "sha256-6t73BeNVkSVLjXBKxOROITomX3M/emxbSR491Y/gUbM=", "narHash": "sha256-oQ7YwoK/Hhpal6URjypm+BEB3n2S8GAJQVG8sVLC0/I=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "8b84afbd38e057c6dd378bdd42b9467d8a7baa24", "rev": "9824321fc9499b9987f344308a5c5c69cb9b7a77",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -634,11 +634,11 @@
}, },
"nix-hardware": { "nix-hardware": {
"locked": { "locked": {
"lastModified": 1732483221, "lastModified": 1733481457,
"narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -693,11 +693,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1732483221, "lastModified": 1733481457,
"narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -787,11 +787,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1732749044, "lastModified": 1733384649,
"narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", "rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -850,11 +850,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1732837521, "lastModified": 1733581040,
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -866,11 +866,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1732837521, "lastModified": 1733581040,
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -897,10 +897,10 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1731319897, "lastModified": 1733392399,
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
"path": "/nix/store/4r8s42c9mwfvgdlxv0izb1cmlzrsb5nz-source", "path": "/nix/store/nr5nl3zwzl02x3rnikjbry3s5xy7bm1d-source",
"rev": "dc460ec76cbff0e66e269457d7b728432263166c", "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -1075,11 +1075,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1732993760, "lastModified": 1733510476,
"narHash": "sha256-t1J6wgzGjvvGNfdd0ei8HnZf9sTw+SpvCNAX0i6Qgwc=", "narHash": "sha256-RH/8yIuo+fNLCjQ6e1mnXwmmxymjvfWC9JcbDuIA8TM=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "d13ffb381c83b6139b9d67feff7addf18f8408fe", "rev": "e309d64fe7f203274a7913e1d2b74307d15ba122",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
nixos/configs/gui/default.nix
View file

@ -36,10 +36,10 @@
]; ];
# Enable espanso, when not on wayland. # Enable espanso, when not on wayland.
services.espanso = { services.espanso.enable = true;
enable = true;
wayland = false; # Espanso will try to run in any session; so we'll tell it not to run for _system_ users.
}; systemd.user.services.espanso.serviceConfig.ConditionUser = "|1000";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wtype wtype

11
xonsh/rc.xsh
View file

@ -1,4 +1,3 @@
# vim: ft=python
# #
# Kate Adkins's personal xonshrc # Kate Adkins's personal xonshrc
# #
@ -86,7 +85,14 @@ try_source(sys.platform)
if not $XONSH_HAS_NIXOS: if not $XONSH_HAS_NIXOS:
if $(grep "DISTRIB_ID=nixos" /etc/lsb-release 2>&1).returncode == 0: if $(grep "DISTRIB_ID=nixos" /etc/lsb-release 2>&1).returncode == 0:
if XONSHRC_VERBOSE:
print("Found a NixOS machine; automatically loading the NixOS extensions.")
try_source("includes/nixos") try_source("includes/nixos")
else:
if XONSHRC_VERBOSE:
print("This doesn't appear to be a NixOS machine.")
elif XONSHRC_VERBOSE:
print("NixOS set up by host customization; no need to auto-load.")
# Note: lower in the list = higher priority # Note: lower in the list = higher priority
@ -117,3 +123,6 @@ except Exception as e:
if XONSHRC_VERBOSE: if XONSHRC_VERBOSE:
print("Failed to load colors!") print("Failed to load colors!")
print(e) print(e)
if XONSHRC_VERBOSE:
print("Final color scheme: " + $XONSH_COLOR_STYLE)