Merge branch 'master' of https://code.steph.tools/steph/os
This commit is contained in:
Steph
commit
d0a13b4665
99
flake.lock
generated
99
flake.lock
generated
@ -24,11 +24,11 @@
|
||||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1733198595,
|
||||
"narHash": "sha256-7n66bpxbXkwBow1VSVHQe+rEW+8zPyawmDJ7Rd0uHNI=",
|
||||
"lastModified": 1733889799,
|
||||
"narHash": "sha256-J6ki2+W06NDD4a9/cCvQLHzgUzRYA8pwmhfoTqMsZ1w=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "51d5446f359b67d5b6fdf45a145391c4d8679b3e",
|
||||
"rev": "66ba3fb0c1594481bf0ee625bdd612e1005ed132",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@ -88,6 +88,27 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nur",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733312601,
|
||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1629284811,
|
||||
@ -130,11 +151,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733175814,
|
||||
"narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=",
|
||||
"lastModified": 1733951607,
|
||||
"narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "bf23fe41082aa0289c209169302afd3397092f22",
|
||||
"rev": "6e5b2d9e8014b5572e3367937a329e7053458d34",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -170,11 +191,11 @@
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733105089,
|
||||
"narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=",
|
||||
"lastModified": 1733570843,
|
||||
"narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "c6b65d946097baf3915dd51373251de98199280d",
|
||||
"rev": "a35b08d09efda83625bef267eb24347b446c80b8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -200,11 +221,11 @@
|
||||
},
|
||||
"nixpkgs-2405": {
|
||||
"locked": {
|
||||
"lastModified": 1733016324,
|
||||
"narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=",
|
||||
"lastModified": 1733730953,
|
||||
"narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6",
|
||||
"rev": "7109b680d161993918b0a126f38bc39763e5a709",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -230,11 +251,27 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1733015953,
|
||||
"narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
|
||||
"lastModified": 1733759999,
|
||||
"narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
|
||||
"rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1733759999,
|
||||
"narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -245,12 +282,17 @@
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733215745,
|
||||
"narHash": "sha256-RIlhnKlObJ1sEdzBP6Nuy4jLUiQnmWWXVsRHRbv6SzY=",
|
||||
"lastModified": 1733950200,
|
||||
"narHash": "sha256-DsO6bfrzxVhrlZz4IcLmmpqRIyGowjKIFz/nx/hMd9w=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "251d756a74e67bda25d89327b01a3da19dddabae",
|
||||
"rev": "b0f60529758549616f195b7cd3ea8d70dfe65297",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -286,6 +328,27 @@
|
||||
"repo": "default-darwin",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nur",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733222881,
|
||||
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
||||
@ -48,4 +48,24 @@
|
||||
boot.initrd.luks.devices."luks-d86d9bcd-df3d-4fbe-b0c0-66297852fc46".device = "/dev/disk/by-uuid/d86d9bcd-df3d-4fbe-b0c0-66297852fc46";
|
||||
networking.hostName = "tau"; # Define your hostname.
|
||||
|
||||
boot.plymouth = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
# Enable "Silent Boot"
|
||||
boot.consoleLogLevel = 0;
|
||||
boot.initrd.verbose = false;
|
||||
boot.kernelParams = [
|
||||
"quiet"
|
||||
"splash"
|
||||
"boot.shell_on_fail"
|
||||
"loglevel=3"
|
||||
"rd.systemd.show_status=false"
|
||||
"rd.udev.log_level=3"
|
||||
"udev.log_priority=3"
|
||||
];
|
||||
# Hide the OS choice for bootloaders.
|
||||
# It's still possible to open the bootloader list by pressing any key
|
||||
# It will just not appear on screen unless a key is pressed
|
||||
boot.loader.timeout = 0;
|
||||
}
|
||||
|
||||
8
home.nix
8
home.nix
@ -13,10 +13,16 @@
|
||||
config = {
|
||||
home.stateVersion = "22.05";
|
||||
programs.home-manager.enable = true;
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
enableBashIntegration = true; # see note on other shells below
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
|
||||
|
||||
nixpkgs = {
|
||||
config.allowUnfree = true;
|
||||
overlays = [ inputs.nur.overlay ];
|
||||
overlays = [ inputs.nur.overlays.default ];
|
||||
};
|
||||
|
||||
programs.direnv = {
|
||||
|
||||
@ -61,7 +61,7 @@
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
||||
};
|
||||
hardware.opengl = {
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
intel-media-driver # LIBVA_DRIVER_NAME=iHD
|
||||
|
||||
@ -33,6 +33,7 @@
|
||||
zotero
|
||||
signal-desktop
|
||||
freetube
|
||||
inputs.nixpkgs-2405.legacyPackages.${system}.cura
|
||||
];
|
||||
|
||||
dconf.settings = {
|
||||
|
||||
@ -46,13 +46,21 @@
|
||||
tolower = "tr [:upper:] [:lower:]";
|
||||
rebuild = if (os == "linux") then ''
|
||||
cd $HOME/.local/os &&
|
||||
nix flake update --commit-lock-file
|
||||
git pull &&
|
||||
nix flake update --commit-lock-file &&
|
||||
nixos-rebuild switch --flake "path:$HOME/.local/os#" --use-remote-sudo &&
|
||||
git add . &&
|
||||
git commit -m "update" &&
|
||||
git push &&
|
||||
cd -
|
||||
'' else ''
|
||||
cd $HOME/.local/os &&
|
||||
nix flake update --commit-lock-file
|
||||
git pull &&
|
||||
nix flake update --commit-lock-file &&
|
||||
home-manager switch &&
|
||||
git add . &&
|
||||
git commit -m "update" &&
|
||||
git push &&
|
||||
cd -
|
||||
'';
|
||||
":r" = "!!";
|
||||
@ -63,5 +71,6 @@
|
||||
NIX_SHELL_PRESERVE_PROMPT = 1;
|
||||
NIXPKGS_ALLOW_UNFREE = 1;
|
||||
HISTCONTROL = "ignoreboth:erasedups";
|
||||
DIRENV_LOG_FORMAT = "";
|
||||
};
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user