diff --git a/.config/fish/config-old.fish b/.config/fish/config-old.fish index b875bb9..174fd95 100644 --- a/.config/fish/config-old.fish +++ b/.config/fish/config-old.fish @@ -6,11 +6,9 @@ if status is-interactive echo onefetch end - # test -f .nvmrc && nvm use > /dev/null end echo -e "\n" fastfetch - test -f .nvmrc && nvm use > /dev/null end set PATH $PATH $HOME/.cargo/bin $HOME/.local/share/pnpm $HOME/.local/bin $HOME/.spicetify $HOME/.bun/bin set fish_greeting @@ -39,3 +37,6 @@ fish_ssh_agent # set -x PERL_MM_OPT "INSTALL_BASE=/home/dan/perl5"; set -x SCCACHE_DIR "/media/New BTRFS/.sccache" set -x RUSTC_WRAPPER (which sccache) + +abbr -a nsp "nix-shell --run fish -p" +abbr -a ns "nix-shell --run fish" \ No newline at end of file diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 9e56bf9..422676a 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -16,6 +16,9 @@ #env = __GLX_VENDOR_LIBRARY_NAME,nvidia #cursor { no_hardware_cursors = true } +source = ~/.config/hypr/monitors.conf +source = ~/.config/hypr/workspaces.conf + debug:disable_logs = false debug { @@ -23,7 +26,7 @@ debug { } # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=,preferred,auto,auto +#monitor=,preferred,auto,auto # See https://wiki.hyprland.org/Configuring/Keywords/ for more @@ -37,6 +40,7 @@ exec-once=dbus-update-activation-environment --systemd --all exec-once=systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME exec-once=/usr/lib/polkit-kde-authentication-agent-1 exec-once=otd-daemon +exec-once=lorri daemon #exec-once=wlsunset -S 6:00 -s 21:30 exec-once=swaybg -m fill -i ~/.config/hypr/wallpapers/sunflowers.jpg @@ -76,18 +80,18 @@ env = MOZ_ENABLE_WAYLAND,1 env = XDG_SESSION_DESKTOP,Hyprland env = XDG_CURRENT_DESKTOP,Hyprland -monitor=eDP-1,highrr,0x0,1.25 +#monitor=eDP-1,highrr,0x0,1.25 #monitor=eDP-2,highrr,0x0,1.25 -monitor=desc:AOC 24G2W1G4 0x0000297D,highrr,auto,1 +#monitor=desc:AOC 24G2W1G4 0x0000297D,highrr,auto,1 #monitor=HDMI-A-1,highrr,2048x0,1 #monitor=HDMI-A-1,highrr,auto,1 -monitor=,preferred,auto,1 +#monitor=,preferred,auto,1 # TV frame #monitor=HDMI-A-1,addreserved,50,50,50,50 #monitor=HDMI-A-1,preferred,auto,1,transform,2 #monitor=HDMI-A-1,preferred,auto,1,mirror,eDP-2 -workspace = 10,monitor:HDMI-A-1,default:true +#workspace = 10,monitor:HDMI-A-1,default:true xwayland { force_zero_scaling = true diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index b75a3df..781d477 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -53,8 +53,8 @@ }, "clock": { - "format": "{: %H:%M %p 󰃭 %a %d}", - "format-alt": "{:󰥔 %H:%M  %b %Y}", + "format": " {:%H:%M %p 󰃭 %a %d}", + "format-alt": "󰥔 {:%H:%M  %b %Y}", "tooltip-format": "{calendar}" }, @@ -66,10 +66,11 @@ // "format-alt": "{alt}", }, "custom/spotify": { - "exec": "python ~/.config/waybar/player.py", + "exec": "bash ~/.config/waybar/album_art.sh", "format": "{}", "return-type": "json", - "on-click": "playerctl play-pause" + "on-click": "playerctl play-pause", + "interval": 10 }, "custom/spotify-start": { "exec": "echo ", diff --git a/configuration.nix b/configuration.nix index 05aeba7..c9bb602 100644 --- a/configuration.nix +++ b/configuration.nix @@ -61,7 +61,7 @@ in }; services.printing.enable = true; - + hardware.acpilight.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { @@ -71,14 +71,25 @@ in pulse.enable = true; #jack.enable = true; }; + security.pam.loginLimits = [{ + domain = "*"; + type = "soft"; + item = "nofile"; + value = "64000"; + }]; services.geoclue2.enable = true; services.localtimed.enable = true; + services.lorri.enable = true; + services.blueman.enable = true; + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + programs.wireshark.enable = true; time.hardwareClockInLocalTime = true; users.users.dan = { isNormalUser = true; description = "John"; - extraGroups = [ "networkmanager" "wheel" "docker" "fuse" ]; + extraGroups = [ "networkmanager" "wheel" "docker" "fuse" "video" "wireshark" ]; shell = pkgs.fish; packages = with pkgs; [ kdePackages.kate diff --git a/home.nix b/home.nix index fed6192..2445972 100644 --- a/home.nix +++ b/home.nix @@ -7,6 +7,7 @@ in stateVersion = "24.05"; packages = with pkgs; [ + # acpilight grc onefetch fira @@ -25,7 +26,6 @@ in firefox dunst sccache - blueman swaybg activitywatch networkmanagerapplet @@ -34,6 +34,11 @@ in dust jetbrains.rust-rover jetbrains.webstorm + jetbrains.phpstorm + jetbrains.pycharm-community-bin + jetbrains.clion + nwg-displays + wireguard-tools mongodb-compass hashcat tldr @@ -45,7 +50,10 @@ in kdePackages.partitionmanager kdePackages.filelight kdePackages.kate - xorg.xbacklight + kdePackages.ksystemstats + kdePackages.kinfocenter + kdePackages.kirigami-addons + #xorg.xbacklight cachix playerctl libcanberra-gtk3 # sound events @@ -86,6 +94,13 @@ in websocat whois wifite2 + dig + httpie + inxi + numbat + wireshark + nixfmt-rfc-style + qpwgraph android-tools aircrack-ng @@ -104,6 +119,7 @@ in feroxbuster python312Packages.pypykatz screen + openvpn (python312.withPackages (ps: with ps; [ pyquery @@ -123,6 +139,7 @@ in gnumake ]; }; + services.lorri.enable = true; programs = { fish = { enable = true; @@ -157,6 +174,8 @@ in extraConfig = { pull.rebase = false; gpg.format = "ssh"; + commit.gpgsign = true; + gpg.ssh.allowedSignersFile = "/home/dan/allowed_signers"; }; }; gitui.enable = true; @@ -170,6 +189,8 @@ in }; services.kdeconnect.enable = true; services.kdeconnect.indicator = true; + services.blueman-applet.enable = true; + services.mpris-proxy.enable = true; xdg.mimeApps = { enable = true;