switch from stable as default to unstable as default
This commit is contained in:
TheWanderingCrow
parent
2129e60782
commit
4264f92c19
25 changed files with 61 additions and 201 deletions
15
flake.lock
generated
15
flake.lock
generated
|
|
@ -193,16 +193,15 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772985280,
|
||||
"narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=",
|
||||
"lastModified": 1775143651,
|
||||
"narHash": "sha256-S0RqAyDPMTcv9vASMaE8eY1QexFysAOdnxUxFHIPOyE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "8f736f007139d7f70752657dff6a401a585d6cbc",
|
||||
"rev": "d166a078541982a76f14d3e06e9665fa5c9ed85e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -484,16 +483,16 @@
|
|||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1774388614,
|
||||
"narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=",
|
||||
"lastModified": 1775036866,
|
||||
"narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e",
|
||||
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-25.11",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@
|
|||
|
||||
inputs = {
|
||||
# Official inputs
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
|
||||
|
|
@ -103,7 +103,7 @@
|
|||
};
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
impermanence.url = "github:nix-community/impermanence";
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
{ pkgs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
home.packages = builtins.attrValues {
|
||||
inherit (pkgs.unstable)
|
||||
inherit (pkgs)
|
||||
devenv
|
||||
;
|
||||
};
|
||||
programs = {
|
||||
zsh.enable = true;
|
||||
zsh = {
|
||||
enable = true;
|
||||
dotDir = "${config.xdg.configHome}/zsh";
|
||||
};
|
||||
direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
programs.jujutsu = {
|
||||
enable = true;
|
||||
package = pkgs.unstable.jujutsu;
|
||||
package = pkgs.jujutsu;
|
||||
settings = {
|
||||
user = {
|
||||
email = "contact@wanderingcrow.net";
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
enable = true;
|
||||
userDirs = {
|
||||
enable = true;
|
||||
setSessionVariables = false;
|
||||
createDirectories = true;
|
||||
desktop = "${config.home.homeDirectory}/.desktop";
|
||||
documents = "${config.home.homeDirectory}/Documents";
|
||||
|
|
@ -20,8 +21,8 @@
|
|||
pictures = "${config.home.homeDirectory}/media/images";
|
||||
videos = "${config.home.homeDirectory}/media/video";
|
||||
extraConfig = {
|
||||
XDG_PUBLICSHARE_DIR = "/var/empty";
|
||||
XDG_TEMPLATES_DIR = "/var/empty";
|
||||
PUBLICSHARE = "/var/empty";
|
||||
TEMPLATES = "/var/empty";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,24 +13,12 @@
|
|||
programs.deferredApps = {
|
||||
enable = true;
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs.unstable)
|
||||
# CAD
|
||||
orca-slicer
|
||||
super-slicer
|
||||
meshlab
|
||||
openscad-unstable
|
||||
freecad
|
||||
blender
|
||||
dune3d
|
||||
# Local AI
|
||||
lmstudio
|
||||
;
|
||||
inherit (pkgs)
|
||||
# Utilities
|
||||
appimage-run
|
||||
steam-run
|
||||
bitwarden-cli
|
||||
protonvpn-gui
|
||||
proton-vpn
|
||||
imagemagick
|
||||
httpie
|
||||
distrobox
|
||||
|
|
@ -38,6 +26,14 @@
|
|||
# Art
|
||||
gimp
|
||||
krita
|
||||
# CAD
|
||||
orca-slicer
|
||||
super-slicer
|
||||
meshlab
|
||||
openscad-unstable
|
||||
blender
|
||||
# Local AI
|
||||
lmstudio
|
||||
;
|
||||
};
|
||||
apps = [
|
||||
|
|
|
|||
6
home/crow/common/optional/desktops/awww/default.nix
Normal file
6
home/crow/common/optional/desktops/awww/default.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{pkgs, ...}: {
|
||||
services.swww= {
|
||||
enable = true;
|
||||
package = pkgs.awww;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,10 @@
|
|||
{
|
||||
imports = [
|
||||
inputs.dms.homeModules.dank-material-shell
|
||||
../swww
|
||||
../awww
|
||||
];
|
||||
|
||||
programs.dank-material-shell = {
|
||||
enable = true;
|
||||
dgop.package = pkgs.unstable.dgop;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
services.swww = {
|
||||
enable = true;
|
||||
package = pkgs.swww;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
{lib, ...}: {
|
||||
# This file exists to define the options.
|
||||
# The configuration is done via the imported files.
|
||||
imports = [
|
||||
./herbstluftwm.nix
|
||||
./rofi.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,107 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
osConfig,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs; [
|
||||
# To set wallpaper
|
||||
hsetroot
|
||||
# For xinput
|
||||
perl
|
||||
gnugrep
|
||||
xorg.xinput
|
||||
];
|
||||
|
||||
xsession.windowManager.herbstluftwm = let
|
||||
mod = "Mod4";
|
||||
in {
|
||||
enable = true;
|
||||
|
||||
tags = ["1" "2" "3" "4" "5" "6" "7" "8" "9"];
|
||||
|
||||
keybinds = lib.mkMerge [
|
||||
{
|
||||
"${mod}-q" = "close";
|
||||
"${mod}-r" = "remove";
|
||||
"${mod}-Return" = "spawn wezterm";
|
||||
"${mod}-b" = "spawn ${config.programs.firefox.finalPackage}/bin/firefox";
|
||||
"${mod}-d" = "spawn rofi -show drun";
|
||||
"${mod}-Shift-s" = let
|
||||
screenshot = pkgs.writeShellScriptBin "screenshot" ''
|
||||
sleep 0.2
|
||||
exec ${pkgs.maim}/bin/maim -s | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png
|
||||
'';
|
||||
in "spawn ${screenshot}/bin/screenshot";
|
||||
"${mod}-Shift-Ctrl-l" = let
|
||||
lock = pkgs.writeShellScriptBin "lock" ''
|
||||
exec ${pkgs.xsecurelock}/bin/xsecurelock
|
||||
'';
|
||||
in "spawn ${lock}/bin/lock";
|
||||
# Shift-Ctrl-odiaeresis = Shift+Ctrl+ö
|
||||
"${mod}-Shift-Ctrl-odiaeresis" = "spawn ${pkgs.xsecurelock}/bin/xsecurelock";
|
||||
"XF86Display" = "spawn autorandr -c";
|
||||
"${mod}-Shift-d" = "spawn autorandr -c";
|
||||
"${mod}-l" = "focus right";
|
||||
"${mod}-k" = "focus up";
|
||||
"${mod}-j" = "focus down";
|
||||
"${mod}-h" = "focus left";
|
||||
"${mod}-Shift-l" = "shift right";
|
||||
"${mod}-Shift-k" = "shift up";
|
||||
"${mod}-Shift-j" = "shift down";
|
||||
"${mod}-Shift-h" = "shift left";
|
||||
"${mod}-u" = "split bottom 0.5";
|
||||
"${mod}-o" = "split right 0.5";
|
||||
"${mod}-Ctrl-space" = "split explode";
|
||||
"${mod}-f" = "fullscreen toggle";
|
||||
"${mod}-s" = "floating toggle";
|
||||
"${mod}-p" = "pseudotile toggle";
|
||||
"${mod}-space" = "or , and . compare tags.focus.curframe_wcount = 2 . cycle_layout +1 vertical horizontal max vertical grid , cycle_layout +1";
|
||||
}
|
||||
(lib.mkMerge (lib.lists.imap0
|
||||
# this won't work if tags has more than 9 elements
|
||||
(i: _: let
|
||||
index = builtins.toString i;
|
||||
key = builtins.toString (i + 1);
|
||||
in {
|
||||
"${mod}-${key}" = "use_index ${index}";
|
||||
"${mod}-Shift-${key}" = "move_index ${index}";
|
||||
})
|
||||
config.xsession.windowManager.herbstluftwm.tags))
|
||||
];
|
||||
|
||||
mousebinds = {
|
||||
"${mod}-Button1" = "move";
|
||||
"${mod}-Button2" = "zoom";
|
||||
"${mod}-Button3" = "resize";
|
||||
};
|
||||
|
||||
rules = [
|
||||
"focus=on" # focus new windows by default
|
||||
"windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)' pseudotile=on"
|
||||
"windowtype='_NET_WM_WINDOW_TYPE_DIALOG' focus=on"
|
||||
"windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK|DESKTOP)' manage=off"
|
||||
"class=Spotify focus=off tag=4"
|
||||
"class=Slack focus=off tag=2"
|
||||
"class=zoom focus=off tag=2"
|
||||
"class=firefox tag=1"
|
||||
];
|
||||
|
||||
settings = {
|
||||
frame_border_active_color = "#ed8796";
|
||||
frame_border_normal_color = "#181926";
|
||||
};
|
||||
|
||||
extraConfig = ''
|
||||
autorandr -c
|
||||
|
||||
xsetroot -cursor_name left_ptr &
|
||||
polybar &
|
||||
${config.programs.firefox.finalPackage}/bin/firefox &
|
||||
${lib.optionalString config.modules.social.slack.enable "slack &"}
|
||||
${lib.optionalString config.modules.nifty.media.spotify.enable "spotify &"}
|
||||
${lib.optionalString ((builtins.length osConfig.modules.mouse.settings) > 0) "marimouse &"}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
extraConfig = {
|
||||
modi = "window,run,drun";
|
||||
lines = 16;
|
||||
padding = 30;
|
||||
width = 45;
|
||||
location = 0;
|
||||
columns = 3;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -38,7 +38,7 @@ in
|
|||
{
|
||||
home.packages = [
|
||||
steam-session
|
||||
pkgs.unstable.vintagestory
|
||||
pkgs.vintagestory
|
||||
pkgs.r2modman
|
||||
pkgs.prismlauncher
|
||||
pkgs.heroic
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
{ pkgs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
home.packages = builtins.attrValues {
|
||||
inherit (pkgs.unstable)
|
||||
inherit (pkgs)
|
||||
devenv
|
||||
;
|
||||
};
|
||||
programs = {
|
||||
zsh.enable = true;
|
||||
zsh = {
|
||||
enable = true;
|
||||
dotDir = "${config.xdg.configHome}/zsh";
|
||||
};
|
||||
direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
programs.jujutsu = {
|
||||
enable = true;
|
||||
package = pkgs.unstable.jujutsu;
|
||||
package = pkgs.jujutsu;
|
||||
settings = {
|
||||
user = {
|
||||
email = "contact@wanderingcrow.net";
|
||||
|
|
|
|||
|
|
@ -1,17 +1,15 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [
|
||||
pkgs.unstable.protontricks
|
||||
pkgs.unstable.winetricks
|
||||
pkgs.wineWowPackages.stable
|
||||
pkgs.wineWowPackages.waylandFull
|
||||
pkgs.protontricks
|
||||
pkgs.winetricks
|
||||
pkgs.steamtinkerlaunch
|
||||
];
|
||||
|
||||
programs = {
|
||||
steam = {
|
||||
enable = true;
|
||||
extraCompatPackages = [ pkgs.unstable.proton-ge-bin ];
|
||||
extraCompatPackages = [ pkgs.proton-ge-bin ];
|
||||
};
|
||||
gamescope = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
services.postgresql.enable = true; # for msf
|
||||
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit (pkgs.unstable)
|
||||
inherit (pkgs)
|
||||
metasploit
|
||||
exploitdb
|
||||
termshark
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
{
|
||||
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit (pkgs.unstable)
|
||||
inherit (pkgs)
|
||||
monero-gui
|
||||
monero-cli
|
||||
p2pool
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
serviceConfig = {
|
||||
User = "p2pool";
|
||||
Group = "p2pool";
|
||||
ExecStart = "${pkgs.unstable.p2pool}/bin/p2pool --host 127.0.0.1 --wallet 48kwCPHhnbXfriMCtGHu4BRrc8dwmhUxVdD1ycATtDigW4Fjrsfhi7wQ2QSNyvspxaN7Tt2dApAEbFhTeSPD9w1x4JmyzTg --nano";
|
||||
ExecStart = "${pkgs.p2pool}/bin/p2pool --host 127.0.0.1 --wallet 48kwCPHhnbXfriMCtGHu4BRrc8dwmhUxVdD1ycATtDigW4Fjrsfhi7wQ2QSNyvspxaN7Tt2dApAEbFhTeSPD9w1x4JmyzTg --nano";
|
||||
Restart = "always";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
{
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit (pkgs.unstable)
|
||||
inherit (pkgs)
|
||||
monero-cli
|
||||
;
|
||||
};
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
{
|
||||
User = "monero";
|
||||
Group = "monero";
|
||||
ExecStart = "${pkgs.unstable.monero-cli}/bin/monerod --config-file=${moneroConfig} --non-interactive";
|
||||
ExecStart = "${pkgs.monero-cli}/bin/monerod --config-file=${moneroConfig} --non-interactive";
|
||||
Restart = "always";
|
||||
SuccessExitStatus = [
|
||||
0
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ in
|
|||
|
||||
programs.zsh.enable = true;
|
||||
environment.systemPackages = [
|
||||
pkgs.unstable.jujutsu
|
||||
pkgs.jujutsu
|
||||
pkgs.vim
|
||||
pkgs.just
|
||||
];
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
};
|
||||
background = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
description = "Path to background in assets to get handled with swww";
|
||||
description = "Path to background in assets to get handled with awww";
|
||||
default = null;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,13 +12,6 @@ in
|
|||
sopsFile = "${sopsFolder}/services.yaml";
|
||||
};
|
||||
|
||||
disabledModules = [
|
||||
"${inputs.nixpkgs}/nixos/modules/services/security/pocket-id.nix"
|
||||
];
|
||||
imports = [
|
||||
"${inputs.nixpkgs-unstable}/nixos/modules/services/security/pocket-id.nix"
|
||||
];
|
||||
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
virtualHosts."auth.wanderingcrow.net".extraConfig = ''
|
||||
|
|
@ -28,7 +21,7 @@ in
|
|||
|
||||
services.pocket-id = {
|
||||
enable = true;
|
||||
package = pkgs.unstable.pocket-id;
|
||||
package = pkgs.pocket-id;
|
||||
settings = {
|
||||
ANALYTICS_DISABLED = true;
|
||||
APP_URL = "https://auth.wanderingcrow.net";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ let
|
|||
defaultHomeserver = "psychal.link";
|
||||
}
|
||||
);
|
||||
customFluffy = pkgs.unstable.fluffychat-web.overrideAttrs (
|
||||
customFluffy = pkgs.fluffychat-web.overrideAttrs (
|
||||
final: prev: {
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -23,7 +23,7 @@ in
|
|||
{
|
||||
environment.systemPackages = [
|
||||
customFluffy
|
||||
pkgs.unstable.element-web
|
||||
pkgs.element-web
|
||||
];
|
||||
|
||||
sops.secrets."matrix/registration_token" = {
|
||||
|
|
@ -33,7 +33,7 @@ in
|
|||
|
||||
services.matrix-tuwunel = {
|
||||
enable = true;
|
||||
package = pkgs.unstable.matrix-tuwunel;
|
||||
package = pkgs.matrix-tuwunel;
|
||||
stateDirectory = "tuwunel";
|
||||
settings = {
|
||||
global = {
|
||||
|
|
@ -66,7 +66,7 @@ in
|
|||
file_server
|
||||
'';
|
||||
"em.psychal.link".extraConfig = ''
|
||||
root * ${pkgs.unstable.element-web}
|
||||
root * ${pkgs.element-web}
|
||||
file_server
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ in
|
|||
'';
|
||||
services.mealie = {
|
||||
enable = true;
|
||||
package = pkgs.unstable.mealie;
|
||||
package = pkgs.mealie;
|
||||
settings = {
|
||||
BASE_URL = "https://mealie.wanderingcrow.net";
|
||||
ALLOW_SIGNUP = "false";
|
||||
|
|
|
|||
|
|
@ -21,12 +21,12 @@ in
|
|||
|
||||
services.tailscale = {
|
||||
enable = true;
|
||||
package = pkgs.unstable.tailscale;
|
||||
package = pkgs.tailscale;
|
||||
authKeyFile = config.sops.secrets."tailscale-key".path;
|
||||
};
|
||||
|
||||
services.netbird = {
|
||||
package = pkgs.unstable.netbird;
|
||||
package = pkgs.netbird;
|
||||
|
||||
clients.blackbridge = {
|
||||
login = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue