Compare commits
No commits in common. "21325633a98a8068ae8c3cb0890a211591ebba32" and "f0de5bb3fd513c5671bff148ae2a480512c9ee14" have entirely different histories.
21325633a9
...
f0de5bb3fd
7 changed files with 84 additions and 74 deletions
50
flake.lock
generated
50
flake.lock
generated
|
@ -578,11 +578,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1740318342,
|
||||
"narHash": "sha256-fjr9+3Iru6O5qE+2oERQkabqAUXx4awm0+i2MBcta1U=",
|
||||
"lastModified": 1740245535,
|
||||
"narHash": "sha256-65Jt61DGE5kVMFut8JLH7Zw8FwxiZV3dTHtHbjtf9mk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "b5ab2c7fdaa807cf425066ab7cd34b073946b1ca",
|
||||
"rev": "7ceacd98a9fc99743ae7d9a5c0a4ea7c72314da6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -699,11 +699,11 @@
|
|||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1740318097,
|
||||
"narHash": "sha256-lCRwHfZqpXO/Q98WCTD0eOWvKpA2J4ANLxrDzd3aWJw=",
|
||||
"lastModified": 1740242292,
|
||||
"narHash": "sha256-TqB+T5xMpJceNghzPuEG10eo6G+n60J12YOo/xG2kF8=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "aaab224bea76cc6882884f9223b4bec2a781ebd4",
|
||||
"revCount": 17460,
|
||||
"rev": "184922de1915e2920ebd8b59e072dd41f968d52c",
|
||||
"revCount": 17447,
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/lix"
|
||||
},
|
||||
|
@ -779,11 +779,11 @@
|
|||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1740326457,
|
||||
"narHash": "sha256-C1tiPRIXI6Z5vd3pz26/JQ/p+VaG2eKD6PNk8ZqFW1E=",
|
||||
"lastModified": 1740219878,
|
||||
"narHash": "sha256-t/kNZLTDelJDRAWaLdfeG97IpqaHjnt/oO9priALSa4=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "23b0234ac1b03709a0cec40e84d293f083859dc9",
|
||||
"rev": "964d99464ac8330927db693f827027c16a3a3b76",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -812,11 +812,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1740251548,
|
||||
"narHash": "sha256-53kgDwNYEPIZadX5SEk7+OoTXycHm1QUF7x2XCoo9+U=",
|
||||
"lastModified": 1740117926,
|
||||
"narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "bca65452882e1e616045e21a0a9a4a0b7024239b",
|
||||
"rev": "b94a5db8790339cf9134873d8b490be69e02ac71",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1043,11 +1043,11 @@
|
|||
},
|
||||
"nixpkgs-stable_4": {
|
||||
"locked": {
|
||||
"lastModified": 1740162160,
|
||||
"narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=",
|
||||
"lastModified": 1739923778,
|
||||
"narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9",
|
||||
"rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1107,11 +1107,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1740301968,
|
||||
"narHash": "sha256-eDAiNagpMExcLoSIgjdef2ZYyvjuy1VTF8r9OZXCMGc=",
|
||||
"lastModified": 1740215764,
|
||||
"narHash": "sha256-wzBbGGZ6i1VVBA/cDJaLfuuGYCUriD7fwsLgJJHRVRk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b7fe81518095c48a8ba94fc7cfe5c0fc8370851b",
|
||||
"rev": "8465e233b0668cf162c608a92e62e8d78c1ba7e4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1330,11 +1330,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1740277845,
|
||||
"narHash": "sha256-NNU0CdiaSbAeZ8tpDG4aFi9qtcdlItRvk8Xns9oBrVU=",
|
||||
"lastModified": 1740191166,
|
||||
"narHash": "sha256-WqRxO1Afx8jPYG4CKwkvDFWFvDLCwCd4mxb97hFGYPg=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "f933070c29f9c1c5457447a51903f27f76ebb519",
|
||||
"rev": "74a3fb71b0cc67376ab9e7c31abcd68c813fc226",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1426,11 +1426,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1740275623,
|
||||
"narHash": "sha256-LQ9hq3hKwWqm+dzBhgsIkr2KO6Bb0aU+yO/TtI7hXXo=",
|
||||
"lastModified": 1740188781,
|
||||
"narHash": "sha256-3FDg6k9kQXq5M6ZHc2f9KsPydvWBtqacU9lWA7nIFYI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "35ff5dce04469e7b4e56a9d997e5201bfce52ae3",
|
||||
"rev": "ba52a14c907e0cece9734e0ff59c3c742b6b1075",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -3,10 +3,9 @@
|
|||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgs.vscodium;
|
||||
mutableExtensionsDir = false;
|
||||
profiles.default = {
|
||||
enableUpdateCheck = false;
|
||||
enableExtensionUpdateCheck = false;
|
||||
mutableExtensionsDir = false;
|
||||
extensions =
|
||||
# if unfree
|
||||
# with pkgs.vscode-marketplace;
|
||||
|
@ -16,7 +15,6 @@
|
|||
github.github-vscode-theme
|
||||
rust-lang.rust-analyzer
|
||||
shd101wyy.markdown-preview-enhanced
|
||||
fwcd.kotlin
|
||||
];
|
||||
userSettings = {
|
||||
"workbench.colorTheme" = "GitHub Dark Default";
|
||||
|
@ -41,5 +39,4 @@
|
|||
"workbench.startupEditor" = "none";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -58,11 +58,6 @@
|
|||
};
|
||||
help.autocorrect = 1;
|
||||
"mergetool \"vimdiff\"".cmd = "nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'";
|
||||
url = {
|
||||
"ssh://git@github.com/" = {
|
||||
insteadOf = "https://github.com/";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.ripgrep.enable = true;
|
||||
|
|
|
@ -94,7 +94,7 @@
|
|||
lm_sensors
|
||||
sshfs
|
||||
gopls
|
||||
anki-bin
|
||||
anki
|
||||
trezorctl
|
||||
trezor-agent
|
||||
q
|
||||
|
@ -143,12 +143,27 @@
|
|||
))
|
||||
telegram-desktop
|
||||
jadx
|
||||
gradle
|
||||
];
|
||||
|
||||
programs.waybar.enable = true;
|
||||
programs.feh.enable = true;
|
||||
|
||||
services.mako = {
|
||||
enable = false;
|
||||
backgroundColor = "#1a1a1a";
|
||||
defaultTimeout = 5000;
|
||||
borderSize = 0;
|
||||
borderRadius = 10;
|
||||
font = "DejaVu Sans Mono 11";
|
||||
padding = "10";
|
||||
textColor = "#ffffff";
|
||||
extraConfig = ''
|
||||
[urgency=high]
|
||||
background-color=#c00000
|
||||
border-color=#ff0000
|
||||
'';
|
||||
};
|
||||
|
||||
xdg.configFile = {
|
||||
rofi.source = ../rofi;
|
||||
waybar.source = ../waybar;
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
{ ... }:
|
||||
{ inputs, ... }:
|
||||
{
|
||||
services.conduwuit = {
|
||||
enable = true;
|
||||
package =
|
||||
inputs.conduwuit.packages.x86_64-linux.static-x86_64-linux-musl-all-features-x86_64-haswell-optimised;
|
||||
settings.global = {
|
||||
port = [ 8448 ];
|
||||
server_name = "cything.io";
|
||||
|
|
|
@ -153,7 +153,7 @@
|
|||
git
|
||||
python3
|
||||
wl-clipboard
|
||||
# mako # sway config uses this
|
||||
mako
|
||||
tree
|
||||
kitty
|
||||
borgbackup
|
||||
|
@ -427,9 +427,4 @@
|
|||
services.envfs.enable = true;
|
||||
programs.kdeconnect.enable = true;
|
||||
programs.dconf.enable = true;
|
||||
|
||||
programs.java = {
|
||||
enable = true;
|
||||
binfmt = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ inputs }:
|
||||
let
|
||||
overlays = [
|
||||
./conduwuit
|
||||
./attic
|
||||
];
|
||||
importedOverlays = map (m: import m) overlays;
|
||||
|
@ -14,7 +15,12 @@ importedOverlays
|
|||
stable = inputs.nixpkgs-stable;
|
||||
in
|
||||
{
|
||||
conduwuit = inputs.conduwuit.packages.x86_64-linux.static-x86_64-linux-musl-all-features-x86_64-haswell-optimised;
|
||||
# bitwarden-cli = pkgFrom stable "bitwarden-cli";
|
||||
# roundcube = pkgFrom stable "roundcube";
|
||||
# lldb = pkgFrom stable "lldb";
|
||||
# calibre = pkgFrom stable "calibre";
|
||||
# nil = inputs.nil.packages.${prev.system}.nil;
|
||||
# anki = pkgFrom inputs.anki "anki-bin";
|
||||
}
|
||||
)
|
||||
]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue