Working framework config post bios
This commit is contained in:
12
flake.lock
generated
12
flake.lock
generated
@@ -7,11 +7,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1696940889,
|
||||
"narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=",
|
||||
"lastModified": 1697838989,
|
||||
"narHash": "sha256-hwVlO+st8vWJO6iy3/JbMHrUyY4Ak7xUSmffoWqBPUg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "6bba64781e4b7c1f91a733583defbd3e46b49408",
|
||||
"rev": "ae631b0b20f06f7d239d160723d228891ddb2fe0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -22,11 +22,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1696879762,
|
||||
"narHash": "sha256-Ud6bH4DMcYHUDKavNMxAhcIpDGgHMyL/yaDEAVSImQY=",
|
||||
"lastModified": 1697723726,
|
||||
"narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f99e5f03cc0aa231ab5950a15ed02afec45ed51a",
|
||||
"rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
47
flake.lock_bac
Normal file
47
flake.lock_bac
Normal file
@@ -0,0 +1,47 @@
|
||||
{
|
||||
"nodes": {
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1697662575,
|
||||
"narHash": "sha256-fVtd4Le9edB831xyGWu0aqSfg6YVbkCNMX/IE3SUIdk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3433206e51766b4164dad368a81325efbf343fbe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1697456312,
|
||||
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-unstable",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
||||
34
flake.nix
34
flake.nix
@@ -82,6 +82,12 @@
|
||||
profileExtra = ''
|
||||
if [ -e /home/nathan/.nix-profile/etc/profile.d/nix.sh ]; then . /home/nathan/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
|
||||
'';
|
||||
shellAliases = {
|
||||
ng ="nmcli c up NETGEAR97";
|
||||
ng24="nmcli c up NETGEAR97_24_2Ghz";
|
||||
ng58="nmcli c up NETGEAR97_28_5Ghz";
|
||||
ng5c="nmcli c up NETGEAR97_2C_5Ghz";
|
||||
};
|
||||
};
|
||||
programs.git = {
|
||||
enable = true;
|
||||
@@ -347,12 +353,13 @@
|
||||
modules = [
|
||||
home-manager.nixosModules.home-manager
|
||||
homeManagerSharedModule
|
||||
({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs [ pkgs.light pkgs.gpodder pkgs.evince ]) {
|
||||
({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs [ pkgs.light pkgs.gpodder pkgs.evince pkgs.wezterm pkgs.gnome.gnome-tweaks pkgs.vulkan-tools ]) {
|
||||
# HARDWARE
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
hardware.opengl.extraPackages = with pkgs; [ amdvlk ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
@@ -383,8 +390,16 @@
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
#boot.kernelPackages = pkgs.linuxPackages_testing;
|
||||
#boot.kernelParams = [ "amdgpu.sg_display=0" ];
|
||||
networking.hostName = "nixos-framework"; # Define your hostname.
|
||||
system.stateVersion = "22.11"; # Did you read the comment?
|
||||
services.fwupd.enable = true;
|
||||
#services.xserver = {
|
||||
# enable = true;
|
||||
# displayManager.gdm.enable = true;
|
||||
# desktopManager.gnome.enable = true;
|
||||
#};
|
||||
}))
|
||||
];
|
||||
};
|
||||
@@ -399,7 +414,8 @@
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
hardware.opengl.extraPackages = with pkgs; [ amdvlk ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
@@ -597,12 +613,12 @@
|
||||
PermitRootLogin = "prohibit-password";
|
||||
};
|
||||
|
||||
services.mastodon = {
|
||||
enable = true;
|
||||
localDomain = "mastodon.room409.xyz";
|
||||
configureNginx = true;
|
||||
smtp.fromAddress = "notifications@mastodon.room409.xyz";
|
||||
};
|
||||
#services.mastodon = {
|
||||
# enable = true;
|
||||
# localDomain = "mastodon.room409.xyz";
|
||||
# configureNginx = true;
|
||||
# smtp.fromAddress = "notifications@mastodon.room409.xyz";
|
||||
#};
|
||||
|
||||
services.mautrix-telegram = {
|
||||
enable = true;
|
||||
|
||||
@@ -17,7 +17,7 @@ exec configure-gtk
|
||||
exec sleep 5; systemctl --user start kanshi.service
|
||||
|
||||
#When everything's wayland, maybe
|
||||
#output eDP-1 scale 2
|
||||
output eDP-1 scale 1
|
||||
|
||||
#Output HDMI-A-1 'Goldstar Company Ltd LG TV SSCR2 0x00000101'
|
||||
output HDMI-A-1 mode 1920x1080@60Hz
|
||||
|
||||
Reference in New Issue
Block a user