From 826360ccf207a5c467e179515024bafee059b30f Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Tue, 29 Jun 2021 21:59:19 -0400 Subject: [PATCH] .. --- features/desktopish/default.nix | 4 +- .../taffybar/taffybar-srid/default.nix | 37 ++++++++----------- .../taffybar-srid/dep/taffybar/default.nix | 2 - .../taffybar-srid/dep/taffybar/github.json | 7 ---- .../taffybar-srid/dep/taffybar/thunk.nix | 9 ----- features/desktopish/touchpad-trackpoint.nix | 5 ++- flake.lock | 8 ++-- flake.nix | 2 +- home.nix | 3 ++ hosts/p71.nix | 2 - hosts/x1c7.nix | 31 ++-------------- 11 files changed, 34 insertions(+), 76 deletions(-) delete mode 100644 features/desktopish/taffybar/taffybar-srid/dep/taffybar/default.nix delete mode 100644 features/desktopish/taffybar/taffybar-srid/dep/taffybar/github.json delete mode 100644 features/desktopish/taffybar/taffybar-srid/dep/taffybar/thunk.nix diff --git a/features/desktopish/default.nix b/features/desktopish/default.nix index 783dce2..96f96d2 100644 --- a/features/desktopish/default.nix +++ b/features/desktopish/default.nix @@ -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 ]; } diff --git a/features/desktopish/taffybar/taffybar-srid/default.nix b/features/desktopish/taffybar/taffybar-srid/default.nix index 0a26f86..d86340f 100644 --- a/features/desktopish/taffybar/taffybar-srid/default.nix +++ b/features/desktopish/taffybar/taffybar-srid/default.nix @@ -1,24 +1,19 @@ # Since the xmonad config will be built by nixos-rebuild, we use the # nix-channel's nixpkgs. -{ pkgs ? import {} }: -let +{ pkgs ? import { } }: +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; { }; +} diff --git a/features/desktopish/taffybar/taffybar-srid/dep/taffybar/default.nix b/features/desktopish/taffybar/taffybar-srid/dep/taffybar/default.nix deleted file mode 100644 index 2b4d4ab..0000000 --- a/features/desktopish/taffybar/taffybar-srid/dep/taffybar/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/features/desktopish/taffybar/taffybar-srid/dep/taffybar/github.json b/features/desktopish/taffybar/taffybar-srid/dep/taffybar/github.json deleted file mode 100644 index f53d1d4..0000000 --- a/features/desktopish/taffybar/taffybar-srid/dep/taffybar/github.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "owner": "taffybar", - "repo": "taffybar", - "private": false, - "rev": "4d3227e9cd8308c1e43846496a8a7ab417ef8e5b", - "sha256": "1x6f3scjglaj9my0lgkrz8hbr25sv1xs6ssdkydq8w6lqqm15ydb" -} diff --git a/features/desktopish/taffybar/taffybar-srid/dep/taffybar/thunk.nix b/features/desktopish/taffybar/taffybar-srid/dep/taffybar/thunk.nix deleted file mode 100644 index bbf2dc1..0000000 --- a/features/desktopish/taffybar/taffybar-srid/dep/taffybar/thunk.nix +++ /dev/null @@ -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 {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; - json = builtins.fromJSON (builtins.readFile ./github.json); -in fetch json \ No newline at end of file diff --git a/features/desktopish/touchpad-trackpoint.nix b/features/desktopish/touchpad-trackpoint.nix index 0c0936c..98924fb 100644 --- a/features/desktopish/touchpad-trackpoint.nix +++ b/features/desktopish/touchpad-trackpoint.nix @@ -15,7 +15,8 @@ hardware.trackpoint = { enable = true; - sensitivity = 160; - speed = 150; + sensitivity = 240; + speed = 250; + device = "TPPS/2 Elan TrackPoint"; # Check with `xinput` }; } diff --git a/flake.lock b/flake.lock index a021c48..85709b6 100644 --- a/flake.lock +++ b/flake.lock @@ -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" } }, diff --git a/flake.nix b/flake.nix index 27d3f00..2d8f24d 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; diff --git a/home.nix b/home.nix index 56fe13c..b2377ab 100644 --- a/home.nix +++ b/home.nix @@ -27,6 +27,9 @@ rec { tealdeer zellij dust + ripgrep + htop + fzf # ^ easy to forget these; write SRS? ]; diff --git a/hosts/p71.nix b/hosts/p71.nix index 160a2a0..a9b2f65 100644 --- a/hosts/p71.nix +++ b/hosts/p71.nix @@ -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 diff --git a/hosts/x1c7.nix b/hosts/x1c7.nix index d4e0361..1eb00d4 100644 --- a/hosts/x1c7.nix +++ b/hosts/x1c7.nix @@ -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