natto1784/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

misc changes

Browse Source 
new services, random config updates
This commit is contained in:
Amneesh Singh
2021-11-30 06:31:53 +05:30
parent 21212a5cf4
commit 6130b448e0
23 changed files with 507 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.github

248
flake.lock generated
View File

@@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1631325864, "lastModified": 1637793790,
"narHash": "sha256-bBvrjUS0qfgC4LPFthGJ5E8Fl0f5UvlrCB3o5Bnn9ys=", "narHash": "sha256-oPXavjxETEWGXq8g7kQHyRLKUmLX2yPtGn+t3V0mrTY=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "5c5bc282565f03f9c5b3d6e72b7cb985706148a6", "rev": "f85eea0e29fa9a8924571d0e398215e175f80d55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -36,11 +36,11 @@
}, },
"emacs": { "emacs": {
"locked": { "locked": {
"lastModified": 1631467754, "lastModified": 1638146980,
"narHash": "sha256-lZbeo1Y/jni/KW1W+DnaeCPgIu+W+ks8qp3xlRtUYFQ=", "narHash": "sha256-tb5Wj3NI812IiMHhYruw3UVt6vPicHC1NpLGKyTP2uI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "e00f171142307b3c9bb962beeaaf09d0254f9e31", "rev": "58236c2d03c4405a560f12cb7536251973f551e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -66,6 +66,21 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1623875721,
"narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": { "locked": {
"lastModified": 1629481132, "lastModified": 1629481132,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
@@ -85,11 +100,29 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1630076227, "lastModified": 1638150501,
"narHash": "sha256-p3YdtqSPLnMudWsLMgd6XMEhQKB2oz1hvDkHtOlz5/Q=", "narHash": "sha256-aWH3MRmjUtx8ciSGLegBJC5mhymsuroHPs74ZldrNTU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f5adb9be829f487f99bcc0f1884f74ddb85f70c8", "rev": "9de77227d7780518cfeaee5a917970247f3ecc56",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager-stable": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1637917894,
"narHash": "sha256-mzkyjq+OW1K5XHG43zrnjJX/K1ehahVWlKjMzWX/Vvg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "7efd99ef876c220848553ae10218685d5e5d79cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -99,24 +132,6 @@
"type": "github" "type": "github"
} }
}, },
"home-manager-unstable": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1631134124,
"narHash": "sha256-C17wJ2HyuFZllJ/PbpFuuDjkzWvg8np9UIAdSrpuwS0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "039f786e609fdb3cfd9c5520ff3791750c3eaebf",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"mailserver": { "mailserver": {
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",
@@ -125,11 +140,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1628684416, "lastModified": 1637902663,
"narHash": "sha256-zm7JHe/K2NthgV57QhnmfT9i7azGa2tc5fJOzEiYlLo=", "narHash": "sha256-6ExA+6vPfkHodMoAaCIVLC3BGeF/q28sShHoiusXD6g=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "fb85a3fe9e4f673f9c017a23ada00b05d61cdc6a", "rev": "822c5f22bd6e43b6b4a772045756ebf6a00cd884",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -140,11 +155,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1631384788, "lastModified": 1638168345,
"narHash": "sha256-qud6zLYwwXoTGcPcI60oZv91djhNW79cwkgkVALaXww=", "narHash": "sha256-QiqE2KqhYvZOSNSGjtj2z5+d3TJTHl7ziGdN2hxek0s=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "73489348f63950e9e6089cdb1ca9342aa2bf213d", "rev": "9a3b63e9f1f11d0434432ac91a750f6e6d963a78",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -176,18 +191,19 @@
}, },
"neovim-flake": { "neovim-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nvim",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1631326779, "lastModified": 1638043901,
"narHash": "sha256-/T3QznIhQFVdpQLGk24JDI8bfFiPQOJ6+Ly4G6meiE4=", "narHash": "sha256-/ptPh9yDIFYik13bOv6nhPWlWaozOI9SVPe7F/nCzrw=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "086631cd92d7b60f122963f9fd1779583b19004c", "rev": "07223fae54b5b8095da16c598fc1395ec3677691",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -197,6 +213,27 @@
"type": "github" "type": "github"
} }
}, },
"nix-gaming": {
"inputs": {
"nixpkgs": "nixpkgs_6",
"oglfPatches": "oglfPatches",
"tkgPatches": "tkgPatches",
"utils": "utils_3"
},
"locked": {
"lastModified": 1637691862,
"narHash": "sha256-ZkUW8JfjDmFZnRQKeBKQvqlWLRgIq4p6v2QfLrjSm0s=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "caf86b1dd4b4cdd59970590eaaa9c009c9f1e6ea",
"type": "github"
},
"original": {
"owner": "fufexan",
"repo": "nix-gaming",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1618628710, "lastModified": 1618628710,
@@ -227,11 +264,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1631384788, "lastModified": 1638168345,
"narHash": "sha256-qud6zLYwwXoTGcPcI60oZv91djhNW79cwkgkVALaXww=", "narHash": "sha256-QiqE2KqhYvZOSNSGjtj2z5+d3TJTHl7ziGdN2hxek0s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "73489348f63950e9e6089cdb1ca9342aa2bf213d", "rev": "9a3b63e9f1f11d0434432ac91a750f6e6d963a78",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -241,11 +278,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1631384788, "lastModified": 1638168345,
"narHash": "sha256-qud6zLYwwXoTGcPcI60oZv91djhNW79cwkgkVALaXww=", "narHash": "sha256-QiqE2KqhYvZOSNSGjtj2z5+d3TJTHl7ziGdN2hxek0s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "73489348f63950e9e6089cdb1ca9342aa2bf213d", "rev": "9a3b63e9f1f11d0434432ac91a750f6e6d963a78",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -286,27 +323,42 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1631275245, "lastModified": 1628417749,
"narHash": "sha256-vROU1OFI2zvKSBjbMpbpl9R08Or3eUwaW5HJLq88QWY=", "narHash": "sha256-LI00lL97qfnVPYLM50nh9BhHY9viHziuLjkMzBrIuTE=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8b0b81dab17753ab344a44c04be90a61dc55badf", "rev": "3a8b5de9f0db6be3eccf4987b09af26499ceff6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-21.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1631206977, "lastModified": 1638097282,
"narHash": "sha256-o3Dct9aJ5ht5UaTUBzXrRcK1RZt2eG5/xSlWJuUCVZM=", "narHash": "sha256-EXCzj9b8X/lqDPJapxZThIOKL5ASbpsJZ+8L1LnY1ig=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4f6d8095fd51954120a1d08ea5896fe42dc3923b", "rev": "78cb77b29d37a9663e05b61abb4fa09465da4b70",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1637841632,
"narHash": "sha256-QYqiKHdda0EOnLGQCHE+GluD/Lq2EJj4hVTooPM55Ic=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "73369f8d0864854d1acfa7f1e6217f7d6b6e3fa1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -318,11 +370,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1631381877, "lastModified": 1638151156,
"narHash": "sha256-tJIiLHD8hFT/k3B23uSKRwo1uy/8pO7ow94hECjHAEQ=", "narHash": "sha256-UOCvbXBpU8SbxiR4yLEW1CTDvxR8aA2dBOsw6Iai07I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "c965f192aaacb1d7fbf8afb049422043fe125dbe", "rev": "b873821f8bbac6d185728a6e3482c8acb8ed285a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -335,14 +387,14 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"neovim-flake": "neovim-flake", "neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1631347924, "lastModified": 1638087178,
"narHash": "sha256-JRVeXBlGp8eCic7HxEj/H9KEh9MLbbWq+rbMhDFLNkk=", "narHash": "sha256-2Z1bFOdtqJz3259xIXaAqu3n0iD0uaKOG53uSCQEr34=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "3b416a38ba8f853aaeba9626712b3e64b85232c2", "rev": "e1a53537b1c7ad2a16da1493cd75b773635a9319",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -351,38 +403,73 @@
"type": "github" "type": "github"
} }
}, },
"oglfPatches": {
"flake": false,
"locked": {
"lastModified": 1629854275,
"narHash": "sha256-hnj86MirD0jU4NzkdRoaODuryGRPUavA9qhGWlixk2Y=",
"owner": "openglfreak",
"repo": "wine-tkg-userpatches",
"rev": "c5d849279c8a90123162d92413aa249c2f044dc0",
"type": "github"
},
"original": {
"owner": "openglfreak",
"repo": "wine-tkg-userpatches",
"rev": "c5d849279c8a90123162d92413aa249c2f044dc0",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"emacs": "emacs", "emacs": "emacs",
"home-manager": "home-manager", "home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable", "home-manager-stable": "home-manager-stable",
"mailserver": "mailserver", "mailserver": "mailserver",
"master": "master", "master": "master",
"nbfc": "nbfc", "nbfc": "nbfc",
"nixpkgs": "nixpkgs_6", "nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_7",
"nur": "nur", "nur": "nur",
"nvim": "nvim", "nvim": "nvim",
"unstable": "unstable", "stable": "stable",
"utils": "utils_3" "utils": "utils_4"
} }
}, },
"unstable": { "stable": {
"locked": { "locked": {
"lastModified": 1631315520, "lastModified": 1637973395,
"narHash": "sha256-Y8j0JYtZMifrHaWdTfTp1mYVXZ2PLJO/P0XZxMvo7KU=", "narHash": "sha256-wp/QgsnnKJAIMZeQgJT1bWQ/OutZ+80lHwtpYAUWDfE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b72ad04a8a324697d3fb92e19cd840379a902813", "rev": "4f37689c8a219a9d756c5ff38525ad09349f422f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixpkgs-unstable", "ref": "nixos-21.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"tkgPatches": {
"flake": false,
"locked": {
"lastModified": 1628767531,
"narHash": "sha256-tcprbnfojbCQLiebOaiOp0Occ/6f0m38N56bzgGKuJc=",
"owner": "Frogging-Family",
"repo": "wine-tkg-git",
"rev": "de6cd55961861c254bb4d96481a75bfb78553e5d",
"type": "github"
},
"original": {
"owner": "Frogging-Family",
"ref": "6.14.r6.g1bc4da9d",
"repo": "wine-tkg-git",
"type": "github"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1605370193, "lastModified": 1605370193,
@@ -414,12 +501,31 @@
} }
}, },
"utils_3": { "utils_3": {
"inputs": {
"flake-utils": "flake-utils"
},
"locked": { "locked": {
"lastModified": 1629481132, "lastModified": 1626816926,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "narHash": "sha256-mJKFdfc4UWL49ar2Tc4krKMnDUa0Dkhj8QmbR3SThHo=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "5dba7556e1c7f36152c9f65c16bc813ec73ee6a5",
"type": "github"
},
"original": {
"owner": "gytis-ivaskevicius",
"ref": "staging",
"repo": "flake-utils-plus",
"type": "github"
}
},
"utils_4": {
"locked": {
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "997f7efcb746a9c140ce1f13c72263189225f482", "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github" "type": "github"
}, },
"original": { "original": {

32
flake.nix
View File

@@ -1,10 +1,10 @@
{ {
inputs = { inputs = {
nixpkgs.url = github:nixos/nixpkgs/nixos-21.05; stable.url = github:nixos/nixpkgs/nixos-21.05;
unstable.url = github:nixos/nixpkgs/nixpkgs-unstable; nixpkgs.url = github:nixos/nixpkgs/nixpkgs-unstable;
master.url = github:nixos/nixpkgs/master; master.url = github:nixos/nixpkgs/master;
home-manager-unstable.url = github:nix-community/home-manager; home-manager.url = github:nix-community/home-manager;
home-manager.url = github:nix-community/home-manager/release-21.05; home-manager-stable.url = github:nix-community/home-manager/release-21.05;
nur.url = github:nix-community/NUR; nur.url = github:nix-community/NUR;
agenix.url = github:ryantm/agenix; agenix.url = github:ryantm/agenix;
utils.url = github:numtide/flake-utils; utils.url = github:numtide/flake-utils;
@@ -12,9 +12,10 @@
mailserver.url = gitlab:simple-nixos-mailserver/nixos-mailserver; mailserver.url = gitlab:simple-nixos-mailserver/nixos-mailserver;
nbfc.url = github:natto1784/nbfc-linux/yawr; nbfc.url = github:natto1784/nbfc-linux/yawr;
emacs.url = github:nix-community/emacs-overlay; emacs.url = github:nix-community/emacs-overlay;
nix-gaming.url = github:fufexan/nix-gaming;
}; };
outputs = inputs@{self, nixpkgs, unstable, master, ... }: outputs = inputs@{self, nixpkgs, stable, master, ... }:
inputs.utils.lib.eachDefaultSystem (system: inputs.utils.lib.eachDefaultSystem (system:
let let
mkPkgs = channel: system: import channel { mkPkgs = channel: system: import channel {
@@ -22,8 +23,8 @@
config.allowUnfree = true; config.allowUnfree = true;
}; };
channels = final: prev: { channels = final: prev: {
unstable = mkPkgs unstable prev.system; stable = mkPkgs stable prev.system;
stable = mkPkgs nixpkgs prev.system; unstable = mkPkgs nixpkgs prev.system;
master = mkPkgs master prev.system; master = mkPkgs master prev.system;
}; };
overlays = [ overlays = [
@@ -39,7 +40,10 @@
inputs.nvim.overlay inputs.nvim.overlay
inputs.emacs.overlay inputs.emacs.overlay
channels channels
(_:_:{nbfc-linux=inputs.nbfc.defaultPackage.${system};}) ( _: _: {
nbfc-linux=inputs.nbfc.defaultPackage.${system};
games = inputs.nix-gaming.packages.${system};
})
]; ];
config.allowUnfree = true; config.allowUnfree = true;
config.allowBroken = true; config.allowBroken = true;
@@ -71,9 +75,14 @@
imports = [ imports = [
./home/natto.nix ./home/natto.nix
]; ];
nixpkgs.overlays = self.legacyPackages.x86_64-linux.overlays; nixpkgs = {
nixpkgs.config.allowUnfree = true; overlays = self.legacyPackages.x86_64-linux.overlays;
nixpkgs.config.allowBroken = true; config.allowUnfree = true;
config.allowBroken = true;
config.permittedInsecurePackages = [
"electron-9.4.4"
];
};
}; };
homeDirectory = "/home/natto"; homeDirectory = "/home/natto";
username = "natto"; username = "natto";
@@ -87,7 +96,6 @@
modules = [ modules = [
./hosts/satori ./hosts/satori
inputs.agenix.nixosModules.age inputs.agenix.nixosModules.age
inputs.home-manager.nixosModules.home-manager
{ {
nixpkgs.pkgs = self.legacyPackages.x86_64-linux; nixpkgs.pkgs = self.legacyPackages.x86_64-linux;
} }

36
home/config/xmonad/xmonad.hs
View File

@@ -57,13 +57,13 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
spawn "flameshot full -p /home/natto/Pictures -d 10000") spawn "flameshot full -p /home/natto/Pictures -d 10000")
, ((modMask, xK_p), , ((modMask, xK_p),
spawn "playerctl play-pause") spawn "mpc toggle")
, ((modMask, xK_h), , ((modMask, xK_n),
spawn "playerctl next") spawn "mpc next")
, ((modMask, xK_k), , ((modMask, xK_e),
spawn "playerctl previous") spawn "mpc prev")
, ((modMask .|. shiftMask, xK_a), , ((modMask .|. shiftMask, xK_a),
spawn "mpc seek -00:00:05") spawn "mpc seek -00:00:05")
@@ -110,45 +110,45 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
, ((modMask, xK_r), , ((modMask, xK_r),
refresh) refresh)
, ((modMask, xK_n), , ((modMask, xK_j),
windows W.focusDown) windows W.focusDown)
, ((modMask, xK_e), windows W.focusUp ) , ((modMask, xK_k), windows W.focusUp )
, ((modMask .|. shiftMask, xK_m), , ((modMask .|. shiftMask, xK_h),
windows W.focusMaster ) windows W.focusMaster )
, ((modMask .|. shiftMask, xK_Return), , ((modMask .|. shiftMask, xK_Return),
windows W.swapMaster) windows W.swapMaster)
, ((modMask .|. shiftMask, xK_n), , ((modMask .|. shiftMask, xK_j),
windows W.swapDown ) windows W.swapDown )
, ((modMask .|. shiftMask, xK_e), , ((modMask .|. shiftMask, xK_k),
windows W.swapUp ) windows W.swapUp )
, ((mod1Mask, xK_m), , ((mod1Mask, xK_h),
sendMessage Expand) sendMessage Expand)
, ((mod1Mask, xK_i), , ((mod1Mask, xK_l),
sendMessage Shrink) sendMessage Shrink)
, ((mod1Mask, xK_n), , ((mod1Mask, xK_j),
sendMessage MirrorExpand) sendMessage MirrorExpand)
, ((mod1Mask, xK_e), , ((mod1Mask, xK_k),
sendMessage MirrorShrink) sendMessage MirrorShrink)
, ((mod1Mask .|. shiftMask, xK_m), , ((mod1Mask .|. shiftMask, xK_h),
withFocused (keysMoveWindow (-30, 0))) withFocused (keysMoveWindow (-30, 0)))
, ((mod1Mask .|. shiftMask, xK_i), , ((mod1Mask .|. shiftMask, xK_l),
withFocused (keysMoveWindow (30, 0))) withFocused (keysMoveWindow (30, 0)))
, ((mod1Mask .|. shiftMask, xK_n), , ((mod1Mask .|. shiftMask, xK_j),
withFocused (keysMoveWindow (0, 30))) withFocused (keysMoveWindow (0, 30)))
, ((mod1Mask .|. shiftMask, xK_e), , ((mod1Mask .|. shiftMask, xK_k),
withFocused (keysMoveWindow (0, -30))) withFocused (keysMoveWindow (0, -30)))
, ((modMask, xK_t), , ((modMask, xK_t),

8
home/config/zathura/zathurarc
View File

@@ -8,7 +8,7 @@ map S rotate
map f zoom in map f zoom in
map q zoom out map q zoom out
map p follow link map p follow link
map m scroll left #map m scroll left
map i scroll right #map i scroll right
map n scroll down #map n scroll down
map e scroll up #map e scroll up

26
home/natto.nix
View File

@@ -37,7 +37,9 @@ in
}; };
home = { home = {
packages = with pkgs; [ packages = with pkgs; [
ffmpeg /* (ffmpeg-full.override {
libaom = libaom;
})*/
sox sox
rage rage
curl curl
@@ -48,14 +50,13 @@ in
xfce.thunar xfce.thunar
xfce.xfconf xfce.xfconf
xfce.tumbler xfce.tumbler
discord master.discord
customscripts customscripts
mpd_discord_richpresence mpd_discord_richpresence
sox sox
qbittorrent qbittorrent
#tor-browser-bundle-bin #tor-browser-bundle-bin
#mpc_cli mpc_cli
playerctl
hexchat hexchat
luajit luajit
mpv mpv
@@ -80,18 +81,23 @@ in
arc-theme arc-theme
arc-icon-theme arc-icon-theme
tor-browser-bundle-bin tor-browser-bundle-bin
wineWowPackages.stable games.wine-tkg
(master.winetricks.override { wine = wineWowPackages.stable; }) master.winetricks
games.winestreamproxy
/* (games.osu-stable.overrideAttrs (_:{
tricks = [ "gdiplus" "dotnet46" "meiryo" ];
}))*/
csvtool csvtool
pmidi pmidi
dosbox dosbox
authy authy
unstable.premid unstable.premid
taa (master.tauon.override { withDiscordRPC = true; })
(master.tauon.overrideAttrs (oa: {
pythonPath = oa.pythonPath ++ [ unstable.python39Packages.pypresence ];
}))
nbfc-linux nbfc-linux
pulseaudio
(texlive.combine { inherit (texlive) scheme-small babel lm graphics-def url; })
qjackctl
carla
]; ];
file = { file = {

2
home/stuff/programs.nix
View File

@@ -33,6 +33,8 @@
force-window = "yes"; force-window = "yes";
keep-open = "yes"; keep-open = "yes";
save-position-on-quit = "yes"; save-position-on-quit = "yes";
# autofit="100%";
# no-keepaspect-window = "yes";
}; };
}; };
go.enable = true; go.enable = true;

72
home/stuff/services.nix
View File

@@ -5,40 +5,43 @@ in
{ {
services = { services = {
picom = { picom = {
experimentalBackends = true;
enable = true; enable = true;
shadow = true;
shadowOffsets = [ (6) (6) ];
shadowExclude = [
"! name~=''"
"window_type = 'dock'"
"name = 'Dunst'"
"_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
];
blur = true;
blurExclude = [
"window_type = 'dock'"
"window_type = 'desktop'"
"class_g = 'dwm'"
];
inactiveOpacity = "0.92";
activeOpacity = "0.97";
fade = true;
fadeSteps = [ "0.04" "0.04" ];
backend = "glx";
menuOpacity = "0.8";
vSync = false;
opacityRule = [
"100:class_i='Tauon Music Box'"
"100:class_g='firefox'"
];
extraOptions = extraOptions =
'' ''
shadow = true; shadow-radius = 8;
shadow-radius = 20;
shadow-offset-x = 30;
shadow-offset-y = 30;
blurExclude = [ "class_g = 'dwm'" ]
inactive-opacity = 0.92;
active-opacity = 0.97;
inactive-opacity-override = true; inactive-opacity-override = true;
blur-background = true;
blur-method = "dual_kawase"; blur-method = "dual_kawase";
blur-strength = 3; blur-strength = 3;
blur-kern = "11x11gaussian"; blur-kern = "11x11gaussian";
fading = true;
fade-in-step = 0.05;
fade-out-step = 0.05;
backend = "glx";
detect-rounded-corners = true; detect-rounded-corners = true;
detect-client-opacity = true; detect-client-opacity = true;
experimental-backends = true;
vsync = false;
wintypes:
{
tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; };
popup_menu={opacity=0.8;};
dropdown_menu={opacity=0.8;};
};
shadow-exclude = ["x = 0 && y = 0 && override_redirect = true", "class_g = 'xmobar' && argb", "class_g = 'stalonetray' && argb"]
''; '';
}; };
sxhkd = { sxhkd = {
enable = false; enable = false;
@@ -48,15 +51,17 @@ in
mpd = { mpd = {
enable = true; enable = true;
musicDirectory = "${config.home.homeDirectory}/Music"; musicDirectory = "${config.home.homeDirectory}/Music";
dbFile = "${config.home.homeDirectory}/.config/mpd/database";
dataDir = "${config.home.homeDirectory}/.config/mpd";
network = {
startWhenNeeded = true;
listenAddress = "any";
port = 6600;
};
extraConfig = '' extraConfig = ''
playlist_directory "~/.config/mpd/playlists"
db_file "~/.config/mpd/database"
log_file "~/.config/mpd/log" log_file "~/.config/mpd/log"
pid_file "~/.config/mpd/pid" pid_file "~/.config/mpd/pid"
state_file "~/.config/mpd/state" # bind_to_address "~/.config/mpd/socket"
bind_to_address "~/.config/mpd/socket"
bind_to_address "localhost"
port "6600"
restore_paused "yes" restore_paused "yes"
input { input {
plugin "curl" plugin "curl"
@@ -71,9 +76,14 @@ in
path "/tmp/g.fifo" path "/tmp/g.fifo"
format "44100:16:2" format "44100:16:2"
} }
audio_output {
type "httpd"
name "My HTTP Stream"
port "8000"
max_clients "4"
}
filesystem_charset "UTF-8" filesystem_charset "UTF-8"
''; '';
network.startWhenNeeded = true;
}; };
stalonetray = { stalonetray = {
enable = true; enable = true;

2
hosts/satori/boot.nix
View File

@@ -2,7 +2,7 @@
{ {
boot = { boot = {
kernelPackages = pkgs.unstable.linuxPackages_zen; kernelPackages = pkgs.unstable.linuxPackages_latest;
initrd={ initrd={
availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "vfio-pci"]; availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "vfio-pci"];
/* preDeviceCommands = '' /* preDeviceCommands = ''

2
hosts/satori/hardware.nix
View File

@@ -51,7 +51,7 @@
}; };
powerManagement = { powerManagement = {
enable = true; enable = true;
cpuFreqGovernor = "powersave"; cpuFreqGovernor = "schedutil";
}; };
hardware = { hardware = {
bluetooth.enable = true; bluetooth.enable = true;

2
hosts/satori/networking.nix
View File

@@ -6,7 +6,7 @@
wireless.enable = true; wireless.enable = true;
wireless.interfaces = [ "wlp0s20f3" ]; wireless.interfaces = [ "wlp0s20f3" ];
firewall = { firewall = {
allowedTCPPorts = [ 22 18172 ]; allowedTCPPorts = [ 22 18172 6600 ];
allowedUDPPorts = [ 22 17840 18172 ]; allowedUDPPorts = [ 22 17840 18172 ];
}; };
interfaces = { interfaces = {

13
hosts/satori/pkgs.nix
View File

@@ -16,9 +16,10 @@
cachix cachix
gcc gcc
rustc rustc
openjdk stable.openjdk
virtmanager virtmanager
tree-sitter tree-sitter
docker-compose
]; ];
programs = { programs = {
@@ -71,7 +72,6 @@
dconf.enable = true; dconf.enable = true;
adb.enable = true; adb.enable = true;
light.enable = true; light.enable = true;
noisetorch.enable = true;
proxychains = { proxychains = {
enable = true; enable = true;
chain.type = "dynamic"; chain.type = "dynamic";
@@ -98,5 +98,14 @@
experimental-features = nix-command ca-references flakes experimental-features = nix-command ca-references flakes
''; '';
trustedUsers = [ "root" "natto" ]; trustedUsers = [ "root" "natto" ];
binaryCaches = [
"https://nix-gaming.cachix.org"
"https://nix-community.cachix.org"
"https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
];
binaryCachePublicKeys = [
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
}; };
} }

5
hosts/satori/services.nix
View File

@@ -12,9 +12,14 @@
udev.extraRules = '' udev.extraRules = ''
ACTION=="add|change", KERNEL=="sda", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq" ACTION=="add|change", KERNEL=="sda", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
''; '';
mysql = {
enable = true;
package = pkgs.mysql;
};
}; };
systemd.services = { systemd.services = {
tor.wantedBy = lib.mkForce []; tor.wantedBy = lib.mkForce [];
mysql.wantedBy = lib.mkForce [];
logmein-hamachi.wantedBy = lib.mkForce []; logmein-hamachi.wantedBy = lib.mkForce [];
openssh.wantedBy = lib.mkForce []; openssh.wantedBy = lib.mkForce [];
#printing.wantedBy = lib.mkForce []; #printing.wantedBy = lib.mkForce [];

13
hosts/satori/stuff.nix
View File

@@ -1,7 +1,15 @@
{config, agenix, pkgs, ... }: {lib, config, agenix, pkgs, ... }:
{ {
time.timeZone = "Asia/Kolkata"; time.timeZone = "Asia/Kolkata";
environment = { environment = {
etc."current-system-packages".text =
let
packages = builtins.map (p: "${p.name}") config.environment.systemPackages;
sortedUnique = builtins.sort builtins.lessThan (lib.unique packages);
formatted = builtins.concatStringsSep "\n" sortedUnique;
in
formatted;
sessionVariables = { sessionVariables = {
QT_X11_NO_MITSHM="1"; QT_X11_NO_MITSHM="1";
QT_QPA_PLATFORMTHEME = "gtk3"; QT_QPA_PLATFORMTHEME = "gtk3";
@@ -34,7 +42,7 @@
isNormalUser = true; isNormalUser = true;
shell = pkgs.zsh; shell = pkgs.zsh;
home = "/home/natto"; home = "/home/natto";
extraGroups = [ "wheel" "adbusers" "video" "libvirtd" ]; extraGroups = [ "wheel" "adbusers" "video" "libvirtd" "docker" ];
}; };
i18n = { i18n = {
inputMethod = { inputMethod = {
@@ -44,5 +52,6 @@
fcitx.engines = with pkgs.fcitx-engines; [ m17n mozc ]; fcitx.engines = with pkgs.fcitx-engines; [ m17n mozc ];
}; };
}; };
virtualisation.docker.enable = true;
gtk.iconCache.enable = true; gtk.iconCache.enable = true;
} }

37
modules/emacs/default.nix
View File

@@ -1,7 +1,8 @@
{ pkgs, config, ... }: {pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ services.emacs = {
(emacsWithPackagesFromUsePackage { enable = true;
package = with pkgs; emacsWithPackagesFromUsePackage {
config = ./init.el; config = ./init.el;
package = emacsGcc; package = emacsGcc;
alwaysEnsure = true; alwaysEnsure = true;
@@ -9,41 +10,38 @@
use-package use-package
tsc tsc
]; ];
#https://github.com/NixOS/nixpkgs/issues/108089
override = epkgs : epkgs // { override = epkgs : epkgs // {
tsc = epkgs.melpaPackages.tsc.overrideAttrs(oa: tsc = epkgs.melpaPackages.tsc.overrideAttrs(oa:
let let
version = "0.15.1"; version = "0.15.2";
tsc-dyn = fetchurl { tsc-dyn = fetchurl {
url = "https://github.com/emacs-tree-sitter/elisp-tree-sitter/releases/download/${version}/tsc-dyn.so"; url = "https://github.com/emacs-tree-sitter/elisp-tree-sitter/releases/download/${version}/tsc-dyn.so";
sha256 = "sha256-TrwyQZEfARHfafT4IhxR+p7vpjSuw9lUcgOSwCvPxe4="; sha256 = "sha256-oOq/TAooHRUo7JypCblrB/ztABowAHv2LRhFL/ZmVrg=";
}; };
version-file = writeText "DYN-VERSION" version;
in { in {
/* src = fetchFromGitHub {
owner = "emacs-tree-sitter";
repo = "elisp-tree-sitter";
rev = version;
sha256 = "sha256-dGWg4dj+85kxytvm+nNEJUN9UXdr9L6pSRz5OqDMFAM=";
};*/
postInstall = '' postInstall = ''
cp ${tsc-dyn} $out/share/emacs/site-lisp/elpa/tsc-${oa.version}/tsc-dyn.so cp ${tsc-dyn} $out/share/emacs/site-lisp/elpa/tsc-${oa.version}/tsc-dyn.so
cp ${version-file} $out/share/emacs/site-lisp/elpa/tsc-${oa.version}/DYN-VERSION echo -n ${version} > $out/share/emacs/site-lisp/elpa/tsc-${oa.version}/DYN-VERSION
''; '';
}); });
tree-sitter-langs = epkgs.melpaPackages.tree-sitter-langs.overrideAttrs (oa: tree-sitter-langs = epkgs.melpaPackages.tree-sitter-langs.overrideAttrs (oa:
let let
tree-sitter-grammars = super.stdenv.mkDerivation rec { tree-sitter-grammars = super.stdenv.mkDerivation rec {
name = "tree-sitter-grammars"; name = "tree-sitter-grammars";
version = "0.10.4"; version = "0.10.7";
src = fetchzip { src = fetchzip {
url = "https://github.com/emacs-tree-sitter/tree-sitter-langs/releases/download/${version}/tree-sitter-grammars-linux-${version}.tar.gz"; url = "https://github.com/emacs-tree-sitter/tree-sitter-langs/releases/download/${version}/tree-sitter-grammars-linux-${version}.tar.gz";
sha256 = "sha256-Z+JtuGLTCVhCJBR60cbcDgWtdKcoYGWoeI5u9GcfvUQ="; sha256 = "sha256-pdSMyTUUAj4JsRLbJMUMbQSOaSEYlsaqVdmaXtXtSJw=";
stripRoot = false; stripRoot = false;
}; };
installPhase = '' installPhase = ''
install -d $out/langs/bin install -d $out/langs/bin
install -m444 * $out/langs/bin install -m444 * $out/langs/bin
echo -n $version > $out/langs/bin/BUNDLE-VERSION '';
postInstall = ''
echo -n "${version}" > $out/langs/bin/BUNDLE-VERSION
''; '';
}; };
in { in {
@@ -51,13 +49,8 @@
substituteInPlace ./tree-sitter-langs-build.el \ substituteInPlace ./tree-sitter-langs-build.el \
--replace "tree-sitter-langs-grammar-dir tree-sitter-langs--dir" "tree-sitter-langs-grammar-dir \"${tree-sitter-grammars}/langs\"" --replace "tree-sitter-langs-grammar-dir tree-sitter-langs--dir" "tree-sitter-langs-grammar-dir \"${tree-sitter-grammars}/langs\""
''; '';
# postInstall = oa.postInstall or "" + ''
# mkdir $out/share/emacs/site-lisp/elpa/tree-sitter-langs-${oa.version}/bin
# cp ${binaries}/* $out/share/emacs/site-lisp/elpa/tree-sitter-langs-${oa.version}/bin/
# '';
}); });
gruvbox-theme = epkgs.melpaPackages.gruvbox-theme.overrideAttrs(_: { patches = [ ./gruvbox-el.patch ]; } ); gruvbox-theme = epkgs.melpaPackages.gruvbox-theme.overrideAttrs(_: { patches = [ ./gruvbox-el.patch ]; } );
}; };
}) };};
];
} }

44
modules/emacs/init.el
View File

@@ -19,20 +19,19 @@ c-blue-2 "#83a598"
c-magenta-2 "#d3869b" c-magenta-2 "#d3869b"
c-cyan-2 "#8ec07c" c-cyan-2 "#8ec07c"
c-white-2 "#ebdbb2") c-white-2 "#ebdbb2")
;(setq vc-handled-backends nil) ; vc is slow as fuck with git
;;settings ;;settings
(setq display-line-numbers-type 'relative) (setq display-line-numbers-type 'relative)
(setq inhibit-startup-screen t) (setq inhibit-startup-screen t)
(set-face-attribute 'default nil :font "Monoid" :height 120) (set-face-attribute 'default nil :font "Monoid" :height 120)
(global-hl-line-mode 1) (global-hl-line-mode 1)
(scroll-bar-mode 0) (scroll-bar-mode 0) (tool-bar-mode 0)
(tool-bar-mode 0)
(menu-bar-mode 0) (menu-bar-mode 0)
(fringe-mode 0) (fringe-mode 0)
(global-display-line-numbers-mode 1) (global-display-line-numbers-mode 1)
(setq initial-major-mode 'emacs-lisp-mode) (setq initial-major-mode 'emacs-lisp-mode)
(setq frame-resize-pixelwise t) (setq frame-resize-pixelwise t)
(setq auto-window-vscroll nil)
(setq scroll-step 1)
;;add packages and shit ;;add packages and shit
(require 'package) (require 'package)
@@ -56,9 +55,13 @@ c-white-2 "#ebdbb2")
:config :config
(elcord-mode 1)) (elcord-mode 1))
(use-package undo-tree
:config
(global-undo-tree-mode 1))
(use-package evil (use-package evil
:config :config
(setq evil-undo-system 'undo-redo) (evil-set-undo-system 'undo-tree)
(evil-mode 1)) (evil-mode 1))
(use-package evil-colemak-basics (use-package evil-colemak-basics
@@ -82,7 +85,8 @@ c-white-2 "#ebdbb2")
(define-key evil-treemacs-state-map (kbd "M-E") #'treemacs-previous-line-other-window) (define-key evil-treemacs-state-map (kbd "M-E") #'treemacs-previous-line-other-window)
(define-key evil-treemacs-state-map (kbd "M") #'treemacs-collapse-parent-node) (define-key evil-treemacs-state-map (kbd "M") #'treemacs-collapse-parent-node)
(evil-define-key 'treemacs treemacs-mode-map (kbd "m") #'treemacs-COLLAPSE-action) (evil-define-key 'treemacs treemacs-mode-map (kbd "m") #'treemacs-COLLAPSE-action)
(evil-define-key 'treemacs treemacs-mode-map (kbd "i") #'treemacs-RET-action)) (evil-define-key 'treemacs treemacs-mode-map (kbd "i") #'treemacs-RET-action)
)
(use-package lsp-mode (use-package lsp-mode
:config :config
@@ -121,12 +125,22 @@ c-white-2 "#ebdbb2")
(use-package magit) (use-package magit)
(use-package nix-mode
:mode "\\.nix\\'")
(defface bufname (defface bufname
`((t :foreground ,c-fg `((t :foreground ,c-fg
:background ,c-bg :background ,c-bg
:weight bold :weight bold
)) ))
"Custom faces for buffer name" "Custom face for buffer name"
:group 'mode-line-faces )
(defface majmode
`((t :foreground ,c-fg
:background ,c-bg
))
"Custom face for major mode"
:group 'mode-line-faces ) :group 'mode-line-faces )
(defface gitmode (defface gitmode
@@ -134,13 +148,23 @@ c-white-2 "#ebdbb2")
:background ,c-red-2 :background ,c-red-2
:weight bold :weight bold
)) ))
"Custom face for git branch" "Custom face for VC"
:group 'mode-line-faces ) :group 'mode-line-faces )
(defface infomode
`((t :foreground ,c-bg
:background ,c-green
:weight bold
))
"For showing line and column number"
:group 'mode-line-faces )
(setq-default mode-line-format (setq-default mode-line-format
'((:propertize " %b " face bufname) '((:propertize " %b " face bufname)
(vc-mode (:propertize ("" vc-mode " " ) face gitmode)))) (vc-mode (:propertize ("" vc-mode " " ) face gitmode))
(:propertize (" " mode-name " ") face majmode)
(:propertize ("[[ %l | %c || %p . %+%@ ]]") face infomode)
("%-")))
(setq exclude-ln '(term-mode-hook eshell-mode-hook shell-mode-hook)) (setq exclude-ln '(term-mode-hook eshell-mode-hook shell-mode-hook))
(while exclude-ln (while exclude-ln

7
modules/nvidia-offload.nix
View File

@@ -16,10 +16,12 @@ in
opengl = { opengl = {
driSupport32Bit = true; driSupport32Bit = true;
#package = pkgs.mesa_drivers; #package = pkgs.mesa_drivers;
extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
enable = true; enable = true;
}; };
nvidia = { nvidia = {
prime = { prime = {
# sync.enable = true;
offload = { enable = true; }; offload = { enable = true; };
intelBusId = "PCI:0:2:0"; intelBusId = "PCI:0:2:0";
nvidiaBusId = "PCI:1:0:0"; nvidiaBusId = "PCI:1:0:0";
@@ -31,5 +33,8 @@ in
}; };
}; };
}; };
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver = {
videoDrivers = [ "nvidia" ];
dpi = 96;
};
} }

10
modules/nvim/default.nix
View File

@@ -3,9 +3,10 @@
{ {
programs.neovim = { programs.neovim = {
enable = true; enable = true;
package = pkgs.neovim-unwrapped.overrideAttrs (_:{ package = pkgs.neovim-nightly;
nativeBuildInputs = with pkgs.unstable; [ unzip cmake pkgconfig gettext tree-sitter ]; # package = pkgs.neovim-nightly.overrideAttrs (_:{
}); # nativeBuildInputs = with pkgs; [ unzip cmake pkgconfig gettext tree-sitter ];
# });
defaultEditor = true; defaultEditor = true;
configure = { configure = {
customRC = '' customRC = ''
@@ -19,7 +20,6 @@
auto-pairs auto-pairs
vim-floaterm vim-floaterm
vim-closetag vim-closetag
vim-floaterm
nerdcommenter nerdcommenter
nvim-compe nvim-compe
nvim-lspconfig nvim-lspconfig
@@ -29,7 +29,7 @@
nvim-tree-lua nvim-tree-lua
vim-vsnip vim-vsnip
nvim-treesitter nvim-treesitter
vim-nix vim-latex-live-preview
(gruvbox.overrideAttrs (oa: { patches = [ ./gruvbox.patch ]; })) (gruvbox.overrideAttrs (oa: { patches = [ ./gruvbox.patch ]; }))
]; ];
}; };

37
modules/nvim/init.lua
View File

@@ -1,5 +1,5 @@
vim.api.nvim_set_option("termguicolors", true) vim.api.nvim_set_option("termguicolors", true)
local nvim_lsp = require('lspconfig') local nvimlsp = require('lspconfig')
local comm = vim.api.nvim_command local comm = vim.api.nvim_command
local bind = vim.api.nvim_set_keymap local bind = vim.api.nvim_set_keymap
local setvar = vim.api.nvim_set_var local setvar = vim.api.nvim_set_var
@@ -11,8 +11,6 @@ end
--SETTINGS --SETTINGS
comm("syntax enable")
comm("syntax sync minlines=100")
vim.o.cmdheight = 1 vim.o.cmdheight = 1
vim.o.modifiable = true vim.o.modifiable = true
vim.o.cursorline = true vim.o.cursorline = true
@@ -25,7 +23,7 @@ vim.o.cmdheight = 1
vim.o.mouse = "a" vim.o.mouse = "a"
vim.o.splitbelow = true vim.o.splitbelow = true
vim.o.splitright = true vim.o.splitright = true
comm("set nowrap") --comm("set nowrap")
vim.o.conceallevel = 0 vim.o.conceallevel = 0
vim.o.tabstop = 2 vim.o.tabstop = 2
vim.o.shiftwidth = 2 vim.o.shiftwidth = 2
@@ -66,6 +64,7 @@ cdhbind('k', 'n')
cdhbind('f', 'e') cdhbind('f', 'e')
cdhbind('t', 'f') cdhbind('t', 'f')
cdhbind('j', 't') cdhbind('j', 't')
bind('n', "<M-s>", ":w<CR>", {noremap=true}) bind('n', "<M-s>", ":w<CR>", {noremap=true})
bind('n', "<M-n>", ":resize -2<CR>", {noremap=true, silent=true}) bind('n', "<M-n>", ":resize -2<CR>", {noremap=true, silent=true})
bind('n', "<M-e>", ":resize +2<CR>", {noremap=true, silent=true}) bind('n', "<M-e>", ":resize +2<CR>", {noremap=true, silent=true})
@@ -90,9 +89,9 @@ function _G.CompileRun()
['java'] = 'java ' .. file, ['java'] = 'java ' .. file,
['lisp'] = 'clisp ' .. file, ['lisp'] = 'clisp ' .. file,
['python'] = 'python3 ' .. file, ['python'] = 'python3 ' .. file,
['c'] = 'gcc ' .. file .. ' -o ' .. noext .. ' && ' .. noext .. ' && rm ' .. noext, ['c'] = 'gcc ' .. file .. ' -o ' .. noext .. ' -Wno-unused-result ' .. ' && ' .. noext .. ' && rm ' .. noext,
['rust'] = 'rustc ' .. file .. ' -o ' .. noext .. ' && ' .. noext .. ' && rm ' .. noext, ['rust'] = 'rustc ' .. file .. ' -o ' .. noext .. ' && ' .. noext .. ' && rm ' .. noext,
['cpp'] = 'g++ -std=c++17 ' .. file .. ' -o ' .. noext .. ' && ' .. noext .. ' && rm ' .. noext, ['cpp'] = 'g++ -std=c++17 ' .. file .. ' -o ' .. noext .. ' -Wno-unused-result ' .. ' && ' .. noext .. ' && rm ' .. noext,
['haskell'] = 'ghc -dynamic ' .. file .. ' && ' .. noext .. ' && rm ' .. noext .. ' ' .. noext .. '.o ' .. noext .. '.hi', ['haskell'] = 'ghc -dynamic ' .. file .. ' && ' .. noext .. ' && rm ' .. noext .. ' ' .. noext .. '.o ' .. noext .. '.hi',
['sh'] = 'sh ' .. file, ['sh'] = 'sh ' .. file,
['javascript']= 'node ' .. file, ['javascript']= 'node ' .. file,
@@ -126,14 +125,15 @@ bind('n', "<F6>", ":call v:lua.Repl()<CR>", {silent=true})
--nvim-tree.lua --nvim-tree.lua
vim.g.nvim_tree_auto_close = 1
vim.g.nvim_tree_auto_ignore_ft = { "startify" } vim.g.nvim_tree_auto_ignore_ft = { "startify" }
vim.g.nvim_tree_follow = 1
vim.g.nvim_tree_git_hl = 1 vim.g.nvim_tree_git_hl = 1
vim.g.nvim_tree_highlight_opened_files = 1 vim.g.nvim_tree_highlight_opened_files = 1
vim.g.nvim_tree_width_allow_resize = 1 vim.g.nvim_tree_width_allow_resize = 1
vim.g.nvim_tree_lsp_diagnostics = 1 require'nvim-tree'.setup {
vim.g.nvim_tree_lsp_diagnostics = 1 nvim_tree_auto_close = 1,
nvim_tree_follow = 1,
nvim_tree_lsp_diagnostics = 1
}
vim.g.nvim_tree_window_picker_exclude = { vim.g.nvim_tree_window_picker_exclude = {
['buftype'] = { 'terminal' } ['buftype'] = { 'terminal' }
} }
@@ -187,7 +187,7 @@ vim.g.presence_main_image = "file"
--treesitter-nvim --treesitter-nvim
require'nvim-treesitter.configs'.setup { require'nvim-treesitter.configs'.setup {
ensure_installed = "all", ensure_install = "all",
highlight = { highlight = {
enable = true, enable = true,
additional_vim_regex_highlighting = true, additional_vim_regex_highlighting = true,
@@ -197,7 +197,11 @@ require'nvim-treesitter.configs'.setup {
} }
} }
--misc --vim-latex-live-preview
vim.g.livepreview_previewer = "zathura"
require'colorizer'.setup() require'colorizer'.setup()
--lsp and compe stuff i got from various places --lsp and compe stuff i got from various places
@@ -235,6 +239,7 @@ require'compe'.setup {
spell = true; spell = true;
treesitter = true; treesitter = true;
nvim_lua = true; nvim_lua = true;
vsnip = true;
}; };
} }
@@ -250,6 +255,7 @@ local check_back_space = function()
end end
end end
vim.g.vsnip_snippet_dir = "/home/natto/.vsnip"
-- Use (s-)tab to: -- Use (s-)tab to:
--- move to prev/next item in completion menuone --- move to prev/next item in completion menuone
--- jump to prev/next snippet's placeholder --- jump to prev/next snippet's placeholder
@@ -335,7 +341,7 @@ local statusline = {
} }
vim.o.statusline = table.concat(statusline) vim.o.statusline = table.concat(statusline)
local servers = { "ccls", "rust_analyzer", "tsserver", "hls", "pylsp" } local servers = { "ccls", "rust_analyzer", "tsserver", "hls", "pylsp", "texlab", "rnix" }
local capabilities = vim.lsp.protocol.make_client_capabilities() local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true capabilities.textDocument.completion.completionItem.snippetSupport = true
capabilities.textDocument.completion.completionItem.resolveSupport = { capabilities.textDocument.completion.completionItem.resolveSupport = {
@@ -347,5 +353,8 @@ capabilities.textDocument.completion.completionItem.resolveSupport = {
} }
for _, lsp in ipairs(servers) do for _, lsp in ipairs(servers) do
nvim_lsp[lsp].setup { capabilities = capabilities, on_attach = on_attach } nvimlsp[lsp].setup { capabilities = capabilities, on_attach = on_attach }
end end
vim.g.tex_flavor = "latex"
comm("set syntax=on")

19
modules/pipewire.nix
View File

@@ -1,16 +1,26 @@
{lib, config, pkgs, ... }: {lib, config, pkgs, ... }:
{ {
services.pipewire = { services = {
pipewire = {
enable = true; enable = true;
alsa = { alsa = {
enable = true; enable = true;
support32Bit = true; support32Bit = true;
}; };
pulse = { pulse.enable = true;
enable = true; #jack.enable = true;
};
config.pipewire = { config.pipewire = {
context.objects = [
{
factory = "spa-node-factory";
args = {
factory.name = "support.node.driver";
node.name = "Dummy-Driver";
priority.driver = 8000;
};
}
];
context.modules = [ context.modules = [
{ {
name = "libpipewire-module-rtkit"; name = "libpipewire-module-rtkit";
@@ -64,6 +74,7 @@
}; };
}; };
}; };
};
sound.enable = true; sound.enable = true;
# hardware = { # hardware = {
# pulseaudio.enable = true; # pulseaudio.enable = true;

5
modules/xorg.nix
View File

@@ -7,13 +7,15 @@
# ''; # '';
#in #in
{ {
console.useXkbConfig = true;
services = { services = {
xserver = { xserver = {
enable = true; enable = true;
libinput= { libinput= {
enable = true; enable = true;
mouse = { mouse = {
accelSpeed = null; accelSpeed = "0";
# accelProfile = "flat";
}; };
touchpad = { touchpad = {
middleEmulation = false; middleEmulation = false;
@@ -26,6 +28,7 @@
startx = { startx = {
enable = true; enable = true;
}; };
# lightdm.enable = true;
# sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY"; # sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY";
}; };
extraLayouts = { extraLayouts = {

11
overlays/customscripts/src/osusens Normal file
View File

@@ -0,0 +1,11 @@
#!/usr/bin/env bash
if [ $# != 2 ]; then
echo "Two args required"
exit 1
fi
if [ $1 == "on" ]; then
xinput --set-prop $2 'libinput Accel Profile Enabled' 0, 1
else
xinput --set-prop $2 'libinput Accel Profile Enabled' 1, 0
fi

9
overlays/overridesandshit.nix
View File

@@ -24,12 +24,6 @@ final: prev: {
patches = [./patches/st.patch]; patches = [./patches/st.patch];
}); });
kbd = prev.kbd.overrideAttrs (oldAttrs: rec{
buildInputs = oldAttrs.buildInputs ++ [ prev.gzip ];
colemak-dh = prev.writeText "colemak-dh.map" (builtins.readFile ./colemak-dh.map);
postInstall = "${oldAttrs.postInstall}\n cp ${colemak-dh} $out/share/keymaps/i386/colemak/colemak-dh.map\n gzip $out/share/keymaps/i386/colemak/colemak-dh.map";
});
ncmpcpp = prev.ncmpcpp.override { ncmpcpp = prev.ncmpcpp.override {
visualizerSupport = true; visualizerSupport = true;
clockSupport = true; clockSupport = true;
@@ -44,9 +38,6 @@ final: prev: {
fetchSubmodules = true; fetchSubmodules = true;
}; };
}); });
discord = prev.discord.overrideAttrs (_ : {
src = builtins.fetchTarball { url = "https://discord.com/api/download/stable?platform=linux&format=tar.gz"; sha256="1ahj4bhdfd58jcqh54qcgafljqxl1747fqqwxhknqlasa83li75n";};
});
proxychains = prev.proxychains.overrideAttrs (_ : { proxychains = prev.proxychains.overrideAttrs (_ : {
postInstall = ":"; postInstall = ":";