diff --git a/flake.lock b/flake.lock index c577544..c33b1ed 100644 --- a/flake.lock +++ b/flake.lock @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1788008499, - "narHash": "sha256-0RfpRmzq2JJdWbiykYxduT1BvMeIzOnljUT775JCHhs=", + "lastModified": 1788457071, + "narHash": "sha256-Yqqbe/X4nYdOQHy72x0h7smLr+Vhgwp5X23EPDn1Jdw=", "owner": "AlvaroParker", "repo": "helium-nix", - "rev": "ed54f25251951c8570cca7460132c2c2b46522a8", + "rev": "d17d25ee7277a108cf6b7a6d167f1bf82ff0e7a0", "type": "github" }, "original": { @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1788229478, - "narHash": "sha256-G0F2rFORVcFkEvVdE/qWQTnYekIc77YP5/vRF9nZlxU=", + "lastModified": 1788487777, + "narHash": "sha256-Ro/e1N4ZR8/XaFF+sF9SgfPK79HM5YNEppzFj8p+0Ak=", "owner": "nix-community", "repo": "home-manager", - "rev": "1dc2d1f720ab17fc7981e087346bf54b26d284b1", + "rev": "693e8ce0fb240a73c116a03cfd7b19269c87af88", "type": "github" }, "original": { @@ -177,11 +177,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1788238778, - "narHash": "sha256-BhA+TEkGryxU9hppp8UItTNBllZz09hX8pwMjtk1Jdo=", + "lastModified": 1788490924, + "narHash": "sha256-tymTjjNKWohVzXycg2mN7cSApQ6NDmn9k4LklNq/WGo=", "owner": "mangowm", "repo": "mango", - "rev": "53d729c0476fc50534835dcdaf58ad314a32a34d", + "rev": "7b4266f1d8df09f83283574ba61dba51656d4791", "type": "github" }, "original": { @@ -200,11 +200,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1788253445, - "narHash": "sha256-+18+hW03A1Zl5iagPD1gAcyG1W1X90P6yCBbkjEBfhU=", + "lastModified": 1788512400, + "narHash": "sha256-pFiwb+c/lIvMvjSzJONZ+jPi36kbbljys7OFy+Kxt3U=", "owner": "4evy", "repo": "nixcord", - "rev": "998b3f6eac9cdbf1a496325af0ed8647d237ecb3", + "rev": "004e2c950c0b4a404fb3ea5ab01f5645265e4322", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1788179007, - "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=", + "lastModified": 1788316716, + "narHash": "sha256-bc7rSpXIdn9QWGNqfWcPZWOhEVF8NoeAZkWq0XWnf/k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9", + "rev": "3ed67ec0a4d3c7ab4ae1f04f8ee8df07bfa506a2", "type": "github" }, "original": { diff --git a/modules/home/default.nix b/modules/home/default.nix index 3a94fca..bf14a0a 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -3,5 +3,6 @@ ./home.nix ./gtk.nix ./services.nix + ./qt.nix ]; } diff --git a/modules/home/qt.nix b/modules/home/qt.nix new file mode 100644 index 0000000..51a5461 --- /dev/null +++ b/modules/home/qt.nix @@ -0,0 +1,18 @@ +{pkgs, ...}: { + qt = { + enable = true; + platformTheme = { + name = "gtk3"; + }; + qt5ctSettings = { + Appearance = { + icon_theme = "Papirus-Dark"; + }; + }; + qt6ctSettings = { + Appearance = { + icon_theme = "Papirus-Dark"; + }; + }; + }; +} diff --git a/modules/hosts/base/configuration.nix b/modules/hosts/base/configuration.nix index d5c8886..acad8fb 100644 --- a/modules/hosts/base/configuration.nix +++ b/modules/hosts/base/configuration.nix @@ -27,10 +27,8 @@ time.timeZone = "Europe/Berlin"; i18n.defaultLocale = "en_US.UTF-8"; services.displayManager.gdm.enable = true; + programs.starship.enable = true; programs.mango.enable = true; - programs.niri = { - enable = true; - }; services.upower.enable = true; services.xserver.xkb.layout = "us"; services.pipewire = { @@ -39,11 +37,13 @@ pulse.enable = true; }; security.rtkit.enable = true; - + programs.zsh.enable = true; + environment.pathsToLink = [ "/share/zsh" ]; nixpkgs.config.allowUnfree = true; users.users.lucy = { isNormalUser = true; extraGroups = [ "wheel" ]; + shell = pkgs.zsh; packages = [ inputs.helium.packages.${pkgs.stdenv.hostPlatform.system}.default ]; @@ -58,9 +58,8 @@ ripgrep bat ani-cli - thunar - thunar-volman - + nautilus + kdePackages.plasma-sdk ]; programs.xppen = { enable = true; diff --git a/modules/programs/default.nix b/modules/programs/default.nix index 024948b..3b46e18 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -8,6 +8,7 @@ ./quickshell.nix ./nixcord.nix ./mango.nix - + ./zsh.nix + ./git.nix ]; } diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix index 392345b..35c2954 100644 --- a/modules/programs/emacs.nix +++ b/modules/programs/emacs.nix @@ -38,7 +38,7 @@ (use-package qml-mode) (use-package lua-mode) (use-package elcord :init (elcord-mode)) - (setq inhibit-splash-screen 1) + (setq initial-buffer-choice "~/") (add-to-list 'display-buffer-alist '("\\*compilation\\*" (display-buffer-reuse-window @@ -55,7 +55,6 @@ (global-tab-line-mode 1) (scroll-bar-mode -1) - (setq inhibit-splash-screen 1) (setq custom-file "~/.emacs.d/custom.el") (load custom-file 'noerror) diff --git a/modules/programs/git.nix b/modules/programs/git.nix new file mode 100644 index 0000000..29f1d64 --- /dev/null +++ b/modules/programs/git.nix @@ -0,0 +1,10 @@ +{ + programs.git = { + enable = true; + settings = { + user.name = "lucy"; + user.email = "lucykaufmann@protonmail.com"; + init.defaultBranch = "main"; + }; + }; +} diff --git a/modules/programs/mango.nix b/modules/programs/mango.nix index 3f3da8a..8088090 100644 --- a/modules/programs/mango.nix +++ b/modules/programs/mango.nix @@ -28,7 +28,8 @@ in dropcolor = "0x${c.base09}ff"; cursor_theme = "macOS"; cursor_size = 24; - border_radius = 20; + border_radius = 0; + borderpx = 4; animations = 1; layer_animations = 0; animation_type_open = "slide"; @@ -57,7 +58,7 @@ in new_is_master = 0; tag_num = 9; repeat_rate = 25; - repeat_delay = 600; + repeat_delay = 250; xkb_rules_layout = "eu"; tap_to_click = 1; mouse_accel_profile = 1; @@ -66,7 +67,6 @@ in gappiv = 5; gappoh = 10; gappov = 10; - borderpx = 4; bind = [ # reload config diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix new file mode 100644 index 0000000..5a9940b --- /dev/null +++ b/modules/programs/zsh.nix @@ -0,0 +1,10 @@ +{ + programs.zsh = { + enable = true; + enableCompletion = true; + autosuggestion.enable = true; + syntaxHighlighting.enable = true; + oh-my-zsh.enable = true; + oh-my-zsh.theme = "gentoo"; + }; +}