diff --git a/flake.lock b/flake.lock index 60b6b73..fb560d5 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1783423484, - "narHash": "sha256-JzhhYBNoshT6TCutDsSyDRMHi0HEyTKO5H7pUu2KOFA=", + "lastModified": 1783429105, + "narHash": "sha256-kfl6ePoaAA3lhsQ+3hctKeWcmqFDxhUh8ilU0k/8ELo=", "ref": "refs/heads/main", - "rev": "248e5a2c05eb1e79ef0b720a018cec9852a60706", - "revCount": 31, + "rev": "3eb15736f3926d04ec9ef6b25e3440dc1c73bdee", + "revCount": 33, "type": "git", "url": "https://git.syedm.dev/syedm/kutu.rb.git" }, diff --git a/flake.nix b/flake.nix index 5bb03c8..6be4376 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ }; }; - outputs = { nixpkgs, kutu, home-manager, ... }: + outputs = inputs@{ nixpkgs, kutu, home-manager, ... }: let system = "x86_64-linux"; in { diff --git a/home/default.nix b/home/default.nix index ebc15bb..ac95774 100644 --- a/home/default.nix +++ b/home/default.nix @@ -11,8 +11,15 @@ programs.git = { enable = true; - userName = "Syed Daanish"; - userEmail = "me@syedm.dev"; + settings.user.name = "Syed Daanish"; + settings.user.email = "me@syedm.dev"; + }; + + home.file.".xinitrc" = { + text = '' + exec dbus-run-session -- kutu.rb + ''; + executable = true; }; home.stateVersion = "26.05"; diff --git a/home/fish/default.nix b/home/fish/default.nix index 3f138a6..a9adf1e 100644 --- a/home/fish/default.nix +++ b/home/fish/default.nix @@ -15,6 +15,6 @@ g = "gitui"; }; - interactiveShellInit = builtins.readFile ./config.fish; + shellInit = builtins.readFile ./config.fish; }; } diff --git a/hosts/common.nix b/hosts/common.nix index d8d10a3..25233c2 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -50,6 +50,7 @@ }; environment.systemPackages = with pkgs; [ + libinput nodejs age eza diff --git a/hosts/tardis/default.nix b/hosts/tardis/default.nix index c07da6b..a71d89b 100644 --- a/hosts/tardis/default.nix +++ b/hosts/tardis/default.nix @@ -14,14 +14,31 @@ firefox kitty rofi + xev + xkbcomp + xdg-utils - inputs.kutu.packages.${pkgs.system}.default + inputs.kutu.packages.${stdenv.hostPlatform.system}.default ]); services.xserver = { enable = true; displayManager.startx.enable = true; videoDrivers = [ "modesetting" ]; + xkb = { + layout = "us"; + variant = ""; + options = "terminate:ctrl_alt_bksp"; + }; + }; + + services.dbus.enable = true; + + xdg.portal = { + enable = true; + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + ]; }; networking.hostName = "tardis";