Compare commits

..

No commits in common. "2f1d56e1765593f5265bdc92e26f6dae27cdee82" and "d307dc9186d7cd747df88a9b0a97c8f6faec209f" have entirely different histories.

6 changed files with 21 additions and 30 deletions

View File

@ -75,11 +75,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731604581, "lastModified": 1731235328,
"narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "rev": "60bb110917844d354f3c18e05450606a435d2d10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -97,11 +97,11 @@
"zig-deps-fod": "zig-deps-fod" "zig-deps-fod": "zig-deps-fod"
}, },
"locked": { "locked": {
"lastModified": 1731742830, "lastModified": 1724973941,
"narHash": "sha256-w3cMP/IWj8ZMG2ZGP7B5rEznZROFCs0Z2e7Y0pAEHjU=", "narHash": "sha256-P4phJQjwMhxSxpdQN1PRJMo5ZRsOtt1zCcs0ocvTDFE=",
"owner": "water-sucks", "owner": "water-sucks",
"repo": "nixos", "repo": "nixos",
"rev": "19c876a042fa8998715a94c5535eede1ce4e381b", "rev": "0f1ba045c8029fd7c54e65e399b826fd119f0a34",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -112,11 +112,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1731403644, "lastModified": 1731332224,
"narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", "narHash": "sha256-0ctfVp27ingWtY7dbP5+QpSQ98HaOZleU0teyHQUAw0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "f6581f1c3b137086e42a08a906bdada63045f991", "rev": "184687ae1a3139faa4746168baf071f60d0310c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,11 +184,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1731319897, "lastModified": 1731139594,
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dc460ec76cbff0e66e269457d7b728432263166c", "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -215,11 +215,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731644206, "lastModified": 1731298576,
"narHash": "sha256-J4HjGCDIJTBjlzhHDjQpbci/fMIE8eNcgOAKbDJUlBs=", "narHash": "sha256-l2m0LcSohbU7FXhdlJC/jbxt9PEvFfIcdEXQdSzbvL4=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "f8f8cac5aabb30009610e7ee4b56f04291577a12", "rev": "c503d1e7521af93013b6253a5f4899ea62a3c5a3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -16,6 +16,6 @@
}; };
programs.git-credential-oauth = { programs.git-credential-oauth = {
enable = false; enable = true;
}; };
} }

View File

@ -4,7 +4,7 @@
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
# Copied from default configuration file # Copied from default configuration file
boot.initrd.luks.devices."luks-bc043db2-6b73-4181-9324-6a4ddd9574cf".device = "/dev/disk/by-uuid/bc043db2-6b73-4181-9324-6a4ddd9574cf"; boot.initrd.luks.devices."luks-9b26825f-f463-4199-830b-7176055d5fe2".device = "/dev/disk/by-uuid/9b26825f-f463-4199-830b-7176055d5fe2";
# GRUB and MC theme disabled due to an issue - "nixos.png not found" # GRUB and MC theme disabled due to an issue - "nixos.png not found"
# Enable Grub and set required parameters to make system bootable # Enable Grub and set required parameters to make system bootable

View File

@ -17,6 +17,5 @@
./miscNixStuff.nix ./miscNixStuff.nix
./nerdFonts.nix ./nerdFonts.nix
./nixos-cli.nix ./nixos-cli.nix
./vmware.nix
]; ];
} }

View File

@ -14,20 +14,20 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/81e848c1-1481-456b-8df6-47eb247771ef"; { device = "/dev/disk/by-uuid/cf584cc6-1bdb-4270-85d3-02a2dbc7c8f8";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-929e4b3e-0219-4593-aa5f-4e60fca1d7e4".device = "/dev/disk/by-uuid/929e4b3e-0219-4593-aa5f-4e60fca1d7e4"; boot.initrd.luks.devices."luks-6b99e05a-5ac8-4326-9f16-f5fe7db0bde4".device = "/dev/disk/by-uuid/6b99e05a-5ac8-4326-9f16-f5fe7db0bde4";
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/D5DB-A0C5"; { device = "/dev/disk/by-uuid/C134-D637";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [ "fmask=0077" "dmask=0077" ];
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/000c73ce-2d51-47c8-b751-baae70aac0a4"; } [ { device = "/dev/disk/by-uuid/f08e1ad3-7ab7-4c60-ae91-508bb0f55b66"; }
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

View File

@ -1,8 +0,0 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
vmware-workstation
];
virtualisation.vmware.host.enable = true;
}