diff --git a/flake.lock b/flake.lock index cc6abce..3a49352 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1708315443, - "narHash": "sha256-kAUx0D/d9TaeEJfZ8UYN7HILUGiLzyNdNkYvOVuyDcc=", + "lastModified": 1708452844, + "narHash": "sha256-zlmcdVoD/7M15OrEJFjJ19s84cudaOd66DTyso0ERic=", "owner": "rycee", "repo": "nur-expressions", - "rev": "aaef0f127338365da54d808bcd45799f8dc6d704", + "rev": "a32606b39b9b56062efdef8f001d1e88f7647f59", "type": "gitlab" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1708294481, - "narHash": "sha256-DZtxmeb4OR7iCaKUUuq05ADV2rX8WReZEF7Tq//W0+Y=", + "lastModified": 1708451036, + "narHash": "sha256-tgZ38NummEdnXvxj4D0StHBzXgceAw8CptytHljH790=", "owner": "nix-community", "repo": "home-manager", - "rev": "a54e05bc12d88ff2df941d0dc1183cb5235fa438", + "rev": "517601b37c6d495274454f63c5a483c8e3ca6be1", "type": "github" }, "original": { @@ -242,11 +242,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1708339623, - "narHash": "sha256-Tmn5fWBeL3e+Zput55yjRH7vqrhMyiLjz7VmVpliUtk=", + "lastModified": 1708458541, + "narHash": "sha256-dNGhnQHasVEFIwC727MSdEIZA89VN9K1olQC2o/1Z0k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d1fe3b876cdde17803f4ad3d30132d126ff9b0", + "rev": "57d41a34f2e7e9b8b612f47bb249355d7fc55e0b", "type": "github" }, "original": { @@ -258,16 +258,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708247094, - "narHash": "sha256-H2VS7VwesetGDtIaaz4AMsRkPoSLEVzL/Ika8gnbUnE=", + "lastModified": 1708296515, + "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "045b51a3ae66f673ed44b5bbd1f4a341d96703bf", + "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -284,11 +284,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1708338329, - "narHash": "sha256-AAxCApUIwIdUN+nwYHK9qVSaQ3q0R2BN4N5oU/SZ1p4=", + "lastModified": 1708419783, + "narHash": "sha256-Ro2X1i01wGUo4ggtutwd3yEgCGRphYMBvzzdaQZuBb8=", "owner": "nix-community", "repo": "nixvim", - "rev": "b8815f04a32c2fcff4c10f6a52aab0e030a71060", + "rev": "9d30e87455b2bdb18f5c55ec30ec0268c1f29f98", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2ba40a7..1592a61 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; home-manager = { diff --git a/home/config-files/AppleColorEmoji.ttf b/home/config-files/AppleColorEmoji.ttf new file mode 100644 index 0000000..10205af Binary files /dev/null and b/home/config-files/AppleColorEmoji.ttf differ diff --git a/home/default.nix b/home/default.nix index b6fc7ce..36d7e41 100644 --- a/home/default.nix +++ b/home/default.nix @@ -17,6 +17,7 @@ }; programs = { + zsh.enable = true; atuin = { enable = true; enableNushellIntegration = true; @@ -44,13 +45,28 @@ { enable = true; enableNushellIntegration = true; + enableBashIntegration = true; + enableZshIntegration = true; settings = { # Other config here character = { success_symbol = "[λ::](bold green)"; error_symbol = "[λ::](bold red)"; }; - format = "$all"; # Remove this line to disable the default prompt format + username = { + style_user = "bold pink"; + format = "[$user]($style)"; + show_always = true; + disabled = false; + }; + hostname = { + ssh_only = false; + format = "[ 🏳️‍⚧️ ](bold pink)[$hostname](bold flamingo)"; + disabled = false; + }; + right_format = "$all"; + format = ''$username$hostname in $directory +$character''; palette = "catppuccin_${flavour}"; } // builtins.fromTOML (builtins.readFile (pkgs.fetchFromGitHub @@ -85,6 +101,8 @@ home.sessionVariables.DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox"; + home.file."~/.local/share/fonts/AppleColorEmoji.ttf".source = ./config-files/AppleColorEmoji.ttf; + programs.firefox = { enable = true; package = pkgs.firefox.override { @@ -97,7 +115,7 @@ enable = true; package = pkgs.hyprland; - xwayland.enable = true; + #xwayland.enable = true; #enableNvidiaPatches = true; extraConfig = builtins.readFile ./config-files/hyprland.conf; @@ -119,7 +137,7 @@ bitwarden bitwarden-cli - + sway-contrib.grimshot libnotify diff --git a/hosts/lilith/default.nix b/hosts/lilith/default.nix index fce476b..433f813 100644 --- a/hosts/lilith/default.nix +++ b/hosts/lilith/default.nix @@ -73,7 +73,7 @@ # }; # Enable the X11 windowing system. - #services.xserver.enable = true; + services.xserver.enable = true; #services.xserver.displayManager.gdm.enable = true; #services.xserver.displayManager.ly.enable = true; #services.xserver.desktopManager.gnome.enable = true; diff --git a/hosts/seraphim/default.nix b/hosts/seraphim/default.nix index d1d3b9e..2fc6001 100644 --- a/hosts/seraphim/default.nix +++ b/hosts/seraphim/default.nix @@ -36,7 +36,7 @@ # }; # Enable the X11 windowing system. - services.xserver.enable = true; + #services.xserver.enable = true;