Merge pull request #9 from redyf/dev

CI/CD
redyf · Jan 9, 2024 · 1183fe1 · 1183fe1
2 parents 5c530d1 + 25219c0
commit 1183fe1
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 42 deletions.
diff --git a/.github/workflows/flake_check.yml b/.github/workflows/flake_check.yml
@@ -0,0 +1,38 @@
+name: Nix Flake Check
+
+on: [pull_request]
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v24
+
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
+      - name: Install Nix Linting and Formatting Tools
+        run: nix-env -i statix nixpkgs-fmt -f '<nixpkgs>'
+
+      - name: Run Statix Lint
+        run: statix fix
+
+      - name: Run Nix Format
+        run: nix fmt
+
+      - name: Nix Flake Checker
+        uses: DeterminateSystems/flake-checker-action@v5
+
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: Auto lint/format
+          branch: dev
diff --git a/flake.lock b/flake.lock
diff --git a/home/desktop/dev/misc.nix b/home/desktop/dev/misc.nix
@@ -9,6 +9,7 @@
     peek # Animated GIF screen recorder
     xclip
     unzip # Unzip files using the terminal
+    nerdfix # Fix obsolete nerd font icons
     traceroute # Tool to access the X clipboard from a console application
     tree-sitter # A parser generator tool and an incremental parsing library
     appimage-run # Run appimage files in the terminal

diff --git a/home/desktop/graphical/wms/hyprland/default.nix b/home/desktop/graphical/wms/hyprland/default.nix
@@ -254,7 +254,7 @@ in {
         "tile,title:^(kitty)$"
         "float,title:^(fly_is_kitty)$"
         "tile,^(Spotify)$"
-        "tile,^(neovide)$"
+        # "tile,^(neovide)$"
         "tile,^(wps)$"
       ];
 

diff --git a/home/desktop/system/fonts/default.nix b/home/desktop/system/fonts/default.nix
@@ -1,12 +1,12 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    nerdfix # Fix obsolete nerd font icons
     noto-fonts
     dejavu_fonts
     font-awesome
     fira-code-symbols
     powerline-symbols
     material-design-icons
+    commit-mono
     (nerdfonts.override {fonts = ["IBMPlexMono" "CascadiaCode" "FiraCode" "FiraMono" "JetBrainsMono" "IntelOneMono" "Ubuntu"];})
   ];
 }
diff --git a/hosts/redyf/configuration.nix b/hosts/redyf/configuration.nix
@@ -74,18 +74,19 @@
   time.timeZone = "America/Bahia";
 
   # Select internationalisation properties.
-  i18n.defaultLocale = "pt_BR.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "pt_BR.UTF-8";
-    LC_IDENTIFICATION = "pt_BR.UTF-8";
-    LC_MEASUREMENT = "pt_BR.UTF-8";
-    LC_MONETARY = "pt_BR.UTF-8";
-    LC_NAME = "pt_BR.UTF-8";
-    LC_NUMERIC = "pt_BR.UTF-8";
-    LC_PAPER = "pt_BR.UTF-8";
-    LC_TELEPHONE = "pt_BR.UTF-8";
-    LC_TIME = "pt_BR.UTF-8";
+  i18n = {
+    defaultLocale = "pt_BR.UTF-8";
+    extraLocaleSettings = {
+      LC_ADDRESS = "pt_BR.UTF-8";
+      LC_IDENTIFICATION = "pt_BR.UTF-8";
+      LC_MEASUREMENT = "pt_BR.UTF-8";
+      LC_MONETARY = "pt_BR.UTF-8";
+      LC_NAME = "pt_BR.UTF-8";
+      LC_NUMERIC = "pt_BR.UTF-8";
+      LC_PAPER = "pt_BR.UTF-8";
+      LC_TELEPHONE = "pt_BR.UTF-8";
+      LC_TIME = "pt_BR.UTF-8";
+    };
   };
 
   # Enable programs
@@ -101,23 +102,28 @@
     };
   };
 
-  # Use overlays
-  nixpkgs.overlays = [
-    (
-      final: prev: {
-        sf-mono-liga-bin = prev.stdenvNoCC.mkDerivation rec {
-          pname = "sf-mono-liga-bin";
-          version = "dev";
-          src = inputs.sf-mono-liga-src;
-          dontConfigure = true;
-          installPhase = ''
-            mkdir -p $out/share/fonts/opentype
-            cp -R $src/*.otf $out/share/fonts/opentype/
-          '';
-        };
-      }
-    )
-  ];
+  # Allow unfree packages + use overlays
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+    };
+    overlays = [
+      (
+        final: prev: {
+          sf-mono-liga-bin = prev.stdenvNoCC.mkDerivation rec {
+            pname = "sf-mono-liga-bin";
+            version = "dev";
+            src = inputs.sf-mono-liga-src;
+            dontConfigure = true;
+            installPhase = ''
+              mkdir -p $out/share/fonts/opentype
+              cp -R $src/*.otf $out/share/fonts/opentype/
+            '';
+          };
+        }
+      )
+    ];
+  };
 
   fonts = {
     enableDefaultPackages = true;
@@ -134,11 +140,6 @@
     };
   };
 
-  # Allow unfree packages
-  nixpkgs.config = {
-    allowUnfree = true;
-  };
-
   # Enables docker in rootless mode
   virtualisation = {
     docker.rootless = {
@@ -310,11 +311,5 @@
   #   };
   # };
 
-  # 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
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "22.11"; # Did you read the comment?
 }