Compare commits

..

No commits in common. "b45a5bb6897998d6c22760c35de1e391caa8a24c" and "36d0dc1fe0fc92da4862744eb797bc136faf6acf" have entirely different histories.

11 changed files with 91 additions and 168 deletions

84
flake.lock generated
View file

@ -147,11 +147,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710906792, "lastModified": 1710427903,
"narHash": "sha256-kFzpfZcInLhBFWHy452NlvFuzNr0BDEkz3w9Sgg2ypo=", "narHash": "sha256-sV0Q5ndvfjK9JfCg/QM/HX/fcittohvtq8dD62isxdM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "e9875b969086a53dff5ec4677575ad3156fc875d", "rev": "21d89b333ca300bef82c928c856d48b94a9f997c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -171,11 +171,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1710954378, "lastModified": 1710608587,
"narHash": "sha256-IbidJZykfjyGZ9totyhUIPHcDSqW1B3Pepgo3c9tDHI=", "narHash": "sha256-7to4df2dUDd2LhPSp/XeH9rpONb2MtYDn1uFeVMolVc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "a9216f7a1ec216e36e31c7d2ed42de4df89d918a", "rev": "895a56e7294c2e5be4f84aa8e1cbc9e53e91307e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +195,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710935108, "lastModified": 1710592392,
"narHash": "sha256-O4zGpwaXhnD+01zTn6cQZDgU3HagGt4DBPpQyDbD6fk=", "narHash": "sha256-M1MCbKXTI/Z7eWRi9jweloyUTIOMpqN33h5X6hOgeKU=",
"owner": "elkowar", "owner": "elkowar",
"repo": "eww", "repo": "eww",
"rev": "f1ec00a1c9a24c0738fb5d5ac309d6af16e67415", "rev": "4ce42455a4744b0dc00dd356ba9b32c1ca558a0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -417,11 +417,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709087332, "lastModified": 1703887061,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "gitignore.nix", "repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -468,11 +468,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710820906, "lastModified": 1710532761,
"narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=", "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "022464438a85450abb23d93b91aa82e0addd71fb", "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -492,11 +492,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1710760349, "lastModified": 1710327053,
"narHash": "sha256-yqGeSnAB3Yeg02jtitzSGIuE21kq7+pWAdeGK3F9/cY=", "narHash": "sha256-5S3jnObtWfXlTx00KzsPwpJtDoyfa1WpZnCrWnxovcw=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "0e2223d8fd459725850bd9aff7e9d68ec329769a", "rev": "d535b9b6c9f6612e323d4504660ebbdcd1bd79bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -575,11 +575,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1710783728, "lastModified": 1710622004,
"narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=", "narHash": "sha256-6zR642tXcZzzk3C8BHxlCrR0yh8z8zMXLiuXpWDIpX0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388", "rev": "968952f950a59dee9ed1e8799dda38c6dfa1bad3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -640,11 +640,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1710838473, "lastModified": 1710420202,
"narHash": "sha256-RLvwdQSENKOaLdKhNie8XqHmTXzNm00/M/THj6zplQo=", "narHash": "sha256-MvFKESbq4rUWuaf2RKPNYENaSZEw/jaCLo2gU6oREcM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fa9f817df522ac294016af3d40ccff82f5fd3a63", "rev": "878ef7d9721bee9f81f8a80819f9211ad1f993da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -656,11 +656,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1710695816, "lastModified": 1704874635,
"narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "614b4613980a522ba49f0d194531beddbb7220d3", "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -672,11 +672,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1710628718, "lastModified": 1710033658,
"narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=", "narHash": "sha256-yiZiVKP5Ya813iYLho2+CcFuuHpaqKc/CoxOlANKcqM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3", "rev": "b17375d3bb7c79ffc52f3538028b2ec06eb79ef8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -688,11 +688,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1710806803, "lastModified": 1710451336,
"narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "rev": "d691274a972b3165335d261cc4671335f5c67de9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -743,11 +743,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1710923068, "lastModified": 1708018599,
"narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -817,11 +817,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710900660, "lastModified": 1710555016,
"narHash": "sha256-PcHmHQvKIOdvAxlqxZ/DPmUMhUUvfp16pRtyW148u/0=", "narHash": "sha256-Lbdq3/TH4VrrR7A6FxIYwu5tFOcprYh8Q49Nc9s/i6c=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "549f4db17b5c0c143b1308fcfe9620129c387472", "rev": "42baa9e2e4713572d7481f917243b07dffdf54b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -838,11 +838,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1710644594, "lastModified": 1710433464,
"narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", "narHash": "sha256-IXlPoWgIRovZ32mYvqqdBgOQln71LouE/HBhbKc1wcw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", "rev": "6c32d3b9c7593f4b466ec5404e59fc09a803a090",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,9 +1,4 @@
{ { config, lib, ... }:
pkgs,
config,
lib,
...
}:
with lib; with lib;
let let
cfg = config.eboskma.programs.bat; cfg = config.eboskma.programs.bat;
@ -16,19 +11,8 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.bat = { programs.bat = {
enable = true; enable = true;
themes = {
catppuccin = {
src = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "bat";
rev = "b19bea35a85a32294ac4732cad5b0dc6495bed32";
sha256 = "POoW2sEM6jiymbb+W/9DKIjDM1Buu1HAmrNP0yC2JPg=";
};
file = "themes/Catppuccin Mocha.tmTheme";
};
};
config = { config = {
theme = "catppuccin"; theme = "Monokai Extended Bright";
pager = "less -FR"; pager = "less -FR";
map-syntax = [ "*.heex:HTML (EEx)" ]; map-syntax = [ "*.heex:HTML (EEx)" ];
}; };

View file

@ -409,23 +409,15 @@ I like the [[https://draculatheme.com][dracula theme]]
#+begin_src emacs-lisp :tangle no #+begin_src emacs-lisp :tangle no
(use-package dracula-theme (use-package dracula-theme
:init :init
(load-theme 'dracula :no-confirm)) (load-theme 'dracula t))
#+end_src #+end_src
[[https://github.com/belak/emacs-monokai-pro-theme][Monokai Pro]] is also pretty. [[https://github.com/belak/emacs-monokai-pro-theme][Monokai Pro]] is also pretty.
#+begin_src emacs-lisp :tangle no #+begin_src emacs-lisp
(use-package monokai-pro-theme (use-package monokai-pro-theme
:init :init
(load-theme 'monokai-pro-spectrum :no-confirm)) (load-theme 'monokai-pro-spectrum t))
#+end_src
So is [[https://github.com/catppuccin/emacs][Catppuccin]]
#+begin_src emacs-lisp
(use-package catppuccin-theme
:init
(load-theme 'catppuccin :no-confirm))
#+end_src #+end_src
Set fonts. Set fonts.

View file

@ -41,9 +41,6 @@ packer.startup(function()
-- Monokai theme -- Monokai theme
use 'tanvirtin/monokai.nvim' use 'tanvirtin/monokai.nvim'
-- Catppuccin theme
use { 'catppuccin/nvim', as = 'catppuccin' }
-- Airline -- Airline
use 'vim-airline/vim-airline' use 'vim-airline/vim-airline'
use 'vim-airline/vim-airline-themes' use 'vim-airline/vim-airline-themes'

View file

@ -36,15 +36,13 @@ local api = vim.api
-- ]]] -- ]]]
-- Theme [[[ -- Theme [[[
-- cmd 'colorscheme monokai' cmd 'colorscheme monokai'
-- o.termguicolors = true o.termguicolors = true
-- o.background = 'dark' o.background = 'dark'
cmd 'colorscheme catppuccin'
-- ]]] -- ]]]
-- Airline [[[ -- Airline [[[
-- g.airline_theme = 'molokai' g.airline_theme = 'molokai'
g.airline_theme = 'catppuccin'
g.airline_powerline_fonts = 1 g.airline_powerline_fonts = 1
-- ]]] -- ]]]

View file

@ -25,39 +25,18 @@ in
sensible sensible
tmux-fzf tmux-fzf
{ {
plugin = catppuccin; plugin = dracula;
extraConfig = '' extraConfig = ''
set -g @catppuccin_window_left_separator "" set -g @dracula-refresh-rate 10
set -g @catppuccin_window_right_separator " " set -g @dracula-show-powerline true
set -g @catppuccin_window_number_position "right" set -g @dracula-show-fahrenheit false
set -g @catppuccin_window_middle_separator " " set -g @dracula-show-left-icon session
set -g @dracula-network-bandwith "enp4s0"
set -g @catppuccin_window_default_fill "number" set -g @dracula-military-time true
set -g @dracula-day-month true
set -g @catppuccin_window_current_fill "number" set -g @dracula-plugins "time cpu-usage ram-usage network network-bandwith"
set -g @catppuccin_window_current_text "#{pane_current_path}"
set -g @catppuccin_status_modules_right "application session date_time"
set -g @catppuccin_status_left_separator ""
set -g @catppuccin_status_right_separator " "
set -g @catppuccin_status_right_separator_inverse "yes"
set -g @catppuccin_status_fill "all"
set -g @catppuccin_status_connect_separator "no"
''; '';
} }
# {
# plugin = dracula;
# extraConfig = ''
# set -g @dracula-refresh-rate 10
# set -g @dracula-show-powerline true
# set -g @dracula-show-fahrenheit false
# set -g @dracula-show-left-icon session
# set -g @dracula-network-bandwith "enp4s0"
# set -g @dracula-military-time true
# set -g @dracula-day-month true
# set -g @dracula-plugins "time cpu-usage ram-usage network network-bandwith"
# '';
# }
]; ];
extraConfig = '' extraConfig = ''

View file

@ -1,13 +0,0 @@
diff --git a/gasket_interrupt.c b/gasket_interrupt.c
index 531d94e..8dba182 100644
--- a/gasket_interrupt.c
+++ b/gasket_interrupt.c
@@ -158,7 +158,7 @@ gasket_handle_interrupt(struct gasket_interrupt_data *interrupt_data,
read_lock(&interrupt_data->eventfd_ctx_lock);
ctx = interrupt_data->eventfd_ctxs[interrupt_index];
if (ctx)
- eventfd_signal(ctx, 1);
+ eventfd_signal(ctx);
read_unlock(&interrupt_data->eventfd_ctx_lock);
++(interrupt_data->interrupt_counts[interrupt_index]);

View file

@ -79,11 +79,7 @@
# From PVE: ro quiet intel_iommu=on i915.enable_gvt=1 cpufreq.default_governor=ondemand # From PVE: ro quiet intel_iommu=on i915.enable_gvt=1 cpufreq.default_governor=ondemand
# kernelParams = [ "intel_iommu=on" "i915.enable_gvt=1" "cpufreq.default_governor=ondemand" ]; # kernelParams = [ "intel_iommu=on" "i915.enable_gvt=1" "cpufreq.default_governor=ondemand" ];
extraModulePackages = with config.boot.kernelPackages; [ extraModulePackages = with config.boot.kernelPackages; [ gasket ];
(gasket.overrideAttrs (prevAttrs: {
patches = (prevAttrs.patches or [ ]) ++ [ ./0001-fix-gasket.patch ];
}))
];
kernel.sysctl = { kernel.sysctl = {
"net.core.rmem_max" = 2500000; "net.core.rmem_max" = 2500000;

View file

@ -14,12 +14,12 @@ buildMavenPackage {
owner = "keycloak"; owner = "keycloak";
repo = "keycloak"; repo = "keycloak";
rev = version; rev = version;
sha256 = "56JhP78pfWS21l9eTFoFTC+UX044nle79TAS21E0+80="; sha256 = "XMRfFu7WQpFKv1VvRTDGrvClrdBGkKa3QNOZNvh2sKU=";
}; };
sourceRoot = "source/integration/admin-client"; sourceRoot = "source/integration/admin-client";
mvnHash = "sha256-Q9N/Ych7OFb25hifsfAoSTTBaZzd4WUcBhTsMpxJUkk="; mvnHash = "sha256-wDulzZ/0mXXBb7kvjUaPA/38pS2Tw+bzOl83AR2TRtY=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
installPhase = '' installPhase = ''

View file

@ -11,6 +11,11 @@ let
homeCfg = config.home-manager.users.erwin; homeCfg = config.home-manager.users.erwin;
bt = config.eboskma.bluetooth; bt = config.eboskma.bluetooth;
gtkTheme = {
name = "io.elementary.stylesheet.slate";
package = pkgs.pantheon.elementary-gtk-theme;
};
ewwDaemon = ewwDaemon =
let let
path = lib.makeBinPath ( path = lib.makeBinPath (
@ -260,8 +265,8 @@ in
]); ]);
pointerCursor = { pointerCursor = {
name = "Catppuccin-Mocha-Dark-Cursors"; name = "elementary";
package = pkgs.catppuccin-cursors.mochaDark; package = gtkTheme.package;
gtk.enable = true; gtk.enable = true;
x11.enable = true; x11.enable = true;
}; };
@ -308,10 +313,10 @@ in
createDirectories = true; createDirectories = true;
}; };
configFile = { configFile."gtk-4.0/gtk.css" = lib.mkForce {
"gtk-4.0/assets".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/assets"; text = ''
"gtk-4.0/gtk.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk.css"; @import url("file://${gtkTheme.package}/share/themes/${gtkTheme.name}/gtk-4.0/gtk-dark.css");
"gtk-4.0/gtk-dark.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk-dark.css"; '';
}; };
}; };
@ -332,17 +337,7 @@ in
gtk = { gtk = {
enable = true; enable = true;
theme = { theme = gtkTheme;
name = "Catppuccin-Mocha-Compact-Dark";
package = pkgs.catppuccin-gtk.override {
size = "compact";
tweaks = [
"rimless"
"black"
];
variant = "mocha";
};
};
iconTheme = { iconTheme = {
name = "elementary"; name = "elementary";
@ -353,13 +348,13 @@ in
bookmarks = [ "file:///home/erwin/workspace" ]; bookmarks = [ "file:///home/erwin/workspace" ];
extraConfig = { extraConfig = {
gtk-application-prefer-dark-theme = 1; gtk-application-prefer-dark-theme = 1;
gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors"; gtk-cursor-theme-name = "elementary";
}; };
}; };
gtk4.extraConfig = { gtk4.extraConfig = {
gtk-application-prefer-dark-theme = 1; gtk-application-prefer-dark-theme = 1;
gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors"; gtk-cursor-theme-name = "elementary";
}; };
}; };

View file

@ -9,6 +9,11 @@ with lib;
let let
cfg = config.eboskma.users.erwin; cfg = config.eboskma.users.erwin;
gtkTheme = {
name = "io.elementary.stylesheet.slate";
package = pkgs.pantheon.elementary-gtk-theme;
};
ewwDaemon = ewwDaemon =
let let
path = lib.makeBinPath ( path = lib.makeBinPath (
@ -300,8 +305,8 @@ in
]); ]);
pointerCursor = { pointerCursor = {
name = "Catppuccin-Mocha-Dark-Cursors"; name = "elementary";
package = pkgs.catppuccin-cursors.mochaDark; package = gtkTheme.package;
gtk.enable = true; gtk.enable = true;
x11.enable = true; x11.enable = true;
}; };
@ -343,10 +348,10 @@ in
createDirectories = true; createDirectories = true;
}; };
configFile = { configFile."gtk-4.0/gtk.css" = lib.mkForce {
"gtk-4.0/assets".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/assets"; text = ''
"gtk-4.0/gtk.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk.css"; @import url("file://${gtkTheme.package}/share/themes/${gtkTheme.name}/gtk-4.0/gtk-dark.css");
"gtk-4.0/gtk-dark.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk-dark.css"; '';
}; };
}; };
@ -358,17 +363,7 @@ in
gtk = { gtk = {
enable = true; enable = true;
theme = { theme = gtkTheme;
name = "Catppuccin-Mocha-Compact-Dark";
package = pkgs.catppuccin-gtk.override {
size = "compact";
tweaks = [
"rimless"
"black"
];
variant = "mocha";
};
};
iconTheme = { iconTheme = {
name = "elementary"; name = "elementary";
@ -379,14 +374,14 @@ in
bookmarks = [ "file:///home/erwin/workspace" ]; bookmarks = [ "file:///home/erwin/workspace" ];
extraConfig = { extraConfig = {
gtk-application-prefer-dark-theme = 1; gtk-application-prefer-dark-theme = 1;
gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors"; # gtk-cursor-theme-name = "elementary";
}; };
}; };
gtk4 = { gtk4 = {
extraConfig = { extraConfig = {
gtk-application-prefer-dark-theme = 1; gtk-application-prefer-dark-theme = 1;
gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors"; # gtk-cursor-theme-name = "elementary";
}; };
}; };
}; };