Compare commits

..

No commits in common. "a714e9a2525b1547b405757e1db6c26a94ccd284" and "de95971e8a658d2eb3fd6604361ff75bfb3dad0b" have entirely different histories.

22 changed files with 84 additions and 165 deletions

102
flake.lock generated
View file

@ -33,11 +33,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1751403276,
"narHash": "sha256-V0EPQNsQko1a8OqIWc2lLviLnMpR1m08Ej00z5RVTfs=",
"lastModified": 1748532342,
"narHash": "sha256-CvaKOUq8G10sghKpZhEB2UYjJoWhEkrDFggDgi7piUI=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "896ad88fa57ad5dbcd267c0ac51f1b71ccfcb4dd",
"rev": "ce9373715fe3fac7a174a65a7e6d6baeba8cb4f9",
"type": "github"
},
"original": {
@ -163,11 +163,11 @@
]
},
"locked": {
"lastModified": 1751313918,
"narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
"lastModified": 1750618568,
"narHash": "sha256-w9EG5FOXrjXGfbqCcQg9x1lMnTwzNDW5BMXp8ddy15E=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
"rev": "1dd19f19e4b53a1fd2e8e738a08dd5fe635ec7e5",
"type": "github"
},
"original": {
@ -422,16 +422,16 @@
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1748186689,
"narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
"lastModified": 1744584021,
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "48.2",
"ref": "48.1",
"repo": "gnome-shell",
"type": "github"
}
@ -464,11 +464,11 @@
]
},
"locked": {
"lastModified": 1751760902,
"narHash": "sha256-qBGNn7T/zOgUDQTo/RM/D2oxMkB2x36j3ajvpVanEVs=",
"lastModified": 1751146119,
"narHash": "sha256-gvjG95TCnUVJkvQvLMlnC4NqiqFyBdJk3o8/RwuHeaU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "8b0180dde1d6f4cf632e046309e8f963924dfbd0",
"rev": "76d0c31fce2aa0c71409de953e2f9113acd5b656",
"type": "github"
},
"original": {
@ -486,11 +486,11 @@
]
},
"locked": {
"lastModified": 1751146119,
"narHash": "sha256-gvjG95TCnUVJkvQvLMlnC4NqiqFyBdJk3o8/RwuHeaU=",
"lastModified": 1748737919,
"narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "76d0c31fce2aa0c71409de953e2f9113acd5b656",
"rev": "5675a9686851d9626560052a032c4e14e533c1fa",
"type": "github"
},
"original": {
@ -509,11 +509,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1751631393,
"narHash": "sha256-4CVRbeYExqIDpFH+QMZb5IeUGkP6kA/zHSuExYoZygk=",
"lastModified": 1751156047,
"narHash": "sha256-cjBo82cbIyYtwj0b6bjmUsS5Plqko8W50TTAz7awvqs=",
"ref": "refs/heads/main",
"rev": "362bfd827f522b57062e4ebcb465bb51941632a4",
"revCount": 18119,
"rev": "e1ccbe9abd5042e5622379bcae35a81bfd242330",
"revCount": 18098,
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
},
@ -543,11 +543,11 @@
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1751341694,
"narHash": "sha256-zXag1+8iZC3H5yVFP7KhIi4ps9z8xKrFIkyaeXlZ7Uo=",
"lastModified": 1751141511,
"narHash": "sha256-89z1bdfGxY5sqMyvqNCgqiChfkcHlYZUuAkDjY0JVgw=",
"owner": "oxalica",
"repo": "nil",
"rev": "b043bfe1f3f4c4be4b688e24c5ae96e81f525805",
"rev": "704192a3aa4653efecd7aa45147e1a32abcb4b97",
"type": "github"
},
"original": {
@ -566,11 +566,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1751736567,
"narHash": "sha256-/wvCffuHn2eOw6qYyLFm+oButg9Z1dU/BhkHhoRd5z4=",
"lastModified": 1751179061,
"narHash": "sha256-E3SA2IZf72CR3wklJM+cF1ZOVjy6r8ZqbsOPXodNjWo=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "f3b4c3cbb65b690c66ad5ca78f1e88620d4d6cc5",
"rev": "cc5722e779f3b32bdd918e473777c39da67ab1b6",
"type": "github"
},
"original": {
@ -695,11 +695,11 @@
},
"nix-hardware": {
"locked": {
"lastModified": 1751432711,
"narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=",
"lastModified": 1750837715,
"narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f",
"rev": "98236410ea0fe204d0447149537a924fb71a6d4f",
"type": "github"
},
"original": {
@ -782,11 +782,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1751432711,
"narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=",
"lastModified": 1750837715,
"narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f",
"rev": "98236410ea0fe204d0447149537a924fb71a6d4f",
"type": "github"
},
"original": {
@ -876,11 +876,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1751582995,
"narHash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA=",
"lastModified": 1750969886,
"narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693",
"rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
"type": "github"
},
"original": {
@ -955,11 +955,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1751637120,
"narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=",
"lastModified": 1751011381,
"narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3",
"rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7",
"type": "github"
},
"original": {
@ -971,11 +971,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1751637120,
"narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=",
"lastModified": 1751011381,
"narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3",
"rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7",
"type": "github"
},
"original": {
@ -1002,10 +1002,10 @@
},
"nixpkgs_9": {
"locked": {
"lastModified": 1751011381,
"narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=",
"path": "/nix/store/igmrb3hj6wr27ll3nlgjfaawf5jsjvji-source",
"rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7",
"lastModified": 1749794982,
"narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
"path": "/nix/store/xnr2xjs0clkhlhqfc3vqcmhnnwdk3c5p-source",
"rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
"type": "path"
},
"original": {
@ -1190,11 +1190,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1751769163,
"narHash": "sha256-5/fDueotC2qqa5r+1UbOO1p6g1FUhVVb5cR5TwweF4c=",
"lastModified": 1751145558,
"narHash": "sha256-OPlbpH64jzIspYqvJB96tnN9V9HBlAxROS5ijQwtN70=",
"owner": "danth",
"repo": "stylix",
"rev": "50ed5ddd1072a6b10e6368cc338d759ffa02df9b",
"rev": "3a09d3f5cb940fa4142a2f3415b508a8be92b721",
"type": "github"
},
"original": {
@ -1441,11 +1441,11 @@
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
"lastModified": 1751228685,
"narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=",
"lastModified": 1751176151,
"narHash": "sha256-7bK5eoK0ySlct/cbehTrkGcTcSMOLXSnh+RJiswVzEU=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b",
"rev": "91d463851e24c190cc912471861b5414ac8fe65c",
"type": "github"
},
"original": {

View file

@ -146,11 +146,11 @@
./nixos/configs/dmesg.nix
./nixos/configs/printing.nix
./nixos/configs/virt-host.nix
./nixos/configs/wireshark.nix
./nixos/configs/mount-rsync-kate.nix
./nixos/configs/mount-fastmail-tmllc.nix
./nixos/overlays/fixup-canon.nix
#
];
@ -158,6 +158,8 @@
linuxGuiModuleSet = [
nix-flatpak.nixosModules.nix-flatpak
./nixos/dotfiles/vscode.nix
./nixos/packages/gui.nix
./nixos/packages/wine.nix
./nixos/packages/flatpak.nix
@ -194,7 +196,6 @@
# Modules for offline linux machines.
linuxOfflineModuleSet = [
./nixos/packages/offline.nix
./nixos/configs/waydroid.nix
];
# Helper functions for creating modules in the defintions below.

View file

@ -168,7 +168,7 @@ UseIn=niri'')
services.power-profiles-daemon.enable = lib.mkForce false;
# Enable sound with pipewire.
services.pulseaudio.enable = false;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;

View file

@ -16,10 +16,8 @@
enable = true;
defaultTimeout = 10000;
settings = {
width = 400;
height = 200;
};
width = 400;
height = 200;
};
};

View file

@ -146,7 +146,7 @@ in
input = {
# Moving focus with the keyboard should move the mouse.
warp-mouse-to-focus.enable = true;
warp-mouse-to-focus = true;
touchpad = {
@ -284,11 +284,11 @@ in
"Mod+Q".action = close-window;
"XF86AudioPrev".action = sh "playerctl previous";
"XF86AudioNext".action = sh "playerctl next";
"XF86AudioPlay".action = sh "playerctl play-pause";
"XF86AudioPrev".action = sh "supersonic -previous";
"XF86AudioNext".action = sh "supersonic -next";
"XF86AudioPlay".action = sh "supersonic -play-pause";
"XF86Launch5".action = sh "playerctl play-pause";
"XF86Launch5".action = sh "supersonic -play-pause";
}
(binds {

View file

@ -203,7 +203,7 @@ in
modules-left = [
"clock"
"clock#otherzone"
"mpris"
"mpd"
];
modules-center = [
"custom/title"
@ -364,7 +364,8 @@ in
];
};
mpris = {
mpd = {
on-click = "mpc toggle";
format = "${icons.music.playing} {artist} - {title}";
format-paused = "${icons.music.paused} {artist} - {title}";
format-stopped = "";

View file

@ -18,7 +18,7 @@
extraRules = ''
# Brother p-touch cube
SUBSYSTEM == "usb", ATTRS{idVendor} == "04f9", ATTRS{idProduct} == "20af", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM == "usb", ATTRS{idVendor} == "04f9", ATTRS{idProduct} == "20af", MODE = "0666"
# If we have a Apple T2 VHCI, force it to re-start once things are more up.
# This forces a re-enumeration of the connected devices, and thus makes things like the touch bar work reliably.
@ -27,15 +27,7 @@
# Digilent waveforms
ACTION=="add", ATTR{idVendor}=="1443", GROUP="plugdev", TAG+="uaccess"
ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Digilent", GROUP="plugdev", TAG+="uaccess", RUN+="${waveforms.adept2-runtime}/sbin/dftdrvdtch %s{busnum} %s{devnum}"
# LibreVNA
SUBSYSTEM == "usb", ATTRS{idVendor} == "1209", ATTRS{idProduct} == "4121", GROUP="plugdev", TAG+="uaccess"
'';
};
hardware.ubertooth = {
enable = true;
group = "plugdev";
};
}

View file

@ -1,12 +0,0 @@
#
# Sets up wireshark.
#
{ ... }: {
programs.wireshark = {
enable = true;
usbmon.enable = true;
dumpcap.enable = true;
};
users.users.deprekated.extraGroups = [ "wireshark" ];
}

View file

@ -92,9 +92,7 @@
#
# Services
#
services.pcscd = {
enable = true;
};
services.pcscd.enable = true;
services.openssh.enable = true;
services.mullvad-vpn.enable = true;
virtualisation.docker.enable = true;

View file

@ -13,17 +13,15 @@
}:
let
# libfprint with patches for the GPD-provided reader
libfprint-gpd =
pkgs.libfprint.overrideAttrs
(prev: {
version = "git";
libfprint-gpd = pkgs.libfprint.overrideAttrs (prev: {
version = "git";
src = pkgs.fetchFromGitHub {
owner = "ericlinagora";
repo = "libfprint-CS9711";
rev = "03ace5b20146eb01c77fb3ea63e1909984d6d377";
sha256 = "sha256-gr3UvFB6D04he/9zawvQIuwfv0B7fEZb6BGiNAbLids=";
};
src = pkgs.fetchFromGitHub {
owner = "ericlinagora";
repo = "libfprint-CS9711";
rev = "03ace5b20146eb01c77fb3ea63e1909984d6d377";
sha256 = "sha256-gr3UvFB6D04he/9zawvQIuwfv0B7fEZb6BGiNAbLids=";
};
nativeBuildInputs =
prev.nativeBuildInputs
@ -34,19 +32,9 @@ let
nss
]);
installCheckPhase = "";
installCheckPhase = "";
}).overrideAttrs
(prev: rec {
version = "1.94.4";
src = pkgs.fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "libfprint";
repo = "fprintd";
rev = "refs/tags/v${version}";
hash = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU=";
};
});
});
in
{
@ -60,9 +48,6 @@ in
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# Allow using our phone as an NFC smartcard reader.
services.pcscd.plugins = [ pkgs.vsmartcard-pcsc-relay ];
# Networking.
networking.hostName = "hinata";
networking.networkmanager.enable = true;

View file

@ -71,9 +71,6 @@
services.blueman.enable = true;
# Allow the NFC reader on the trackpoint to be used as a smartcard reader.
hardware.nfc-nci.enable = true;
#
# Niri configuration for our monitors.
#

View file

@ -386,25 +386,6 @@ in
swapDevices = [ ];
# Support bluetooth.
hardware.bluetooth = {
enable = true;
powerOnBoot = true;
settings = {
General = {
# Support A2DP.
Enable = "Source,Sink,Media,Socket";
# Enable experimental featurees, like reading device battery levels.
Experimental = true;
};
};
};
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction

View file

@ -125,6 +125,7 @@ with pkgs;
unzip
unar
unrar
deprekages.vja
wget
wireshark-cli
zellij
@ -149,7 +150,6 @@ with pkgs;
deprekages.rfe-touch
deprekages.rfe-signal
deprekages.librevna
python3Packages.meshtastic
# For editors.
fish

View file

@ -13,10 +13,6 @@
appId = "com.github.vikdevelop.photopea_app";
origin = "flathub";
}
{
appId = "io.emeric.toolblex";
origin = "flathub";
}
];
services.flatpak.overrides = {

View file

@ -83,7 +83,6 @@ with pkgs;
# Media
blender
pavucontrol
playerctl
vlc
# Learning

View file

@ -18,7 +18,6 @@ with pkgs;
# Development.
act
arduino-cli
go
rustc
bundix
@ -43,10 +42,6 @@ with pkgs;
gnuradioPackages.fosphor
gnuradioPackages.lora_sdr
# hax
btlejack
ubertooth
# Build systems.
cmake
gnumake

View file

@ -12,9 +12,6 @@ python3Packages.buildPythonApplication rec {
pname = "oxfs";
version = "0.5.5";
pyproject = true;
build-system = [ python3Packages.setuptools ];
src = fetchPypi {
inherit pname version;
hash = "sha256-iHtUfrf91vr5UOn5vr6679OsGh5xipgbCeCRxluf9Pc=";

View file

@ -6,9 +6,7 @@
python3Packages.buildPythonPackage rec {
pname = "svd2py";
version = "1.0.2";
pyproject = true;
build-system = [ python3Packages.setuptools ];
format = "pyproject";
src = fetchPypi {
inherit pname version;

View file

@ -11,10 +11,7 @@
python3Packages.buildPythonPackage rec {
pname = "xonsh";
version = xonsh.version;
pyproject = true;
build-system = [ python3Packages.setuptools ];
format = null;
format = "pyproject";
src = fetchFromGitHub {
owner = pname;

View file

@ -13,9 +13,7 @@ let
in python3Packages.buildPythonPackage rec {
pname = "xontrib_prompt_bar";
version = "0.5.8";
pyproject = true;
build-system = [ python3Packages.setuptools ];
format = "pyproject";
src = fetchPypi {
inherit pname version;

View file

@ -20,9 +20,6 @@ in python3Packages.buildPythonPackage rec {
pname = "xontrib_sh";
version = "0.3.1";
pyproject = true;
build-system = [ python3Packages.setuptools ];
src = fetchPypi {
inherit pname version;
hash = "sha256-qIr/VKCdcSBrtz/4ttpxV2i/4D9t3hw1D0AuzGA9DMk=";

View file

@ -266,7 +266,8 @@ theme "solarized-dark"
// Require a leader key before we run any commands.
default_mode "locked"
default_layout "compact"
// Uncomment this when we're used enough to the keybinds. :)
// default_layout "compact"
// The folder in which Zellij will look for layouts
// (Requires restart)