Compare commits
No commits in common. "main" and "home-wayland-migration" have entirely different histories.
main
...
home-wayla
104
flake.lock
generated
104
flake.lock
generated
@ -1,28 +1,5 @@
|
||||
{
|
||||
"nodes": {
|
||||
"anyrun": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733604390,
|
||||
"narHash": "sha256-i1V+K46e0OSu3T9q2QsZ3GqpIrSIZx39sRpfcDPa6wU=",
|
||||
"ref": "plugins-application-preprocess-exec",
|
||||
"rev": "f9ef5665febcabd03ad2f0ce561c79974194a953",
|
||||
"revCount": 197,
|
||||
"type": "git",
|
||||
"url": "https://git.pvv.ntnu.no/oysteikt/anyrun"
|
||||
},
|
||||
"original": {
|
||||
"ref": "plugins-application-preprocess-exec",
|
||||
"type": "git",
|
||||
"url": "https://git.pvv.ntnu.no/oysteikt/anyrun"
|
||||
}
|
||||
},
|
||||
"dotfiles": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@ -56,30 +33,9 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"anyrun",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727826117,
|
||||
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
@ -97,7 +53,7 @@
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_3"
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
@ -120,11 +76,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733572789,
|
||||
"narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=",
|
||||
"lastModified": 1733050161,
|
||||
"narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c7ffc9727d115e433fd884a62dc164b587ff651d",
|
||||
"rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -202,11 +158,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733623390,
|
||||
"narHash": "sha256-2NcNHpofUCVam1gLhj71nbszEzki7Q/PtjH1X0MqCso=",
|
||||
"lastModified": 1733363776,
|
||||
"narHash": "sha256-3EZvm60PErALa91el3zRl+cJCuHmJfqiBzK+EEPnf84=",
|
||||
"owner": "infinidoge",
|
||||
"repo": "nix-minecraft",
|
||||
"rev": "d63629179143d079d6e4975f8c68bb71a5d3ea08",
|
||||
"rev": "46d4b9024ccd2b36012ba074b330fd955a22295b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -217,11 +173,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1733481457,
|
||||
"narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
|
||||
"lastModified": 1733217105,
|
||||
"narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
|
||||
"rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -233,11 +189,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1733412085,
|
||||
"narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=",
|
||||
"lastModified": 1733261153,
|
||||
"narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541",
|
||||
"rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -248,11 +204,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1733666439,
|
||||
"narHash": "sha256-6DE9U/t7sB7Vs/afxbcWXaUmsmhhcBNS6BIwsgYwr04=",
|
||||
"lastModified": 1733390065,
|
||||
"narHash": "sha256-iB3dHF25/3kwBLwOHJaMp2JPq3iBLkcnHxWfemykRsg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a68fdbb81277f4e1b01eebc7237576f89bb73d02",
|
||||
"rev": "59e0687dfe83e658efb399f903970abbf3a6730e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -269,11 +225,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1684092181,
|
||||
"narHash": "sha256-Oi6G8Jx2RkEMi3UndtAnZw61hfgKGEe7l/ILdB9ump4=",
|
||||
"lastModified": 1672838459,
|
||||
"narHash": "sha256-SIXzj9fbSvr/jfhhil+0cS7I6KONijdH80PFGxJi+CA=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "028ed8774d1cf4650fc15253146cf14451eb608c",
|
||||
"revCount": 43,
|
||||
"rev": "392fb541ce39f1f52908eee336d5ed409cd798ed",
|
||||
"revCount": 42,
|
||||
"type": "git",
|
||||
"url": "file:///home/h7x4/git/osuchan-line-bot"
|
||||
},
|
||||
@ -284,7 +240,6 @@
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"anyrun": "anyrun",
|
||||
"dotfiles": "dotfiles",
|
||||
"home-manager": "home-manager",
|
||||
"matrix-synapse-next": "matrix-synapse-next",
|
||||
@ -319,21 +274,6 @@
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default-linux",
|
||||
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default-linux",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
@ -348,7 +288,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
|
||||
45
flake.nix
45
flake.nix
@ -52,11 +52,6 @@
|
||||
url = "github:nix-community/nixos-vscode-server";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
anyrun = {
|
||||
url = "git+https://git.pvv.ntnu.no/oysteikt/anyrun?ref=plugins-application-preprocess-exec";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = inputs@{
|
||||
@ -73,7 +68,6 @@
|
||||
osuchan,
|
||||
sops-nix,
|
||||
vscode-server,
|
||||
anyrun,
|
||||
# website
|
||||
}: let
|
||||
system = "x86_64-linux";
|
||||
@ -87,9 +81,6 @@
|
||||
segger-jlink.acceptLicense = true;
|
||||
permittedInsecurePackages = [
|
||||
"segger-jlink-qt4-796s"
|
||||
"dotnet-core-combined"
|
||||
"dotnet-sdk-6.0.428"
|
||||
"dotnet-sdk-wrapped-6.0.428"
|
||||
];
|
||||
};
|
||||
|
||||
@ -104,31 +95,6 @@
|
||||
};
|
||||
in [
|
||||
(import ./overlays/wayland-ime-integration.nix)
|
||||
|
||||
(final: prev: {
|
||||
mpd = prev.mpd.overrideAttrs (prev': {
|
||||
version = "v0.23.16-unstable";
|
||||
src = final.fetchFromGitHub {
|
||||
owner = "MusicPlayerDaemon";
|
||||
repo = "MPD";
|
||||
rev = "b6e187efd8520ca9e3541e630559246c893cc304";
|
||||
hash = "sha256-EGpBiH/Sp7xgcSpj/zKgFqDfjdr2djveC+qV57imr3E=";
|
||||
};
|
||||
|
||||
postPatch = prev'.postPatch + ''
|
||||
substituteInPlace src/lib/yajl/Handle.hxx \
|
||||
--replace-fail '<yajl_parse.h>' '<yajl/yajl_parse.h>'
|
||||
substituteInPlace src/lib/yajl/Callbacks.hxx \
|
||||
--replace-fail '<yajl_parse.h>' '<yajl/yajl_parse.h>'
|
||||
substituteInPlace src/lib/yajl/Gen.hxx \
|
||||
--replace-fail '<yajl_gen.h>' '<yajl/yajl_gen.h>'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = prev'.nativeBuildInputs ++ [
|
||||
final.python3Packages.sphinx-rtd-theme
|
||||
];
|
||||
});
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
@ -208,7 +174,6 @@
|
||||
|
||||
sharedModules = [
|
||||
inputs.sops-nix.homeManagerModules.sops
|
||||
inputs.anyrun.homeManagerModules.default
|
||||
];
|
||||
|
||||
users.h7x4.imports = [
|
||||
@ -237,15 +202,7 @@
|
||||
nixos-hardware.nixosModules.common-gpu-intel
|
||||
];
|
||||
};
|
||||
kasei = nixSys "kasei" {
|
||||
modules = [
|
||||
nixos-hardware.nixosModules.common-pc
|
||||
nixos-hardware.nixosModules.common-pc-ssd
|
||||
nixos-hardware.nixosModules.common-cpu-amd
|
||||
nixos-hardware.nixosModules.common-cpu-amd-pstate
|
||||
nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
|
||||
];
|
||||
};
|
||||
kasei = nixSys "kasei" { };
|
||||
xps16 = nixSys "xps16" {
|
||||
modules = [
|
||||
nixos-hardware.nixosModules.common-hidpi
|
||||
|
||||
@ -62,7 +62,7 @@ in {
|
||||
./programs/taskwarrior.nix
|
||||
./programs/vscode
|
||||
./programs/zathura.nix
|
||||
./programs/zed
|
||||
# ./programs/zed
|
||||
|
||||
./services/copyq.nix
|
||||
./services/dunst.nix
|
||||
@ -76,7 +76,6 @@ in {
|
||||
]) ++ (optionals machineVars.wayland [
|
||||
./programs/hyprland.nix
|
||||
./programs/waybar.nix
|
||||
./programs/anyrun
|
||||
]) ++ (optionals (!machineVars.wayland) [
|
||||
./programs/xmonad
|
||||
# ./programs/xmobar
|
||||
@ -131,14 +130,8 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
dconf.settings = {
|
||||
"org/gnome/desktop/interface" = {
|
||||
color-scheme = "prefer-dark";
|
||||
};
|
||||
};
|
||||
|
||||
xsession = {
|
||||
enable = !machineVars.wayland;
|
||||
enable = true;
|
||||
# TODO: declare using xdg config home
|
||||
scriptPath = ".config/X11/xsession";
|
||||
profilePath = ".config/X11/xprofile";
|
||||
|
||||
@ -99,7 +99,6 @@
|
||||
libnotify
|
||||
libreoffice
|
||||
light
|
||||
mission-center
|
||||
mopidy
|
||||
mopidy-mpd
|
||||
mopidy-soundcloud
|
||||
@ -121,7 +120,6 @@
|
||||
|
||||
tenacity
|
||||
# transcribe
|
||||
webcamoid
|
||||
xcalib
|
||||
xclip
|
||||
xdotool
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
{ pkgs, lib, inputs, ... }:
|
||||
{
|
||||
programs.anyrun = {
|
||||
enable = true;
|
||||
|
||||
config = {
|
||||
y.fraction = 0.3;
|
||||
width.fraction = 0.25;
|
||||
plugins = [
|
||||
inputs.anyrun.packages.${pkgs.system}.applications
|
||||
];
|
||||
hidePluginInfo = true;
|
||||
closeOnClick = true;
|
||||
showResultsImmediately = true;
|
||||
};
|
||||
|
||||
extraCss = builtins.readFile (./. + "/style.css");
|
||||
|
||||
extraConfigFiles."applications.ron".text = let
|
||||
preprocess_script = pkgs.writeShellApplication {
|
||||
name = "anyrun-preprocess-application-exec";
|
||||
runtimeInputs = [ ];
|
||||
text = ''
|
||||
shift # Remove term|no-term
|
||||
echo "uwsm app -- $*"
|
||||
'';
|
||||
};
|
||||
in ''
|
||||
Config(
|
||||
desktop_actions: false,
|
||||
max_entries: 10,
|
||||
preprocess_exec_script: Some("${lib.getExe preprocess_script}"),
|
||||
terminal: Some("${lib.getExe pkgs.alacritty}"),
|
||||
)
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -1,48 +0,0 @@
|
||||
* {
|
||||
all: unset;
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
|
||||
#window,
|
||||
#match,
|
||||
#entry,
|
||||
#plugin,
|
||||
#main {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
#match.activatable {
|
||||
border-radius: 8px;
|
||||
margin: 4px 0;
|
||||
padding: 4px;
|
||||
/* transition: 100ms ease-out; */
|
||||
}
|
||||
#match.activatable:first-child {
|
||||
margin-top: 12px;
|
||||
}
|
||||
#match.activatable:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
#match:hover {
|
||||
background: rgba(255, 255, 255, 0.05);
|
||||
}
|
||||
#match:selected {
|
||||
background: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#entry {
|
||||
background: rgba(255, 255, 255, 0.05);
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
border-radius: 8px;
|
||||
padding: 4px 8px;
|
||||
}
|
||||
|
||||
box#main {
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
box-shadow:
|
||||
inset 0 0 0 1px rgba(255, 255, 255, 0.1),
|
||||
0 30px 30px 15px rgba(0, 0, 0, 0.5);
|
||||
border-radius: 20px;
|
||||
padding: 12px;
|
||||
}
|
||||
@ -20,9 +20,9 @@ in
|
||||
# QT_QPA_PLATFORMTHEME = "qt6ct";
|
||||
QT_AUTO_SCREEN_SCALE_FACTOR = "1";
|
||||
|
||||
# LIBVA_DRIVER_NAME = "nvidia";
|
||||
# GBM_BACKEND = "nvidia-drm";
|
||||
# __GLX_VENDOR_LIBRARY_NAME = "nvidia";
|
||||
LIBVA_DRIVER_NAME = "nvidia";
|
||||
GBM_BACKEND = "nvidia-drm";
|
||||
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
@ -92,16 +92,12 @@ in
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
|
||||
systemd.enable = false;
|
||||
systemd.enableXdgAutostart = false;
|
||||
|
||||
settings = let
|
||||
exe = lib.getExe;
|
||||
scratchpads = [
|
||||
(rec {
|
||||
title = "Floating terminal";
|
||||
class = "floatingTerminal";
|
||||
command = "uwsm app -- ${exe pkgs.alacritty} --class ${class} -e ${exe pkgs.tmux} new-session -A -s f";
|
||||
command = "${pkgs.alacritty}/bin/alacritty --class ${class} -e ${pkgs.tmux}/bin/tmux new-session -A -s f";
|
||||
size = { h = 90; w = 95; };
|
||||
keys = [
|
||||
"$mod, RETURN"
|
||||
@ -111,7 +107,7 @@ in
|
||||
(rec {
|
||||
title = "Ncmpcpp";
|
||||
class = "floatingNcmpcpp";
|
||||
command = "uwsm app -- ${exe pkgs.alacritty} --class ${class} -e ${exe pkgs.ncmpcpp}";
|
||||
command = "${pkgs.alacritty}/bin/alacritty --class ${class} -e ${pkgs.ncmpcpp}/bin/ncmpcpp";
|
||||
size = { h = 95; w = 95; };
|
||||
keys = [ "$mod, Q" ];
|
||||
})
|
||||
@ -124,19 +120,18 @@ in
|
||||
|
||||
# https://github.com/xkbcommon/libxkbcommon/blob/master/include/xkbcommon/xkbcommon-keysyms.h
|
||||
bind = [
|
||||
"$mod SHIFT, Q, exec, ${pkgs.systemd}/bin/loginctl terminate-user \"\""
|
||||
"$mod ALT SHIFT, Q, exit"
|
||||
"$mod, R, exec, uwsm app -- ${exe config.programs.anyrun.package}"
|
||||
"$mod SHIFT, Q, exit"
|
||||
"$mod, R, exec, ${pkgs.rofi}/bin/rofi -show drun"
|
||||
"$mod, T, togglefloating"
|
||||
|
||||
"$mod, F, fullscreenstate, 1"
|
||||
"$mod SHIFT, F, fullscreenstate, 3"
|
||||
# TODO: fix this for upcoming releases
|
||||
"$mod, F, fullscreen, 2"
|
||||
"$mod, C, exec, ${cfg.finalPackage}/bin/hyprctl reload"
|
||||
|
||||
"$mod, BACKSPACE, killactive"
|
||||
|
||||
"$mod SHIFT, RETURN, exec, uwsm app -- ${exe pkgs.alacritty} --class termTerminal -e ${exe pkgs.tmux} new-session -A -s term"
|
||||
"$mod SHIFT, SPACE, exec, uwsm app -- ${exe pkgs.alacritty} --class termTerminal -e ${exe pkgs.tmux} new-session -A -s term"
|
||||
"$mod SHIFT, RETURN, exec, ${pkgs.alacritty}/bin/alacritty --class termTerminal -e ${pkgs.tmux}/bin/tmux new-session -A -s term"
|
||||
"$mod SHIFT, SPACE, exec, ${pkgs.alacritty}/bin/alacritty --class termTerminal -e ${pkgs.tmux}/bin/tmux new-session -A -s term"
|
||||
|
||||
"$mod, j, layoutmsg,cyclenext"
|
||||
"$mod, k, layoutmsg,cycleprev"
|
||||
@ -174,7 +169,7 @@ in
|
||||
# "super + minus" = "${pkgs.xcalib}/bin/xcalib -invert -alter"
|
||||
|
||||
# TODO: fix
|
||||
", Print, exec, ${exe pkgs.grimblast} copy area"
|
||||
", Print, exec, ${lib.getExe pkgs.grimblast} copy area"
|
||||
|
||||
# "SHIFT, Print, exec, ${lib.getExe pkgs.grimblast} copy area"
|
||||
# "shift + @Print" = "${pkgs.maim}/bin/maim --hidecursor --nokeyboard $SCREENSHOT_DIR/$(date +%s).png"
|
||||
@ -216,41 +211,29 @@ in
|
||||
]);
|
||||
|
||||
bindl = [
|
||||
"$mod, p, exec, ${exe pkgs.mpc_cli} toggle"
|
||||
",XF86AudioPlay, exec, ${exe pkgs.mpc_cli} toggle"
|
||||
",XF86AudioPrev, exec, ${exe pkgs.mpc_cli} prev"
|
||||
",XF86AudioNext, exec, ${exe pkgs.mpc_cli} next"
|
||||
"$mod, p, exec, ${pkgs.mpc_cli}/bin/mpc toggle"
|
||||
",XF86AudioPlay, exec, ${pkgs.mpc_cli}/bin/mpc toggle"
|
||||
",XF86AudioPrev, exec, ${pkgs.mpc_cli}/bin/mpc prev"
|
||||
",XF86AudioNext, exec, ${pkgs.mpc_cli}/bin/mpc next"
|
||||
];
|
||||
|
||||
bindle = [
|
||||
",XF86MonBrightnessUp, exec, ${exe pkgs.brightnessctl} s +5%"
|
||||
",XF86MonBrightnessDown, exec, ${exe pkgs.brightnessctl} s 5%-"
|
||||
",XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} s +5%"
|
||||
",XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} s 5%-"
|
||||
",XF86AudioLowerVolume, exec, ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%-"
|
||||
",XF86AudioRaiseVolume, exec, ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%+"
|
||||
"$mod ,F7, exec, ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%-"
|
||||
"$mod ,F8, exec, ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%+"
|
||||
];
|
||||
|
||||
exec-once = [
|
||||
"uwsm finalize"
|
||||
];
|
||||
|
||||
windowrulev2 = [
|
||||
"float,class:(Rofi)"
|
||||
"float,class:^(xdg-desktop-portal-gtk)$"
|
||||
"float, title:^(.*Bitwarden Password Manager.*)$"
|
||||
|
||||
"dimaround, class:^(xdg-desktop-portal-gtk)$"
|
||||
|
||||
"workspace special silent, title:^(Firefox — Sharing Indicator)$"
|
||||
"workspace special silent, title:^(Zen — Sharing Indicator)$"
|
||||
"workspace special silent, title:^(.*is sharing (your screen|a window)\.)$"
|
||||
|
||||
"workspace 2,class:(firefox)"
|
||||
"workspace 2,class:(google-chrome)"
|
||||
|
||||
"workspace 3,class:(Emacs)"
|
||||
"workspace 3,class:(code)"
|
||||
"workspace 3,class:(Code)"
|
||||
"workspace 3,class:(code-url-handler)"
|
||||
|
||||
"workspace 5,class:(discord)"
|
||||
@ -337,13 +320,4 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# UWSM
|
||||
systemd.user.services = {
|
||||
hypridle.Unit.After = lib.mkForce "graphical-session.target";
|
||||
waybar.Unit.After = lib.mkForce "graphical-session.target";
|
||||
network-manager-applet.Unit.After = lib.mkForce "graphical-session.target";
|
||||
fcitx5-daemon.Unit.After = lib.mkForce "graphical-session.target";
|
||||
# hyprpaper.Unit.After = lib.mkForce "graphical-session.target";
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,7 +28,6 @@ let # http://www.pvv.ntnu.no/pvv/Maskiner
|
||||
"shark"
|
||||
"tallulah"
|
||||
"tom"
|
||||
"ustetind"
|
||||
"venture"
|
||||
];
|
||||
|
||||
|
||||
@ -167,7 +167,6 @@ in
|
||||
"telemetry.telemetryLevel" = "off";
|
||||
"terminal.integrated.fontSize" = 14;
|
||||
"vsintellicode.modify.editor.suggestSelection" = "automaticallyOverrodeDefaultValue";
|
||||
"keyboard.dispatch" = "keyCode";
|
||||
"window.zoomLevel" = 1;
|
||||
|
||||
"search.exclude" = {
|
||||
|
||||
@ -1,75 +1,26 @@
|
||||
{ pkgs, ... }:
|
||||
{ config, pkgs, unstable-pkgs, lib, ... }:
|
||||
{
|
||||
programs.zed-editor = {
|
||||
enable = true;
|
||||
home.packages = with unstable-pkgs; [ zed-editor ];
|
||||
|
||||
userSettings = {
|
||||
load_direnv = "shell_hook";
|
||||
base_keymap = "VSCode";
|
||||
xdg.configFile."zed/settings.json".source = let
|
||||
format = pkgs.formats.json { };
|
||||
in format.generate "zed-settings.json" {
|
||||
autosave = "off";
|
||||
buffer_font_family = "Fira Code";
|
||||
load_direnv = "shell_hook";
|
||||
format_on_save = "off";
|
||||
|
||||
autosave = "off";
|
||||
format_on_save = "off";
|
||||
remove_trailing_whitespace_on_save = false;
|
||||
|
||||
tab_size = 2;
|
||||
|
||||
ui_font_family = "Noto Sans";
|
||||
buffer_font_family = "Fira Code";
|
||||
terminal.font_family = "Fira Code";
|
||||
|
||||
telemetry = {
|
||||
diagnostics = false;
|
||||
metrics = false;
|
||||
};
|
||||
|
||||
vim_mode = true;
|
||||
|
||||
theme = {
|
||||
mode = "dark";
|
||||
light = "monokai Classic";
|
||||
dark = "monokai Darker Classic";
|
||||
};
|
||||
|
||||
file_scan_exclusions = [
|
||||
"**/.git"
|
||||
"**/.svn"
|
||||
"**/.hg"
|
||||
"**/.jj"
|
||||
"**/CVS"
|
||||
"**/.DS_Store"
|
||||
"**/Thumbs.db"
|
||||
"**/.classpath"
|
||||
"**/.settings"
|
||||
|
||||
"**/.direnv"
|
||||
];
|
||||
|
||||
git.inline_blame.enable = false;
|
||||
|
||||
indent_guides = {
|
||||
enabled = true;
|
||||
coloring = "indent_aware";
|
||||
};
|
||||
telemetry = {
|
||||
diagnostics = false;
|
||||
metrics = false;
|
||||
};
|
||||
|
||||
userKeymaps = [
|
||||
{
|
||||
context = "Workspace";
|
||||
bindings = {
|
||||
ctrl-j = "workspace::NewTerminal";
|
||||
};
|
||||
}
|
||||
];
|
||||
vim_mode = true;
|
||||
|
||||
extensions = [
|
||||
"basher"
|
||||
"dart"
|
||||
"dockerfile"
|
||||
"html"
|
||||
"nix"
|
||||
"sql"
|
||||
"toml"
|
||||
];
|
||||
theme = {
|
||||
mod = "dark";
|
||||
dark = "monokai Classic";
|
||||
};
|
||||
};
|
||||
|
||||
xdg.configFile."zed/themes/monokai.json".source = let
|
||||
|
||||
@ -132,6 +132,5 @@ in
|
||||
Service.Restart="on-failure";
|
||||
Service.ExecStart = lib.mkForce "${fcitx5Package}/bin/fcitx5";
|
||||
Service.ExecReload = "/bin/kill -HUP $MAINPID";
|
||||
Install.Alias = "fcitx5.service";
|
||||
};
|
||||
}
|
||||
|
||||
@ -61,7 +61,6 @@ in {
|
||||
findx = p "fd";
|
||||
|
||||
ag = "${pkgs.ripgrep}/bin/rg";
|
||||
sxiv = "${pkgs.nsxiv}/bin/nsxiv";
|
||||
|
||||
lls = "${pkgs.coreutils}/bin/ls --color=always";
|
||||
ls = p "eza";
|
||||
@ -271,7 +270,6 @@ in {
|
||||
p = "${pkgs.python3Packages.ipython}/bin/ipython";
|
||||
s = p "sxiv";
|
||||
v = p "mpv";
|
||||
zed = p "zed-editor";
|
||||
zt = p "zathura";
|
||||
};
|
||||
|
||||
|
||||
@ -141,10 +141,7 @@ in {
|
||||
git.enable = true;
|
||||
tmux.enable = true;
|
||||
zsh.enable = true;
|
||||
hyprland = lib.mkIf config.machineVars.wayland {
|
||||
enable = true;
|
||||
withUWSM = true;
|
||||
};
|
||||
hyprland.enable = config.machineVars.wayland;
|
||||
};
|
||||
|
||||
security.pam.services = lib.mkIf (config.machineVars.wayland) {
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
{
|
||||
services.dbus = {
|
||||
enable = true;
|
||||
implementation = "broker";
|
||||
packages = with pkgs; [
|
||||
gcr
|
||||
dconf
|
||||
|
||||
@ -8,10 +8,7 @@
|
||||
wayland.enable = config.machineVars.wayland;
|
||||
package = pkgs.kdePackages.sddm;
|
||||
theme = "sddm-astronaut-theme";
|
||||
extraPackages = [
|
||||
pkgs.kdePackages.qt5compat
|
||||
# pkgs.sddm-astronaut
|
||||
];
|
||||
# extraPackages = [ pkgs.sddm-astronaut ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
development = true;
|
||||
creative = true;
|
||||
|
||||
wayland = true;
|
||||
|
||||
dataDrives = let
|
||||
main = "/data";
|
||||
in {
|
||||
|
||||
@ -1,11 +1,7 @@
|
||||
{ config, pkgs, ... }:
|
||||
{ config, ... }:
|
||||
{
|
||||
home.stateVersion = "24.05";
|
||||
|
||||
home.packages = with pkgs; [
|
||||
groovy
|
||||
];
|
||||
|
||||
programs.ssh.matchBlocks = {
|
||||
"tsuki-ws" = {
|
||||
user = "h7x4";
|
||||
@ -22,6 +18,4 @@
|
||||
programs.git.includes = [
|
||||
{ path = config.sops.secrets."git/nordicsemi-maintenance-repos-config".path; }
|
||||
];
|
||||
|
||||
programs.waybar.settings.mainBar.output = [ "DP-1" ];
|
||||
}
|
||||
}
|
||||
@ -79,7 +79,7 @@
|
||||
|
||||
services = {
|
||||
openssh.enable = true;
|
||||
xserver.videoDrivers = [ "nvidia" ];
|
||||
xserver.videoDrivers = [ "amdgpu" ];
|
||||
tailscale.enable = true;
|
||||
avahi = {
|
||||
enable = true;
|
||||
@ -95,6 +95,12 @@
|
||||
|
||||
boot = {
|
||||
initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
|
||||
initrd.kernelModules = [ "amdgpu" ];
|
||||
|
||||
# kernelPackages = pkgs.linuxKernel.packages.linux_zen.zfs;
|
||||
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
|
||||
kernelModules = [ "kvm-amd" ];
|
||||
supportedFilesystems = [ "zfs" ];
|
||||
|
||||
loader = {
|
||||
efi.canTouchEfiVariables = false;
|
||||
@ -138,12 +144,10 @@
|
||||
enableRedistributableFirmware = true;
|
||||
keyboard.zsa.enable = true;
|
||||
sane.enable = true;
|
||||
|
||||
nvidia = {
|
||||
modesetting.enable = true;
|
||||
open = false;
|
||||
nvidiaSettings = true;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
opengl = {
|
||||
enable = true;
|
||||
driSupport = true;
|
||||
driSupport32Bit = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
|
||||
./services/btrfs.nix
|
||||
./services/docker.nix
|
||||
./services/fprintd.nix
|
||||
./services/keybase.nix
|
||||
./services/libvirtd.nix
|
||||
./services/logiops.nix
|
||||
@ -74,11 +73,11 @@
|
||||
};
|
||||
};
|
||||
libinput.touchpad.accelSpeed = "0.5";
|
||||
blueman.enable = true;
|
||||
};
|
||||
|
||||
# ipu6 does not compile on latest yet
|
||||
boot.kernelPackages = pkgs.linuxPackages_6_11;
|
||||
environment.systemPackages = [
|
||||
pkgs.webcamoid
|
||||
];
|
||||
|
||||
hardware = {
|
||||
bluetooth.enable = true;
|
||||
@ -89,9 +88,9 @@
|
||||
enable = true;
|
||||
enable32Bit = true;
|
||||
};
|
||||
ipu6 = {
|
||||
enable = true;
|
||||
platform = "ipu6epmtl";
|
||||
};
|
||||
# ipu6 = {
|
||||
# enable = true;
|
||||
# platform = "ipu6epmtl";
|
||||
# };
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
services.fprintd.enable = true;
|
||||
}
|
||||
@ -1,11 +1,4 @@
|
||||
{ ... }:
|
||||
{
|
||||
services.tlp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
RUNTIME_PM_ON_AC = "auto";
|
||||
RUNTIME_PM_ON_BAT = "auto";
|
||||
USB_AUTOSUSPEND = "0";
|
||||
};
|
||||
};
|
||||
services.tlp.enable = true;
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@ final: prev: let
|
||||
in pkg.overrideAttrs (prev': {
|
||||
postInstall = (prev'.postInstall or "") + ''
|
||||
wrapProgram "$out/bin/${binaryName}" \
|
||||
--add-flags "--enable-wayland-ime --wayland-text-input-version=3"
|
||||
--add-flags "--enable-wayland-ime"
|
||||
'';
|
||||
});
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user