From 9b02d39b609a85d02fed7687927ea619f6d094e8 Mon Sep 17 00:00:00 2001 From: Matei Adriel Date: Fri, 3 Jul 2020 18:24:18 +0300 Subject: [PATCH] feat: added racket and probably did a bunch of other stuff --- .vscode/settings.json | 1 + modules/applications/misc.nix | 8 ++++++- modules/applications/shells/common.nix | 4 ++-- modules/applications/xmonad/xmonad.hs | 29 ++++++++++++++++--------- modules/dev/default.nix | 1 + modules/dev/racket.nix | 3 +++ nix/sources.json | 30 +++++++++++++------------- 7 files changed, 48 insertions(+), 28 deletions(-) create mode 100644 modules/dev/racket.nix diff --git a/.vscode/settings.json b/.vscode/settings.json index 536a365..9a47eb6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,6 +10,7 @@ "ksplashqml", "ksplashsimple", "ksplashx", + "milkytracker", "mklicense", "pnpm", "rofi", diff --git a/modules/applications/misc.nix b/modules/applications/misc.nix index e1ee5b8..7ca11d9 100644 --- a/modules/applications/misc.nix +++ b/modules/applications/misc.nix @@ -11,14 +11,20 @@ neofetch # display system information xclip # copy paste stuff feh # image viewer + speedtest-cli # test the internet speed and stuff # editors vscodium + vim + neovim + emacs + # vscode # chat apps discord slack - zoom-us # for online classes / church and stuff + tdesktop # telegram for the desktop + zoom-us # browsers google-chrome diff --git a/modules/applications/shells/common.nix b/modules/applications/shells/common.nix index ac77309..fa418e5 100644 --- a/modules/applications/shells/common.nix +++ b/modules/applications/shells/common.nix @@ -1,4 +1,4 @@ { - shellInit = - "neofetch --package_managers on --cpu_brand on --cpu_cores on --memory_percent on --memory_display infobar --os_arch on"; + shellInit = ""; + # "neofetch --package_managers on --cpu_brand on --cpu_cores on --memory_percent on --memory_display infobar --os_arch on"; } diff --git a/modules/applications/xmonad/xmonad.hs b/modules/applications/xmonad/xmonad.hs index d57cc99..e5d255c 100644 --- a/modules/applications/xmonad/xmonad.hs +++ b/modules/applications/xmonad/xmonad.hs @@ -12,14 +12,14 @@ import XMonad.Layout.ThreeColumns main = xmonad - $ docks - $ kdeConfig - { modMask = mod4Mask - , layoutHook = myLayoutHook - , manageHook = manageDocks <+> myManagerHook <+> manageHook kdeConfig - , terminal = myTerminal - } - `additionalKeys` keymap + $ docks + $ kdeConfig + { modMask = mod4Mask + , layoutHook = myLayoutHook + , manageHook = manageDocks <+> myManagerHook <+> manageHook kdeConfig + , terminal = myTerminal + } + `additionalKeysP` keymap where kdeFloats = [ "yakuake" @@ -39,8 +39,17 @@ main = myManagerHook = composeAll [ className =? name --> doFloat | name <- kdeFloats ] - myTerminal = "alacritty" - keymap = [((mod4Mask, xK_p), spawn "rofi -show run")] + myTerminal = "alacritty" + myBrowser = "google-chrome-stable" + + -- TODO: find a way to bind all the program-opening-keybindings to a single sub-map + keymap = + [ ("M-p", spawn "rofi -show run") + , ("M-g", spawn myBrowser) + , ("M-d", spawn "Discord") + , ("M-s", spawn "slack") + , ("M-r", spawn "ksysgurad") + ] uniformBorder = join $ join $ join Border border = uniformBorder 4 diff --git a/modules/dev/default.nix b/modules/dev/default.nix index 0d107d5..74c0b8d 100644 --- a/modules/dev/default.nix +++ b/modules/dev/default.nix @@ -6,6 +6,7 @@ ./javascript.nix ./fsharp.nix ./rust.nix + ./racket.nix ./haskell ]; } diff --git a/modules/dev/racket.nix b/modules/dev/racket.nix new file mode 100644 index 0000000..e39ff72 --- /dev/null +++ b/modules/dev/racket.nix @@ -0,0 +1,3 @@ +{ pkgs, ... }: { + home-manager.users.adrielus.home.packages = with pkgs; [ racket ]; +} diff --git a/nix/sources.json b/nix/sources.json index 13ca337..7f2a32d 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "nix-community", "repo": "NUR", - "rev": "597f78e4acb3bfe8215fd55e97e8d5d1ca8b1565", - "sha256": "1npim78p8hg59bci4vl1zg4h7pdxga6l91mr5syp2b1r3k62abyp", + "rev": "2df6e8d67087dceb3f0d98a4bafa73f492d91210", + "sha256": "1gk0jsj0ji3bq8wppq1c3bf31blkbila7pwmdvmbk3whgzgbdhk2", "type": "tarball", - "url": "https://github.com/nix-community/NUR/archive/597f78e4acb3bfe8215fd55e97e8d5d1ca8b1565.tar.gz", + "url": "https://github.com/nix-community/NUR/archive/2df6e8d67087dceb3f0d98a4bafa73f492d91210.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "agnoster": { @@ -53,10 +53,10 @@ "homepage": "", "owner": "justinwoo", "repo": "easy-purescript-nix", - "rev": "0ba91d9aa9f7421f6bfe4895677159a8a999bf20", - "sha256": "1baq7mmd3vjas87f0gzlq83n2l1h3dlqajjqr7fgaazpa9xgzs7q", + "rev": "47507b27e15a9c3b929111cf43d2e9c0e4b97f4c", + "sha256": "0gnwymgm4i5y9vknpcsr99pwy76w14nclqxb6xmmzlw2s8fx85hm", "type": "tarball", - "url": "https://github.com/justinwoo/easy-purescript-nix/archive/0ba91d9aa9f7421f6bfe4895677159a8a999bf20.tar.gz", + "url": "https://github.com/justinwoo/easy-purescript-nix/archive/47507b27e15a9c3b929111cf43d2e9c0e4b97f4c.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "home-manager": { @@ -65,10 +65,10 @@ "homepage": "https://rycee.gitlab.io/home-manager/", "owner": "rycee", "repo": "home-manager", - "rev": "96fcf3b017d813fac300ecb821b6db6b7b5d0c40", - "sha256": "0m7b8cazlcci3bi1j99cpgq10qp6mjml6v11jlfabh05kpyswqkk", + "rev": "d8fdbbdf03617de1015d1c10fe3bd6ecc5cdce77", + "sha256": "107cbxpmbkvbi9qfqfjp9af7p6xkfs6sz5flbjg7prqp2q5q6c8h", "type": "tarball", - "url": "https://github.com/rycee/home-manager/archive/96fcf3b017d813fac300ecb821b6db6b7b5d0c40.tar.gz", + "url": "https://github.com/rycee/home-manager/archive/d8fdbbdf03617de1015d1c10fe3bd6ecc5cdce77.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "niv": { @@ -89,10 +89,10 @@ "homepage": "https://github.com/NixOS/nixpkgs", "owner": "NixOS", "repo": "nixpkgs-channels", - "rev": "05a32d8e771dc39438835ba0e3141d68ad4e3068", - "sha256": "0w8824m4f15km3mngji35qjs9sgfvfpl57b0dq6hch5gmhlal679", + "rev": "f8248ab6d9e69ea9c07950d73d48807ec595e923", + "sha256": "009i9j6mbq6i481088jllblgdnci105b2q4mscprdawg3knlyahk", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs-channels/archive/05a32d8e771dc39438835ba0e3141d68ad4e3068.tar.gz", + "url": "https://github.com/NixOS/nixpkgs-channels/archive/f8248ab6d9e69ea9c07950d73d48807ec595e923.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-unstable": { @@ -101,10 +101,10 @@ "homepage": "https://github.com/NixOS/nixpkgs", "owner": "nixos", "repo": "nixpkgs-channels", - "rev": "467ce5a9f45aaf96110b41eb863a56866e1c2c3c", - "sha256": "0qz7wgi61pdb335n18xm8rfwddckwv0vg8n7fii5abrrx47vnqcj", + "rev": "22a81aa5fc15b2d41b12f7160a71cd4a9f3c3fa1", + "sha256": "14gx5fsqibdn2cxp7gymfrz2vcnwiwwjnxqlnysczz8dqihnrpa7", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs-channels/archive/467ce5a9f45aaf96110b41eb863a56866e1c2c3c.tar.gz", + "url": "https://github.com/nixos/nixpkgs-channels/archive/22a81aa5fc15b2d41b12f7160a71cd4a9f3c3fa1.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "snack": {