diff --git a/flake.lock b/flake.lock index c33b1ed..c577544 100644 --- a/flake.lock +++ b/flake.lock @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1788457071, - "narHash": "sha256-Yqqbe/X4nYdOQHy72x0h7smLr+Vhgwp5X23EPDn1Jdw=", + "lastModified": 1788008499, + "narHash": "sha256-0RfpRmzq2JJdWbiykYxduT1BvMeIzOnljUT775JCHhs=", "owner": "AlvaroParker", "repo": "helium-nix", - "rev": "d17d25ee7277a108cf6b7a6d167f1bf82ff0e7a0", + "rev": "ed54f25251951c8570cca7460132c2c2b46522a8", "type": "github" }, "original": { @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1788487777, - "narHash": "sha256-Ro/e1N4ZR8/XaFF+sF9SgfPK79HM5YNEppzFj8p+0Ak=", + "lastModified": 1788229478, + "narHash": "sha256-G0F2rFORVcFkEvVdE/qWQTnYekIc77YP5/vRF9nZlxU=", "owner": "nix-community", "repo": "home-manager", - "rev": "693e8ce0fb240a73c116a03cfd7b19269c87af88", + "rev": "1dc2d1f720ab17fc7981e087346bf54b26d284b1", "type": "github" }, "original": { @@ -177,11 +177,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1788490924, - "narHash": "sha256-tymTjjNKWohVzXycg2mN7cSApQ6NDmn9k4LklNq/WGo=", + "lastModified": 1788238778, + "narHash": "sha256-BhA+TEkGryxU9hppp8UItTNBllZz09hX8pwMjtk1Jdo=", "owner": "mangowm", "repo": "mango", - "rev": "7b4266f1d8df09f83283574ba61dba51656d4791", + "rev": "53d729c0476fc50534835dcdaf58ad314a32a34d", "type": "github" }, "original": { @@ -200,11 +200,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1788512400, - "narHash": "sha256-pFiwb+c/lIvMvjSzJONZ+jPi36kbbljys7OFy+Kxt3U=", + "lastModified": 1788253445, + "narHash": "sha256-+18+hW03A1Zl5iagPD1gAcyG1W1X90P6yCBbkjEBfhU=", "owner": "4evy", "repo": "nixcord", - "rev": "004e2c950c0b4a404fb3ea5ab01f5645265e4322", + "rev": "998b3f6eac9cdbf1a496325af0ed8647d237ecb3", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1788316716, - "narHash": "sha256-bc7rSpXIdn9QWGNqfWcPZWOhEVF8NoeAZkWq0XWnf/k=", + "lastModified": 1788179007, + "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ed67ec0a4d3c7ab4ae1f04f8ee8df07bfa506a2", + "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9", "type": "github" }, "original": { diff --git a/modules/home/default.nix b/modules/home/default.nix index bf14a0a..3a94fca 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -3,6 +3,5 @@ ./home.nix ./gtk.nix ./services.nix - ./qt.nix ]; } diff --git a/modules/home/qt.nix b/modules/home/qt.nix deleted file mode 100644 index 51a5461..0000000 --- a/modules/home/qt.nix +++ /dev/null @@ -1,18 +0,0 @@ -{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 acad8fb..d5c8886 100644 --- a/modules/hosts/base/configuration.nix +++ b/modules/hosts/base/configuration.nix @@ -27,8 +27,10 @@ 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 = { @@ -37,13 +39,11 @@ 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,8 +58,9 @@ ripgrep bat ani-cli - nautilus - kdePackages.plasma-sdk + thunar + thunar-volman + ]; programs.xppen = { enable = true; diff --git a/modules/programs/default.nix b/modules/programs/default.nix index 3b46e18..024948b 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -8,7 +8,6 @@ ./quickshell.nix ./nixcord.nix ./mango.nix - ./zsh.nix - ./git.nix + ]; } diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix index 35c2954..392345b 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 initial-buffer-choice "~/") + (setq inhibit-splash-screen 1) (add-to-list 'display-buffer-alist '("\\*compilation\\*" (display-buffer-reuse-window @@ -55,6 +55,7 @@ (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 deleted file mode 100644 index 29f1d64..0000000 --- a/modules/programs/git.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - 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 8088090..3f3da8a 100644 --- a/modules/programs/mango.nix +++ b/modules/programs/mango.nix @@ -28,8 +28,7 @@ in dropcolor = "0x${c.base09}ff"; cursor_theme = "macOS"; cursor_size = 24; - border_radius = 0; - borderpx = 4; + border_radius = 20; animations = 1; layer_animations = 0; animation_type_open = "slide"; @@ -58,7 +57,7 @@ in new_is_master = 0; tag_num = 9; repeat_rate = 25; - repeat_delay = 250; + repeat_delay = 600; xkb_rules_layout = "eu"; tap_to_click = 1; mouse_accel_profile = 1; @@ -67,6 +66,7 @@ in gappiv = 5; gappoh = 10; gappov = 10; + borderpx = 4; bind = [ # reload config diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix deleted file mode 100644 index 5a9940b..0000000 --- a/modules/programs/zsh.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - programs.zsh = { - enable = true; - enableCompletion = true; - autosuggestion.enable = true; - syntaxHighlighting.enable = true; - oh-my-zsh.enable = true; - oh-my-zsh.theme = "gentoo"; - }; -}