dotfiles/nixos-config
1
0
Fork 0
mirror of https://github.com/srid/nixos-config.git synced 2026-01-28 20:17:12 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

..

Browse source
This commit is contained in:
Sridhar Ratnakumar 2021-06-29 21:59:19 -04:00
parent 9b65c94d22
commit 826360ccf2
11 changed files with 34 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/desktopish/default.nix
View file

@ -13,10 +13,12 @@
# WMish things
./xmonad
#./sway.nix
# ./taffybar # Disabled, because it rarely works
./taffybar # Disabled, because it rarely works
];
environment.systemPackages = with pkgs; [
acpi
mpv
pulsemixer
];
}

37
features/desktopish/taffybar/taffybar-srid/default.nix
View file

@ -1,24 +1,19 @@
# Since the xmonad config will be built by nixos-rebuild, we use the
# nix-channel's nixpkgs.
{ pkgs ? import <nixpkgs> {} }:
let
{ pkgs ? import <nixpkgs> { } }:
let
inherit (import ./dep/gitignoresrc { inherit (pkgs) lib; }) gitignoreSource;
in
pkgs.haskellPackages.developPackage {
name = "taffybar-srid";
root = gitignoreSource ./.;
modifier = drv:
pkgs.haskell.lib.addBuildTools drv (with pkgs.haskellPackages;
[ cabal-install
cabal-fmt
ghcid
haskell-language-server
]);
overrides = self: super: with pkgs.haskell.lib; {
taffybar = dontCheck (
self.callCabal2nix "taffybar"
(import ./dep/taffybar/thunk.nix)
{ inherit (pkgs) gtk3; }
);
};
}
in
pkgs.haskellPackages.developPackage {
name = "taffybar-srid";
root = gitignoreSource ./.;
modifier = drv:
pkgs.haskell.lib.addBuildTools drv (with pkgs.haskellPackages;
[
cabal-install
cabal-fmt
ghcid
haskell-language-server
]);
overrides = self: super: with pkgs.haskell.lib; { };
}

2
features/desktopish/taffybar/taffybar-srid/dep/taffybar/default.nix
View file

@ -1,2 +0,0 @@
# DO NOT HAND-EDIT THIS FILE
import (import ./thunk.nix)

7
features/desktopish/taffybar/taffybar-srid/dep/taffybar/github.json
View file

@ -1,7 +0,0 @@
{
"owner": "taffybar",
"repo": "taffybar",
"private": false,
"rev": "4d3227e9cd8308c1e43846496a8a7ab417ef8e5b",
"sha256": "1x6f3scjglaj9my0lgkrz8hbr25sv1xs6ssdkydq8w6lqqm15ydb"
}

9
features/desktopish/taffybar/taffybar-srid/dep/taffybar/thunk.nix
View file

@ -1,9 +0,0 @@
# DO NOT HAND-EDIT THIS FILE
let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
if !fetchSubmodules && !private then builtins.fetchTarball {
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
} else (import <nixpkgs> {}).fetchFromGitHub {
inherit owner repo rev sha256 fetchSubmodules private;
};
json = builtins.fromJSON (builtins.readFile ./github.json);
in fetch json

5
features/desktopish/touchpad-trackpoint.nix
View file

@ -15,7 +15,8 @@
hardware.trackpoint = {
enable = true;
sensitivity = 160;
speed = 150;
sensitivity = 240;
speed = 250;
device = "TPPS/2 Elan TrackPoint"; # Check with `xinput`
};
}

8
flake.lock generated
View file

@ -612,17 +612,17 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1624626397,
"narHash": "sha256-+h0ulo5//RqStx6g6MDqD9MzgmBfeZ1VYxwEaSmw/Zs=",
"lastModified": 1624922035,
"narHash": "sha256-OiIxJQuMRkICxaUwY3xMBbrPPu20de/n7tVYnWzLvS4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e1f8852faac7638e88d5e8a5b9ee2a7568685e3f",
"rev": "3a8d7958a610cd3fec3a6f424480f91a1b259185",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e1f8852faac7638e88d5e8a5b9ee2a7568685e3f",
"rev": "3a8d7958a610cd3fec3a6f424480f91a1b259185",
"type": "github"
}
},

2
flake.nix
View file

@ -6,7 +6,7 @@
# https://status.nixos.org/
#
# This ensures that we always use the official nix cache.
nixpkgs.url = "github:nixos/nixpkgs/e1f8852faac7638e88d5e8a5b9ee2a7568685e3f";
nixpkgs.url = "github:nixos/nixpkgs/3a8d7958a610cd3fec3a6f424480f91a1b259185";
nixos-hardware.url = github:NixOS/nixos-hardware/master;
home-manager.url = "github:nix-community/home-manager";

3
home.nix
View file

@ -27,6 +27,9 @@ rec {
tealdeer
zellij
dust
ripgrep
htop
fzf
# ^ easy to forget these; write SRS?
];

2
hosts/p71.nix
View file

@ -87,8 +87,6 @@
aria2
brave
fzf
# gnome3.gnome-tweaks
# google-chrome
htop
mpv
nodejs-14_x # Need this for https://nixos.wiki/wiki/Vscode

31
hosts/x1c7.nix
View file

@ -29,9 +29,6 @@
support32Bit = true;
};
# FIXME: https://github.com/NixOS/nixpkgs/pull/97972#issuecomment-834774554
services.tlp.enable = false;
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@ -39,7 +36,7 @@
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
# boot.kernelPackages = pkgs.linuxPackages_latest;
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.supportedFilesystems = [ "ntfs" ];
nixpkgs.config.allowUnfree = true;
@ -53,7 +50,6 @@
networking.hostName = "x1c7";
networking.networkmanager.enable = true;
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
# Per-interface useDHCP will be mandatory in the future, so this generated config
# replicates the default behaviour.
@ -63,43 +59,24 @@
programs.mosh.enable = true;
# FIXME: https://github.com/NixOS/nixpkgs/pull/97972#issuecomment-834774554
# services.tlp.enable = false;
services.xserver.enable = true;
services.openssh.enable = true;
users.users.srid = {
isNormalUser = true;
extraGroups = [ "wheel" "networkmanager" "audio" ]; # Enable ‘sudo’ for the user.
};
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
pulsemixer
brave
fzf
gnome3.gnome-tweaks
gnome3.gnome-sound-recorder
google-chrome
htop
ripgrep
signal-desktop
vscode
mpv
alacritty
youtube-dl
obsidian
inkscape
];
services = {
openssh.enable = true;
};
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave