diff --git a/nixos/conf/GM/Pkgs/pkgs.nix b/nixos/conf/GM/Pkgs/pkgs.nix index 3d85af3..ab9c129 100644 --- a/nixos/conf/GM/Pkgs/pkgs.nix +++ b/nixos/conf/GM/Pkgs/pkgs.nix @@ -5,8 +5,8 @@ environment.systemPackages = with pkgs; [ ## Aplicativos sociais - inputs.zen-browser.packages.${system}.default - inputs.hayase.packages.${pkgs.system}.default + inputs.zen-browser.packages.${stdenv.hostPlatform.system}.default + inputs.hayase.packages.${pkgs.stdenv.hostPlatform.system}.default bitwarden-desktop inputs.chaotic.legacyPackages.${pkgs.stdenv.hostPlatform.system}.proton-cachyos_x86_64_v3 diff --git a/nixos/conf/GM/cfgeral/alias.nix b/nixos/conf/GM/cfgeral/alias.nix index 002423a..b23a63b 100644 --- a/nixos/conf/GM/cfgeral/alias.nix +++ b/nixos/conf/GM/cfgeral/alias.nix @@ -5,9 +5,6 @@ upd = "nh home switch -a -u && nh os switch -a -u"; updhome = "nh home switch -a -u"; updsystem = "nh os switch -a -u"; - nixcf = "kate /etc/nixos/configuration.nix"; - nixfk = "kate /etc/nixos/flake.nix"; - nixpkg = "kate /etc/nixos/conf/Pkgs/pkgs.nix"; - nixalias = "kate /etc/nixos/conf/Alias/alias.nix"; + gitupdate = "git add . && git commit && git push origin main" }; } \ No newline at end of file diff --git a/nixos/conf/GM/cfgeral/kernel.nix b/nixos/conf/GM/cfgeral/kernel.nix index 5f56238..a3cc6e7 100644 --- a/nixos/conf/GM/cfgeral/kernel.nix +++ b/nixos/conf/GM/cfgeral/kernel.nix @@ -1,8 +1,8 @@ { config, lib, inputs, pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages_cachyos.cachyOverride { - mArch = "GENERIC_V3"; + mArch = "GENERIC_V3"; #useO3 = true; #withLTO = "full"; }; -} \ No newline at end of file +} diff --git a/nixos/conf/HM/git/git.nix b/nixos/conf/HM/git/git.nix index dcb9977..1a27100 100644 --- a/nixos/conf/HM/git/git.nix +++ b/nixos/conf/HM/git/git.nix @@ -2,7 +2,7 @@ programs.git.settings = { enable = true; - user.email = "guihermando13@gmail.com"; + user.email = "darkgui@protonmail.com"; user.name = "DarkGui"; credential.helper = "store"; }; diff --git a/nixos/conf/HM/pkgs/pkgs.nix b/nixos/conf/HM/pkgs/pkgs.nix index 85e82c8..7ef82b8 100644 --- a/nixos/conf/HM/pkgs/pkgs.nix +++ b/nixos/conf/HM/pkgs/pkgs.nix @@ -40,6 +40,8 @@ python3 unrar droidcam + + ]; } \ No newline at end of file diff --git a/nixos/flake.lock b/nixos/flake.lock index a481ac6..e578d61 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -29,11 +29,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1763467577, - "narHash": "sha256-tXQaLJV5IPRcgURDZ4I7fkKb61hhcLzJICJfiCWoNro=", + "lastModified": 1763563060, + "narHash": "sha256-WoNrCTrsiONytvw31fvaRzwc9RcqqHv/LUyYyYflgIg=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "b544ed8dd16f58a9673238d31d171dedf9573886", + "rev": "c5bfa8ed2037abd4ca213b363065cb6f76155035", "type": "github" }, "original": { @@ -122,11 +122,11 @@ ] }, "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", + "lastModified": 1763416652, + "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", + "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1763495643, - "narHash": "sha256-XK/F2RJYBnWNxVoHXfMsgU7XAJRHM4SBtf/b7C9+Cyw=", + "lastModified": 1763601139, + "narHash": "sha256-bKzBgQanOIbMkRsuYklvn1pEe4gKjrM8DA9U2WwTtj8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "40d5fe7827fa34537708efe7bc75a4b407fba21a", + "rev": "a55471df9f7c4513670d402ef9cb17a04c7a0d1e", "type": "github" }, "original": { @@ -301,11 +301,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1763283776, - "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -339,11 +339,11 @@ ] }, "locked": { - "lastModified": 1763495044, - "narHash": "sha256-kkvQSsyWBr/F48+ZNv6rB8F7tH+4MJ1FqSF3H50+gWI=", + "lastModified": 1763596473, + "narHash": "sha256-QVRqOH++WJxUVHTheVBmmCy+y1JhCTf/hfY4kNrz780=", "owner": "nix-community", "repo": "NUR", - "rev": "06560dbad513c0bf67adc9f70ad43709ca3b5def", + "rev": "d937c63525bba103ddf01a72f375189d4e8f5207", "type": "github" }, "original": { @@ -392,11 +392,11 @@ ] }, "locked": { - "lastModified": 1763087910, - "narHash": "sha256-eB9Z1mWd1U6N61+F8qwDggX0ihM55s4E0CluwNukJRU=", + "lastModified": 1763433504, + "narHash": "sha256-cVid5UNpk88sPYHkLAA5aZEHOFQXSB/2L1vl18Aq7IM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cf4a68749733d45c0420726596367acd708eb2e8", + "rev": "42ce16c6d8318a654d53f047c9400b7d902d6e61", "type": "github" }, "original": { @@ -413,11 +413,11 @@ ] }, "locked": { - "lastModified": 1763457799, - "narHash": "sha256-33hJpIuqbn/PHf4VCZAktxDCUxnWLOtMAOyAFd75O9E=", + "lastModified": 1763521945, + "narHash": "sha256-Zcrafbe4niRJMbzaVOwg7+iedJhwBFttre2DpyCC6qA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "85bc80b9d8c8b22ed273163dd7c7adfad9287a5d", + "rev": "24d7381b9231c23daceec5d372cc28e877f7785d", "type": "github" }, "original": { diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix index 208fd64..f3ecfd7 100644 --- a/nixos/hardware-configuration.nix +++ b/nixos/hardware-configuration.nix @@ -1,3 +1,6 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: { @@ -7,24 +10,23 @@ boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; + boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/bdb15ce1-a247-49b4-ace1-db03465126d9"; + { device = "/dev/disk/by-uuid/7bbf309b-52f6-45d8-80ee-c7edf3798b19"; fsType = "btrfs"; - options = [ "subvol=@" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/A804-6A44"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; }; fileSystems."/home" = - { device = "/dev/disk/by-uuid/3039cdad-74f0-4343-970f-ae9882c39474"; - fsType = "ext4"; + { device = "/dev/disk/by-uuid/b3dd7ff9-371e-440d-91da-38c7d167e3a0"; + fsType = "xfs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/9B70-D929"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; }; swapDevices = [ ]; diff --git a/nixos/home.nix b/nixos/home.nix index c3b1888..b97ee94 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -28,4 +28,4 @@ # enable = true; # settings."org/gnome/desktop/interface".color-scheme = "prefer-dark"; #}; -} \ No newline at end of file +}