Compare commits

...

2 commits

Author SHA1 Message Date
dfaaca9026 several tweaks 2024-02-18 23:04:50 +01:00
e7d1eb56b5 flake.lock: Update
Flake lock file updates:

• Updated input 'devenv':
    'github:cachix/devenv/5a30b9e5ac7c6167e61b1f4193d5130bb9f8defa' (2024-02-13)
  → 'github:cachix/devenv/40b567388381137a3c49acdff5f4b6946d645a5f' (2024-02-17)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/a4d4fe8c5002202493e87ec8dbc91335ff55552c' (2024-02-15)
  → 'github:NixOS/nixpkgs/5863c27340ba4de8f83e7e3c023b9599c3cb3c80' (2024-02-16)
2024-02-17 20:48:56 +01:00
6 changed files with 39 additions and 30 deletions

View file

@ -28,11 +28,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1707817777, "lastModified": 1708141957,
"narHash": "sha256-vHyIs1OULQ3/91wD6xOiuayfI71JXALGA5KLnDKAcy0=", "narHash": "sha256-IWkw+jsVpu7HFNPbOTJaQeMYQ5/eh7ZVScPvtlSo8vc=",
"owner": "cachix", "owner": "cachix",
"repo": "devenv", "repo": "devenv",
"rev": "5a30b9e5ac7c6167e61b1f4193d5130bb9f8defa", "rev": "40b567388381137a3c49acdff5f4b6946d645a5f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,11 +381,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1707956935, "lastModified": 1708118438,
"narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -21,6 +21,7 @@ with lib;
./../programs/chromium.nix ./../programs/chromium.nix
./../programs/mpv.nix ./../programs/mpv.nix
./../programs/syncthing.nix ./../programs/syncthing.nix
./../programs/hstr.nix
./../../nix.nix ./../../nix.nix
./packages.nix ./packages.nix
]; ];

View file

@ -1,7 +1,9 @@
{ config, pkgs, lib, inputs, ... }: { config, pkgs, lib, inputs, ... }:
with lib; with lib;
{ let
electronFlags = "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
in {
config = { config = {
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
@ -15,8 +17,6 @@ with lib;
home.packages = with pkgs; [ home.packages = with pkgs; [
up up
rbenv
# cargo-update
htop htop
rustc rustc
cargo cargo
@ -34,7 +34,6 @@ with lib;
nix-init nix-init
nodePackages.nodemon nodePackages.nodemon
pocketbase pocketbase
# surrealdb
thefuck thefuck
hub hub
httpie httpie
@ -51,9 +50,6 @@ with lib;
(pkgs.writeShellScriptBin "nix-build-default" '' (pkgs.writeShellScriptBin "nix-build-default" ''
nix-build -E 'with import <nixpkgs> { }; callPackage ./default.nix { }' nix-build -E 'with import <nixpkgs> { }; callPackage ./default.nix { }'
'') '')
(callPackage ./../pkgs/docker-craft-cms-dev-env.nix {
inherit lib;
})
(callPackage ./../pkgs/toggl-time-grouper/package.nix { (callPackage ./../pkgs/toggl-time-grouper/package.nix {
inherit lib; inherit lib;
}) })
@ -74,11 +70,11 @@ with lib;
gh gh
nil nil
nixd nixd
unrar
] ++ (if config.machine.isGraphical then [ ] ++ (if config.machine.isGraphical then [
(pkgs.nerdfonts.override { (pkgs.nerdfonts.override {
fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ]; fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ];
}) })
# anki
corefonts corefonts
vistafonts vistafonts
jetbrains.webstorm jetbrains.webstorm
@ -103,12 +99,11 @@ with lib;
bottles bottles
protontricks protontricks
heroic heroic
(vscode.fhsWithPackages (ps: with ps; [ sqlite ])) (vscode.override { commandLineArgs = electronFlags; })
quickemu quickemu
quickgui quickgui
trilium-desktop trilium-desktop
anki anki
inputs.nix-software-center.packages.x86_64-linux.nix-software-center
inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager
jetbrains-toolbox jetbrains-toolbox
mumble mumble

View file

@ -8,7 +8,7 @@
decorations = "full"; decorations = "full";
dynamic_title = true; dynamic_title = true;
}; };
window.opacity = 1; window.opacity = 0.9;
font = { font = {
normal = { normal = {
family = "JetbrainsMono NFM"; family = "JetbrainsMono NFM";
@ -18,7 +18,7 @@
family = "JetbrainsMono NFM"; family = "JetbrainsMono NFM";
style = "Bold"; style = "Bold";
}; };
size = 14; size = 12;
}; };
cursor.style.shape = "Beam"; cursor.style.shape = "Beam";
colors = { colors = {

View file

@ -19,12 +19,9 @@ let
"bmnlcjabgnpnenekpadlanbbkooimhnj" # Honey "bmnlcjabgnpnenekpadlanbbkooimhnj" # Honey
"kbfnbcaeplbcioakkpcpgfkobkghlhen" # Grammarly "kbfnbcaeplbcioakkpcpgfkobkghlhen" # Grammarly
]; ];
in isEnabled = if config.machine.isGraphical then true else false;
{ dictionaries = with pkgs.hunspellDictsChromium; [ en_US de_DE ];
programs.vivaldi = { commandLineArgs = [
enable = if config.machine.isGraphical then true else false;
dictionaries = with pkgs.hunspellDictsChromium; [ en_US de_DE ];
commandLineArgs = [
"--ignore-gpu-blocklist" "--ignore-gpu-blocklist"
"--enable-gpu-rasterization" "--enable-gpu-rasterization"
"--enable-zero-copy" "--enable-zero-copy"
@ -33,11 +30,22 @@ in
"--use-vulkan" "--use-vulkan"
"--ozone-platform-hint=auto" "--ozone-platform-hint=auto"
"--enable-hardware-overlays" "--enable-hardware-overlays"
]; ];
extensions = map extensions = map
(eid: { (eid: {
id = eid; id = eid;
}) })
chromium_extension; chromium_extension;
in
{
programs.vivaldi = {
enable = isEnabled;
dictionaries = dictionaries;
commandLineArgs = commandLineArgs;
extensions = extensions;
};
programs.google-chrome = {
enable = isEnabled;
commandLineArgs = commandLineArgs;
}; };
} }

View file

@ -0,0 +1,5 @@
{ config, pkgs, lib, ... }:
{
programs.hstr = { enable = true; };
}