diff --git a/flake.lock b/flake.lock index b56113e..565e86a 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1731746438, - "narHash": "sha256-f3SSp1axoOk0NAI7oFdRzbxG2XPBSIXC+/DaAXnvS1A=", + "lastModified": 1732988076, + "narHash": "sha256-2uMaVAZn7fiyTUGhKgleuLYe5+EAAYB/diKxrM7g3as=", "owner": "nix-community", "repo": "disko", - "rev": "cb64993826fa7a477490be6ccb38ba1fa1e18fa8", + "rev": "2814a5224a47ca19e858e027f7e8bff74a8ea9f1", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "dotfiles": { "flake": false, "locked": { - "lastModified": 1730924096, - "narHash": "sha256-dGmEcwL5L8X8lDNxDYkpIORTOI+H+bfz5tj992sIImc=", + "lastModified": 1732720152, + "narHash": "sha256-8/XX4SqEskwL5w31pQBKxWVlckWMB4X70vXuaKg48W8=", "ref": "refs/heads/main", - "rev": "e52d84e1eaca3dc19827df84590af70d08afb1e0", - "revCount": 56, + "rev": "c1e41c894627eb73ef7cc6cf401c93caacbfac32", + "revCount": 60, "type": "git", "url": "https://github.com/nomadics9/dotfiles.git" }, @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1731604581, - "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", + "lastModified": 1733133928, + "narHash": "sha256-gU40r9AfpIr4eq+0noM8yH1Hxf+EA3dqfIpFtQl8Y1E=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", + "rev": "873e39d5f4437d2f3ab06881fea8e63e45e1d011", "type": "github" }, "original": { @@ -159,11 +159,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731245184, - "narHash": "sha256-vmLS8+x+gHRv1yzj3n+GTAEObwmhxmkkukB2DwtJRdU=", + "lastModified": 1732238832, + "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aebe249544837ce42588aa4b2e7972222ba12e8f", + "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", "type": "github" }, "original": { @@ -189,29 +189,13 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730602179, - "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1733015953, + "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "type": "github" }, "original": { @@ -236,15 +220,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1731364708, - "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=", + "lastModified": 1733128155, + "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c91d52db103e757fc25b58998b0576ae702d659", + "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", "type": "github" }, "original": { diff --git a/home/features/cli/zsh.nix b/home/features/cli/zsh.nix index d52318b..b0db2a1 100644 --- a/home/features/cli/zsh.nix +++ b/home/features/cli/zsh.nix @@ -23,17 +23,18 @@ in # ''; shellAliases = { - switchhypr = "sudo nixos-rebuild switch --flake ."; + rebuild = "sudo nixos-rebuild switch"; dotfilesu = "nix flake lock --update-input dotfiles"; - switchuhypr = "nix flake lock --update-input dotfiles && sudo nixos-rebuild switch --flake ."; - clean = "sudo nix-collect-garbage -d"; cleanold = "sudo nix-collect-garbage --delete-old"; cleanboot = "sudo /run/current-system/bin/switch-to-configuration boot"; - nvim = "kitty @ set-spacing padding=0 && /run/current-system/sw/bin/nvim"; + # nvim = "kitty @ set-spacing padding=0 && /run/current-system/sw/bin/nvim"; + # nvim = "alacritty --config-file ~/.config/alacritty/alacritty_nvim.toml -e nvim"; + }; - initExtraFirst = " - unsetopt beep - "; + initExtraFirst = '' + unsetopt beep + path+=('/home/nomad/.local/bin') + ''; autosuggestion.enable = true; syntaxHighlighting.enable = true; # zplug = { diff --git a/home/features/desktop/hyprland.nix b/home/features/desktop/hyprland.nix index f252cd0..8d69e11 100644 --- a/home/features/desktop/hyprland.nix +++ b/home/features/desktop/hyprland.nix @@ -36,6 +36,8 @@ in "XCURSOR_SIZE,24" "NIXOS_OZONE_WL,1" "GTK_THEME,Nightfox-Dark" + "QT_AUTO_SCREEN_SCALE_FACTOR,1" + "ELECTRON_EXTRA_FLAGS,--force-device-scale-factor=1.5" ]; input = { @@ -172,7 +174,7 @@ in "$mainMod SHIFT, t, exec, kitty --start-as=fullscreen -o 'font_size=18' --title all_is_kitty" "ALT, RETURN, exec, kitty --title fly_is_kitty" - "$mainMod, RETURN, exec, kitty --title kitty_term" + "$mainMod, RETURN, exec, alacritty" "$mainMod, C, killactive" "$mainMod SHIFT, Q, exit" diff --git a/home/nomad/unkown.nix b/home/nomad/unkown.nix index c2faf06..3a750ea 100644 --- a/home/nomad/unkown.nix +++ b/home/nomad/unkown.nix @@ -32,7 +32,7 @@ settings = { monitor = [ "eDP-1,2560x1600@60,0x0,1.25" - "DP-2,1920x1080@60,auto,1" + "DP-2,1920x1080@60,auto,1,mirror,eDP-1" ]; workspace = [ diff --git a/home/nomad/unkown/home.nix b/home/nomad/unkown/home.nix index 5045ac8..977373e 100644 --- a/home/nomad/unkown/home.nix +++ b/home/nomad/unkown/home.nix @@ -12,6 +12,7 @@ home.packages = with pkgs; [ # Essentials kitty + alacritty firefox google-chrome age @@ -23,7 +24,7 @@ amberol webcord bottles - cava + #cava ryujinx mullvad-vpn transmission_4-gtk @@ -32,6 +33,7 @@ syncthing qsyncthingtray htop + openvpn #nvtopPackages.full exiftool moonlight-qt @@ -61,6 +63,8 @@ lua-language-server tailwindcss-language-server glow + # Hacks + responder-patched # # Adds the 'hello' command to your environment. It prints a friendly @@ -105,6 +109,8 @@ NIXOS_OZONE_WL = "1"; MOZ_ENABLE_WAYLAND = "1"; SDL_VIDEODRIVER = "wayland"; + QT_AUTO_SCREEN_SCALE_FACTOR = "1"; + ELECTRON_EXTRA_FLAGS = "--force-device-scale-factor=1.5"; #_JAVA_AWT_WM_NONREPARENTING = "1"; #MOZ_DRM_DEVICE = "/dev/dri/card0:/dev/dri/card1"; #WLR_DRM_DEVICES = "/dev/dri/card0:/dev/dri/card1"; diff --git a/hosts/common/users/nomad.nix b/hosts/common/users/nomad.nix index 3c8d906..a36c003 100644 --- a/hosts/common/users/nomad.nix +++ b/hosts/common/users/nomad.nix @@ -49,7 +49,6 @@ NEXTCLOUD_DB = { }; }; - sops.templates."my-env.env".content = '' DUFS_USERNAME = "${config.sops.placeholder.DUFS_USERNAME}" DUFS_PASSWORD = "${config.sops.placeholder.DUFS_PASSWORD}" @@ -58,6 +57,11 @@ NEXTCLOUD_DB = "${config.sops.placeholder.NEXTCLOUD_DB}" ''; + programs.wireshark = { + enable = true; + package = pkgs.wireshark; + }; + programs.zsh.enable = true; home-manager.users.${user} = import ../../../home/${user}/${config.networking.hostName}.nix; diff --git a/hosts/unkown/configuration.nix b/hosts/unkown/configuration.nix index 213c41e..7f2eea1 100644 --- a/hosts/unkown/configuration.nix +++ b/hosts/unkown/configuration.nix @@ -27,7 +27,14 @@ common.services.steam.enable = true; services.flatpak.enable = true; - programs.wireshark.enable = true; + # Sops secrets Comment this out if you dont need secrets! and configure ur user in hosts/common/users/YOURUSERNAME.nix + sops = { + age.keyFile = "/etc/nixos/sops/age/keys.txt"; + defaultSopsFile = ../../secrets/secrets.yaml; + defaultSopsFormat = "yaml"; + }; + + #services.samba.enable = true; #Bootloader @@ -39,14 +46,6 @@ # Ntfs support boot.supportedFilesystems = [ "ntfs" ]; - # Sops secrets Comment this out if you dont need secrets! and configure ur user in hosts/common/users/YOURUSERNAME.nix - sops = { - age.keyFile = "/etc/nixos/sops/age/keys.txt"; - defaultSopsFile = ../../secrets/secrets.yaml; - defaultSopsFormat = "yaml"; - }; - - # Enable GDM Login Manager services.xserver.enable = true; @@ -68,6 +67,10 @@ # Enable networking networking.networkmanager.enable = true; + #Hosts + networking.extraHosts = '' + ''; + # Bluethooth hardware.bluetooth.enable = true; services.blueman.enable = true; @@ -87,7 +90,10 @@ # Set your time zone. - time.timeZone = "Asia/Kuwait"; + #time.timeZone = "Asia/Kuwait"; + services.ntp = { + enable = true; + }; # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; i18n.extraLocaleSettings = { @@ -136,6 +142,7 @@ # networking.firewall.allowedUDPPortRanges = [ { from = 32768; to = 60999; } ]; # Or disable the firewall altogether. networking.firewall.enable = false; + networking.nftables.enable = false; # Before changing this value read the documentation for this option diff --git a/overlays/default.nix b/overlays/default.nix index c6759f5..a47a2d5 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -11,6 +11,71 @@ # ... # }); rofimoji = prev.rofimoji.override { rofi = prev.rofi-wayland; }; + + electron = prev.electron.overrideAttrs (oldAttrs: { + postInstall = '' + wrapProgram $out/bin/electron \ + --add-flags "--force-device-scale-factor=1.5" + ''; + }); + responder-patched = prev.responder.overrideAttrs (oldAttrs: rec { + buildInputs = oldAttrs.buildInputs or [ ] ++ [ prev.openssl prev.coreutils ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/Responder + cp -R . $out/share/Responder + + makeWrapper ${prev.python3.interpreter} $out/bin/responder \ + --set PYTHONPATH "$PYTHONPATH:$out/share/Responder" \ + --add-flags "$out/share/Responder/Responder.py" \ + --run "mkdir -p /var/lib/responder" + + substituteInPlace $out/share/Responder/Responder.conf \ + --replace-quiet "Responder-Session.log" "/var/lib/responder/Responder-Session.log" \ + --replace-quiet "Poisoners-Session.log" "/var/lib/responder/Poisoners-Session.log" \ + --replace-quiet "Analyzer-Session.log" "/var/lib/responder/Analyzer-Session.log" \ + --replace-quiet "Config-Responder.log" "/var/lib/responder/Config-Responder.log" \ + --replace-quiet "Responder.db" "/var/lib/responder/Responder.db" + + runHook postInstall + + runHook postPatch + ''; + + postInstall = '' + wrapProgram $out/bin/responder \ + --run "mkdir -p /var/lib/responder/certs && ${prev.openssl}/bin/openssl genrsa -out /var/lib/responder/certs/responder.key 2048 && ${prev.openssl}/bin/openssl req -new -x509 -days 3650 -key /var/lib/responder/certs/responder.key -out /var/lib/responder/certs/responder.crt -subj '/'" \ + --run "mkdir -p /etc/responder && if [ ! -f /etc/responder/Responder.conf ]; then cp $out/share/Responder/Responder.conf /etc/responder/Responder.conf && chmod +w /etc/responder/Responder.conf; fi" + ''; + + postPatch = '' + if [ -f $out/share/Responder/settings.py ]; then + substituteInPlace $out/share/Responder/settings.py \ + --replace-quiet "self.LogDir = os.path.join(self.ResponderPATH, 'logs')" "self.LogDir = os.path.join('/var/lib/responder', 'logs')" \ + --replace-quiet "os.path.join(self.ResponderPATH, 'Responder.conf')" "'/etc/responder/Responder.conf'" + fi + + if [ -f $out/share/Responder/utils.py ]; then + substituteInPlace $out/share/Responder/utils.py \ + --replace-quiet "logfile = os.path.join(settings.Config.ResponderPATH, 'logs', fname)" "logfile = os.path.join('/var/lib/responder', 'logs', fname)" + fi + + if [ -f $out/share/Responder/Responder.py ]; then + substituteInPlace $out/share/Responder/Responder.py \ + --replace-quiet "certs/responder.crt" "/var/lib/responder/certs/responder.crt" \ + --replace-quiet "certs/responder.key" "/var/lib/responder/certs/responder.key" + fi + + if [ -f $out/share/Responder/Responder.conf ]; then + substituteInPlace $out/share/Responder/Responder.conf \ + --replace-quiet "certs/responder.crt" "/var/lib/responder/certs/responder.crt" \ + --replace-quiet "certs/responder.key" "/var/lib/responder/certs/responder.key" + fi + ''; + }); + }; stable-packages = final: _prev: { @@ -20,3 +85,7 @@ }; }; } + + + +