From 2aa388c2d41df5960e80ec837b4eb41091d715fb Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sat, 6 Apr 2024 12:10:20 -0600 Subject: [PATCH] checkpoint --- flake.lock | 34 ++++---------- flake.nix | 4 +- home/allowUnfreeWhitelist.nix | 1 - home/apps/messaging.nix | 1 - home/apps/multimedia.nix | 1 + home/cli.nix | 56 ++++++++++++++++++++++- home/gui/default.nix | 1 + home/shenvs/altera.nix | 83 ----------------------------------- home/shenvs/c.nix | 12 ++--- home/shenvs/octave.nix | 18 -------- home/shenvs/python.nix | 5 --- home/shenvs/tex.nix | 22 ---------- 12 files changed, 74 insertions(+), 164 deletions(-) delete mode 100644 home/shenvs/altera.nix delete mode 100644 home/shenvs/octave.nix delete mode 100644 home/shenvs/tex.nix diff --git a/flake.lock b/flake.lock index 91e9f96..6ce12e8 100644 --- a/flake.lock +++ b/flake.lock @@ -34,20 +34,19 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1679067101, - "narHash": "sha256-tMI1inGT9u4KWQml0w30dhWqQPlth1e9K/68sfDkEQA=", + "lastModified": 1712386041, + "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "9154cd519a8942728038819682d6b3ff33f321bb", + "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.11", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -88,16 +87,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1679318992, - "narHash": "sha256-uoj5Oy6hruIHuxzfQZtcalObe5kPrX9v+ClUMFEOzmE=", + "lastModified": 1712310679, + "narHash": "sha256-XgC/a/giEeNkhme/AV1ToipoZ/IVm1MV2ntiK4Tm+pw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e2c97799da5f5cd87adfa5017fba971771e123ef", + "rev": "72da83d9515b43550436891f538ff41d68eecc7f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.11", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -142,21 +141,6 @@ "repo": "nixpkgs", "type": "github" } - }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index fa62f9d..9a1cda6 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,13 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; # actualizar esto para actualizar + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; # actualizar esto para actualizar unstable.url = "github:nixos/nixpkgs/master"; nur.url = "github:nix-community/NUR"; hm-isolation.url = "github:3442/hm-isolation"; nixGL.url = "github:guibou/nixGL"; home-manager = { - url = "github:nix-community/home-manager/release-22.11"; # actualizar esto para actualizar + url = "github:nix-community/home-manager/release-23.11"; # actualizar esto para actualizar inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/home/allowUnfreeWhitelist.nix b/home/allowUnfreeWhitelist.nix index efeb76c..3cf7571 100644 --- a/home/allowUnfreeWhitelist.nix +++ b/home/allowUnfreeWhitelist.nix @@ -11,7 +11,6 @@ with lib; "steam" "steam-original" "steam-run" - "teams" "vscode-extension-ms-vscode-cpptools" "vmware-horizon-client" "zoom" diff --git a/home/apps/messaging.nix b/home/apps/messaging.nix index b1f2178..1941ac0 100644 --- a/home/apps/messaging.nix +++ b/home/apps/messaging.nix @@ -10,7 +10,6 @@ in discord signal-desktop tdesktop - teams thunderbird zoom-us ]; diff --git a/home/apps/multimedia.nix b/home/apps/multimedia.nix index df0d3fe..d13cd6a 100644 --- a/home/apps/multimedia.nix +++ b/home/apps/multimedia.nix @@ -8,6 +8,7 @@ in config = mkIf cfg.enable { home.packages = with pkgs; [ deluge + lapce mpv obs-studio pavucontrol diff --git a/home/cli.nix b/home/cli.nix index 625fec3..67d452d 100644 --- a/home/cli.nix +++ b/home/cli.nix @@ -4,7 +4,7 @@ with lib; programs = { zsh = { enable = true; - enableSyntaxHighlighting = true; + syntaxHighlighting.enable = true; initExtra = import ./zshrc.nix pkgs; }; git = { @@ -14,6 +14,60 @@ with lib; signing.key = "E77A808BF9A955D668EEEA6473FA9C9CB5F0249B"; extraConfig.init.defaultBranch = "main"; }; + helix = { + enable = true; + settings = { + # theme = "onedark"; + editor = { + mouse = true; + line-number = "absolute"; + cursorline = true; + cursorcolumn = true; + gutters = [ "diagnostics" "spacer" "line-numbers" "diff" ]; + auto-completion = true; + auto-format = true; + auto-save = true; + bufferline = "multiple"; + rulers = [ 80 ]; + true-color = true; + lsp.display-messages = true; + auto-pairs = false; + whitespace = { + render = { + space = "all"; + nbsp = "all"; + tab = "all"; + newline = "none"; + }; + + }; + indent-guides = { + character = "╎"; + render = true; + }; + cursor-shape = { + select = "block"; + insert = "block"; + normal = "block"; + }; + statusline = { + left = [ "mode" "spinner" "version-control" "file-name" "file-modification-indicator" "total-line-numbers" ]; + }; + file-picker = { + hidden = false; + follow-symlinks = false; + deduplicate-links = false; + + }; + }; + keys.normal = { + space.space = "file_picker"; + space.w = ":w"; + space.q = ":q"; + esc = [ "collapse_selection" "keep_primary_selection" ]; + }; + }; + }; }; home.packages = with pkgs; diff --git a/home/gui/default.nix b/home/gui/default.nix index 3585b1b..c308578 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -41,6 +41,7 @@ in betterlockscreen = { enable = true; + inactiveInterval = 60; }; }; diff --git a/home/shenvs/altera.nix b/home/shenvs/altera.nix deleted file mode 100644 index d780db3..0000000 --- a/home/shenvs/altera.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib, pkgs, ... }: -with lib; { - static = false; # !!!! - namespaced = true; - - packages = with pkgs; [ - (quartus-prime-lite.override { supportedDevices = [ "Cyclone V" ]; }) - binutils - gcc - gnumake - gtkwave - verilator - ]; - - hm = { - # QGtkStyle could not resolve GTK. Make sure you have installed the proper libraries. - home.sessionVariables.LD_LIBRARY_PATH = "${pkgs.gtk2}/lib"; - - # Evita GC - xdg.configFile."quartus-inputs".text = let - inherit (pkgs) requireFile; - homepage = "https://fpgasoftware.intel.com"; - version = "20.1.1.720"; - url = "${homepage}/${versions.majorMinor version}/?edition=lite&platform=linux"; - - inputs = [ - (requireFile { - name = "QuartusLiteSetup-${version}-linux.run"; - sha256 = "0mjp1rg312dipr7q95pb4nf4b8fwvxgflnd1vafi3g9cshbb1c3k"; - inherit url; - }) - - (requireFile { - name = "ModelSimSetup-${version}-linux.run"; - sha256 = "1cqgv8x6vqga8s4v19yhmgrr886rb6p7sbx80528df5n4rpr2k4i"; - inherit url; - }) - - (requireFile { - name = "cyclonev-${version}.qdz"; - sha256 = "11baa9zpmmfkmyv33w1r57ipf490gnd3dpi2daripf38wld8lgak"; - inherit url; - }) - ]; - in concatStringsSep "\n" inputs; - - - # dice soto que ponga esto globalmente si quiero nightmode en todo - # Usar gtk en aplicaciones de jvm - home.sessionVariables._JAVA_OPTIONS = concatStringsSep " " [ - "-Dawt.useSystemAAFontSettings=on" - "-Dswing.aatext=true" - "-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel" - "-Dswing.crossplatformlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel" - ]; - - gtk = { - enable = true; - - gtk2.extraConfig = '' - gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ - gtk-menu-images=1 - gtk-button-images=1 - ''; - - font = { - package = pkgs.noto-fonts; - name = "Noto Sans Regular"; - #size = 14; <- caga layout de páginas - }; - - theme = { - package = pkgs.materia-theme; - name = "Materia-dark"; - }; - }; - - qt = { - enable = true; - platformTheme = "gtk"; - }; - }; -} diff --git a/home/shenvs/c.nix b/home/shenvs/c.nix index e426d59..02df9e8 100644 --- a/home/shenvs/c.nix +++ b/home/shenvs/c.nix @@ -5,12 +5,12 @@ packages = with pkgs; [ binutils cmake - gdb - gcc-arm-embedded + #gdb + #gcc-arm-embedded gnumake - lldb - openocd - qemu - valgrind + #lldb + #openocd + #qemu + #valgrind ]; } diff --git a/home/shenvs/octave.nix b/home/shenvs/octave.nix deleted file mode 100644 index 75d135a..0000000 --- a/home/shenvs/octave.nix +++ /dev/null @@ -1,18 +0,0 @@ -{pkgs, ...}: -{ - static = true; - - packages = with pkgs; [ - (octave.withPackages (packages: with packages; [ - symbolic - signal - ])) - (python39.withPackages (packages: with packages; [ - numpy - pipenv - scipy - sympy - matplotlib - ])) - ]; -} diff --git a/home/shenvs/python.nix b/home/shenvs/python.nix index 83a5f81..53d0325 100644 --- a/home/shenvs/python.nix +++ b/home/shenvs/python.nix @@ -5,12 +5,7 @@ packages = with pkgs; [ pipenv (python310.withPackages ( packages: with packages; [ - matplotlib - numpy - pandas requests - scipy - setuptools ])) ]; } diff --git a/home/shenvs/tex.nix b/home/shenvs/tex.nix deleted file mode 100644 index ba89df8..0000000 --- a/home/shenvs/tex.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ pkgs, ... }: -{ - static = true; - - packages = with pkgs; [ - biber - (texlive.combine { - inherit (texlive) - appendix - scheme-medium - biblatex - biblatex-ieee - cleveref - csquotes - enumitem - ieeetran - titlesec - titling - zref; - }) - ]; -} \ No newline at end of file