diff --git a/README.md b/README.md index 159642f..205bec1 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ cd dotfiles nixos-rebuild switch --flake .#Satori ``` or -`nixos-rebuild switch --flake github:natto1784/dotfiles#Satori` +`nixos-rebuild switch --flake github:natto1784/dotfiles#Satori`\ Replace Satori with whatever system you want or replace to whatever hostname you want in the config ## How home-manager workey @@ -27,7 +27,7 @@ You can unlink "hm-result" after that replace {USER} with 'natto' or whatever is availabe (or change it in the config) ## How packages workey -To build or run any of the packages in this flake do +To build or run any of the packages in this flake do\ `nix <"run"/"build"> github:natto1784/dotfiles#pkgs..` Following are the people whose configs I took inspiration from and learned stuff from diff --git a/flake.nix b/flake.nix index a0e8d7c..451bb96 100644 --- a/flake.nix +++ b/flake.nix @@ -20,15 +20,13 @@ outputs = inputs@{self, nixpkgs, ... }: inputs.utils.lib.eachDefaultSystem (system: { - pkgs = import nixpkgs { + packages = import nixpkgs { inherit system; overlays = self.overlays ++ [ inputs.nur.overlay inputs.emacs.overlay ]; config.allowUnfree = true; }; }) // ( - let - in { overlays = [ (import ./overlays/overridesandshit.nix) @@ -41,7 +39,7 @@ imports = [ ./home/natto.nix ]; - nixpkgs.overlays = self.pkgs.x86_64-linux.overlays; + nixpkgs.overlays = self.packages.x86_64-linux.overlays; nixpkgs.config.allowUnfree = true; }; homeDirectory = "/home/natto"; @@ -55,7 +53,7 @@ ./satori.nix inputs.agenix.nixosModules.age inputs.home-manager.nixosModules.home-manager - { nixpkgs.pkgs = self.pkgs.x86_64-linux; } + { nixpkgs.pkgs = self.packages.x86_64-linux; } ]; }; }); diff --git a/home/natto.nix b/home/natto.nix index fc138b8..511f6c0 100644 --- a/home/natto.nix +++ b/home/natto.nix @@ -22,6 +22,7 @@ in fish_variables = { file = ./secrets/fish_variables.age; path = "${home}/.config/fish/fish_variables"; + mode = "660"; }; mpdasrc = { file = ./secrets/mpdasrc.age; diff --git a/home/stuff/programs/nvim.nix b/home/stuff/programs/nvim.nix index 1bc61fc..19deaaa 100644 --- a/home/stuff/programs/nvim.nix +++ b/home/stuff/programs/nvim.nix @@ -62,8 +62,8 @@ in enable = true; vimAlias = true; viAlias = false; - withNodeJs = true; - withPython = true; + # withNodeJs = true; + # withPython = true; extraConfig = '' let g:gruvbox_italic=1 let g:gruvbox_contrast_dark="hard" diff --git a/overlays/customscripts/src/ncm b/overlays/customscripts/src/ncm index 0cfae34..96516e8 100644 --- a/overlays/customscripts/src/ncm +++ b/overlays/customscripts/src/ncm @@ -1,5 +1,4 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i sh -p ncmpcpp python39Packages.ueberzug +#!/usr/bin/env sh #credits: https://github.com/alnj/ncmpcpp-ueberzug export FIFO_UEBERZUG="/tmp/mpd-ueberzug-${PPID}" diff --git a/satori/hardware.nix b/satori/hardware.nix index eb71e8b..1b2bee0 100644 --- a/satori/hardware.nix +++ b/satori/hardware.nix @@ -9,7 +9,7 @@ fileSystems."/" = { device = "/dev/disk/by-uuid/4c02ddf5-d00e-4d84-856f-c327ae44d047"; fsType = "btrfs"; - options = ["compress=zstd:10"]; + options = ["compress-force=zstd:4"]; }; fileSystems."/boot/efi" = @@ -40,7 +40,7 @@ fileSystems."/mnt/LinuxGames" = { device = "/dev/sda5"; fsType = "btrfs"; - options = ["rw"]; + options = ["rw" "compress-force=zstd:4"]; }; swapDevices = [ {device = "/dev/nvme0n1p7";} ];