diff --git a/flake.nix b/flake.nix index 0605c5a..152224a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,23 +1,6 @@ { description = "Veneficium's amazing fantastic mindblowingly stupid nixOS configuration! :3"; - nixConfig = { - experimental-features = "nix-command flakes"; - substitute = "true"; - extra-substituters = [ - "https://cache.nixos.org" - "https://nix-community.cachix.org" - "https://niri.cachix.org" - ]; - trusted-public-keys = [ - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" - ]; - cores = 0; - max-jobs = 2; - }; - inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; diff --git a/hosts/main-laptop/configuration.nix b/hosts/main-laptop/configuration.nix index b55e412..c99b110 100644 --- a/hosts/main-laptop/configuration.nix +++ b/hosts/main-laptop/configuration.nix @@ -19,6 +19,15 @@ users.extraGroups.vboxusers.members = [ "fedfer" ]; + nix.settings = { + substituters = [ + "https://nix-community.cachix.org" + ]; + trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; + stylix.enable = true; stylix.autoEnable = true; stylix = { diff --git a/hosts/main-laptop/home.nix b/hosts/main-laptop/home.nix index 9934aef..b9dcb45 100644 --- a/hosts/main-laptop/home.nix +++ b/hosts/main-laptop/home.nix @@ -65,7 +65,9 @@ home.packages = with pkgs; [ prismlauncher + foliate impression + chatterino2 qbittorrent nixd nixpkgs-fmt @@ -73,18 +75,23 @@ powertop vesktop libreoffice + valent zapzap kicad-small freecad-wayland resources pmbootstrap celluloid + fractal yazi nautilus + tuba eza bat gitui wleave + wl-gammarelay-rs + wl-gammarelay-applet ]; home.stateVersion = "23.11"; # DO NOT CHANGE diff --git a/modules/home/cliPrograms/git.nix b/modules/home/cliPrograms/git.nix index 92894ea..34059f3 100644 --- a/modules/home/cliPrograms/git.nix +++ b/modules/home/cliPrograms/git.nix @@ -7,13 +7,11 @@ config = lib.mkIf config.settings.programs.git.enable { programs.git = { enable = true; - settings = { - user = { - email = "veneficium@linuxposting.xyz"; - name = "veneficium"; - }; + userEmail = "85629831+veneficium42@users.noreply.github.com"; + userName = "Veneficium"; + extraConfig = { init.defaultBranch = "main"; - # credential.credentialStore = "gpg"; + credential.credentialStore = "gpg"; }; }; }; diff --git a/modules/home/niri/niri.nix b/modules/home/niri/niri.nix index 984560e..85838a8 100644 --- a/modules/home/niri/niri.nix +++ b/modules/home/niri/niri.nix @@ -20,14 +20,6 @@ settings = builtins.fromJSON (builtins.readFile ./swaylock.json); }; - programs.quickshell = { - enable = true; - configs = { - "default" = ./shell.qml; - }; - activeConfig = "default"; - }; - services.mako = { enable = true; settings = { @@ -201,10 +193,7 @@ allow-when-locked = true; }; - "Mod+T".action.spawn = [ - "ghostty" - "+new-window" - ]; + "Mod+T".action.spawn = "ghostty"; "Mod+D".action.spawn = "fuzzel"; "Mod+Q".action = close-window; diff --git a/modules/home/niri/shell.qml b/modules/home/niri/shell.qml deleted file mode 100644 index 4171e28..0000000 --- a/modules/home/niri/shell.qml +++ /dev/null @@ -1,159 +0,0 @@ -import Quickshell -import QtQuick -import QtQuick.Layouts -import Quickshell.Widgets -import Quickshell.Services.SystemTray -import Quickshell.Services.Pipewire -import Quickshell.Io - -PanelWindow { - component Pill: Rectangle { - default property alias data: inner.data - color: Qt.rgba(0.6,0.6,0.6,0.4) - radius: height / 2.0 - 2.0 - implicitWidth: inner.implicitWidth + 8.0 * 2 - implicitHeight: inner.implicitHeight + 3.0 * 2 - Item { - id: inner - anchors.centerIn: parent - implicitWidth: inner.childrenRect.width - implicitHeight: inner.childrenRect.height - } - } - - component Tray: WrapperItem { - implicitWidth: inner.implicitWidth - implicitHeight: inner.implicitHeight - RowLayout { - id: inner - Repeater { - model: SystemTray.items.values - IconImage { - id: tray_item - required property SystemTrayItem modelData - source: modelData.icon - visible: !modelData.icon.includes("?path=") - implicitSize: 22.5 - - PopupWindow { - id: label - visible: hover_handler.hovered && hover_text.width - implicitWidth: hover_text.width - implicitHeight: hover_text.height + 2.0 - anchor.item: tray_item - anchor.rect.y: tray_item.height + 2.0 - anchor.rect.x: (tray_item.width - this.width) / 2.0 - color: "black" - Text { - id: hover_text - text: tray_item.modelData.tooltipTitle || tray_item.modelData.title - color: "white" - } - } - - HoverHandler { - id: hover_handler - } - - TapHandler { - onTapped: (eventPoint, button) => { - if (button == 1) { - tray_item.modelData.activate(); - } else { - tray_item.modelData.display(label, 0, 0); - } - } - } - } - } - } - } - - anchors { - top: true - left: true - right: true - } - - implicitHeight: 35 - - color: "transparent" - - Rectangle { - color: Qt.rgba(0.3,0.3,0.3,0.5) - anchors.fill: parent - anchors.leftMargin: 11 - anchors.rightMargin: 11 - radius: 11 - } - - SystemClock { - id: clock - precision: SystemClock.Seconds - } - - Pill { - Text { - text: Qt.formatDateTime(clock.date, "hh:mm dd-MM") - color: "white" - } - anchors.centerIn: parent - } - - Pill { - anchors.horizontalCenter: parent.left - anchors.horizontalCenterOffset: (width / 2.0) + 30.0 - anchors.verticalCenter: parent.verticalCenter - Text { - text: "left" - color: "white" - } - } - - Item { - anchors.horizontalCenter: parent.right - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenterOffset: -((width / 2.0) + 30.0) - RowLayout { - id: right_row - anchors.centerIn: parent - anchors.horizontalCenterOffset: -(width / 2.0) - - PwObjectTracker {objects: [Pipewire.defaultAudioSink]} - - FileView { - id: batteryFile - path: "/sys/class/power_supply/BAT1/capacity" - watchChanges: true - onFileChanged: this.reload() - blockLoading: true - } - - Pill { - Text { - color: "white" - text: `bat: ${batteryFile.text().slice(0,2)}%` - } - } - - Pill { - Text { - text: `vol: ${Math.round(Pipewire.defaultAudioSink.audio.volume * 100)}%` - color: "white" - } - } - - Pill { - Text { - color: "white" - text: Pipewire.defaultAudioSink.description.slice(0, 15) - } - } - - Pill { - Tray {} - } - } - } - -} diff --git a/modules/nixos/programs/tuigreet.nix b/modules/nixos/programs/tuigreet.nix index f35aed1..1ba0afb 100644 --- a/modules/nixos/programs/tuigreet.nix +++ b/modules/nixos/programs/tuigreet.nix @@ -12,10 +12,9 @@ config = lib.mkIf config.settings.programs.tuigreet.enable { services.greetd = { enable = true; - useTextGreeter = true; settings = { default_session = { - command = "${pkgs.tuigreet}/bin/tuigreet -t -g \"Haii! :3\" --theme \"container=black;input=lightBlue;prompt=green;greet=magenta;border=blue\""; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet -t -g \"Haii! :3\" --theme \"container=black;input=lightBlue;prompt=green;greet=magenta;border=blue\""; user = "greeter"; }; }; diff --git a/scripts/rebuild.sh b/scripts/rebuild.sh index 3368372..9ce096b 100755 --- a/scripts/rebuild.sh +++ b/scripts/rebuild.sh @@ -1,2 +1,2 @@ #! /bin/sh -sudo nixos-rebuild switch --accept-flake-config --flake . +sudo nixos-rebuild switch --flake . \ No newline at end of file